bump deps

Cargo.toml

@@ -6,14 +6,20 @@ resolver = "2"
 opt-level = 3
 
 [workspace.dependencies]
-alloy = { version = "0.2.1", features = [
+alloy = { version = "0.4.2", features = [
     "kzg",
     "signer-mnemonic",
+    "dyn-abi",
+    "sol-types",
+    "signer-local",
+    "eip712",
+    "rlp",
+    "signers",
 ], default-features = false }
 clap = "4.4.3"
 lazy_static = "1.4.0"
-axum = { version = "0.7.5", default-features = false }
-tokio = "1.39.2"
+axum = { version = "0.7.7", default-features = false }
+tokio = "1.40"
 prometheus = "0.13.3"
 anyhow = { version = "1.0.72" }
 thiserror = "1.0.49"
@@ -39,12 +45,12 @@ sqlx = { version = "0.8.2", features = [
 tracing = { version = "0.1.40", default-features = false }
 bigdecimal = "0.4.3"
 build-info = "0.0.38"
-tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "ff856d9", default-features = false }
+tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "c26e552", default-features = false }
 tracing-subscriber = { version = "0.3", features = [
     "json",
     "env-filter",
 ], default-features = false }
-thegraph-core = { git = "https://github.com/edgeandnode/toolshed", rev = "85ee00b", features = [
+thegraph-core = { git = "https://github.com/edgeandnode/toolshed", tag = "thegraph-core-v0.7.0", features = [
     "subgraph-client",
 ] }
 thegraph-graphql-http = "0.2.0"

common/src/indexer_service/http/config.rs

@@ -47,7 +47,6 @@ pub struct IndexerServiceConfig {
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct IndexerDipsConfig {
-    pub expected_payee: String,
     pub allowed_payers: Vec<String>,
 }
 

config/maximal-config-example.toml

@@ -145,3 +145,7 @@ max_receipts_per_request = 10000
 # Key-Value of all senders and their aggregator endpoints
 0xdeadbeefcafebabedeadbeefcafebabedeadbeef = "https://example.com/aggregate-receipts"
 0x0123456789abcdef0123456789abcdef01234567 = "https://other.example.com/aggregate-receipts"
+
+[dips]
+expected_payee = "0xdeadbeef"
+expected_payers = ["0xdeadbeef"]

config/minimal-config-example.toml

@@ -63,3 +63,4 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 # Key-Value of all senders and their aggregator endpoints
 0xdeadbeefcafebabedeadbeefcafebabedeadbeef = "https://example.com/aggregate-receipts"
 0x0123456789abcdef0123456789abcdef01234567 = "https://other.example.com/aggregate-receipts"
+

dips/Cargo.toml

@@ -4,11 +4,23 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy-core = "0.8.5"
-alloy-primitives = { version = "0.8.5", default-features = true, features = ["rlp"]}
-alloy-sol-types = "0.8.5"
-alloy-signer = "0.4.2"
-alloy-rlp = "0.3.8"
+alloy.workspace = true 
+# alloy = { version = "0.4.0", features = [
+#     "kzg",
+#     "signer-mnemonic",
+#     "dyn-abi",
+#     "sol-types",
+#     "signer-local",
+#     "eip712",
+# ], default-features = false }
+# alloy-core = "=0.8.6"
+# alloy-primitives = { version = "0.7", default-features = true, features = ["rlp"]}
+alloy-sol-types = "=0.8.7"
+# alloy-signer = { version = "0.4", features = ["eip712"] }
+alloy-rlp = "0.3.8" 
 
-[dev-dependencies]
-alloy-signer-local = "0.4.2"
+# alloy-signer = "0.4.2"
+# alloy-rlp = "0.3.8"
+
+# [dev-dependencies]
+# alloy-signer-local = "=0.4.0"

dips/src/lib.rs

@@ -3,14 +3,12 @@
 
 use std::str::FromStr;
 
-pub use alloy_core;
+pub use alloy;
 pub use alloy_rlp;
-pub use alloy_signer;
-pub use alloy_sol_types;
 
-use alloy_core::primitives::Address;
-use alloy_rlp::{RlpDecodable, RlpEncodable};
-use alloy_signer::Signature;
+use alloy::core::primitives::Address;
+use alloy::rlp::{RlpDecodable, RlpEncodable};
+use alloy::signers::Signature;
 use alloy_sol_types::{sol, SolStruct};
 
 sol! {
@@ -84,10 +82,10 @@ impl SignedIndexingAgreementVoucher {
 
 #[cfg(test)]
 mod test {
-    use alloy_core::primitives::{Address, FixedBytes, U256};
-    use alloy_signer::SignerSync;
-    use alloy_signer_local::PrivateKeySigner;
-    use alloy_sol_types::SolStruct;
+    use alloy::primitives::{Address, FixedBytes, U256};
+    use alloy::signers::local::PrivateKeySigner;
+    use alloy::signers::SignerSync;
+    use alloy::sol_types::SolStruct;
 
     use crate::{
         IndexingAgreementVoucher, SignedIndexingAgreementVoucher, SubgraphIndexingVoucherMetadata,

service/Cargo.toml

@@ -30,10 +30,10 @@ async-graphql = { version = "7.0.11", default-features = false }
 async-graphql-axum = "7.0.11"
 base64.workspace = true
 graphql = { git = "https://github.com/edgeandnode/toolshed", tag = "graphql-v0.3.0" }
-
+ 
 [dev-dependencies]
 hex-literal = "0.4.1"
-alloy-signer-local = "0.4.2"
+alloy.workspace = true
 
 [build-dependencies]
 build-info-build = { version = "0.0.38", default-features = false }

service/src/config.rs

@@ -78,7 +78,6 @@ impl From<MainConfig> for Config {
                 receipt_max_value: value.service.tap.max_receipt_value_grt.get_value(),
             },
             dips: IndexerDipsConfig {
-                expected_payee: value.dips.expected_payee,
                 allowed_payers: value.dips.allowed_payers,
             },
         })

service/src/routes/dips.rs

@@ -7,7 +7,7 @@ use anyhow::bail;
 use async_graphql::{Context, FieldResult, Object, SimpleObject};
 use base64::{engine::general_purpose::STANDARD, Engine};
 use indexer_dips::{
-    alloy_core::primitives::Address, alloy_rlp::Decodable, SignedIndexingAgreementVoucher,
+    alloy::core::primitives::Address, alloy_rlp::Decodable, SignedIndexingAgreementVoucher,
     SubgraphIndexingVoucherMetadata,
 };
 
@@ -164,13 +164,13 @@ async fn validate_and_create_agreement(
 mod test {
     use std::sync::Arc;
 
-    use alloy_signer_local::PrivateKeySigner;
+    use alloy::signers::local::PrivateKeySigner;
     use base64::{engine::general_purpose::STANDARD, Engine};
     use indexer_dips::{
-        alloy_core::primitives::{Address, FixedBytes, U256},
+        alloy::core::primitives::{Address, FixedBytes, U256},
+        alloy::signers::SignerSync,
+        alloy::sol_types::SolStruct,
         alloy_rlp::{self},
-        alloy_signer::SignerSync,
-        alloy_sol_types::SolStruct,
         IndexingAgreementVoucher, SignedIndexingAgreementVoucher, SubgraphIndexingVoucherMetadata,
     };
 

service/src/service.rs

@@ -18,7 +18,7 @@ use indexer_common::indexer_service::http::{
     AttestationOutput, IndexerServiceImpl, IndexerServiceResponse,
 };
 use indexer_config::Config as MainConfig;
-use indexer_dips::alloy_core::primitives::Address;
+use indexer_dips::alloy::core::primitives::Address;
 use reqwest::Url;
 use serde_json::{json, Value};
 use sqlx::PgPool;
@@ -198,7 +198,7 @@ pub async fn run() -> anyhow::Result<()> {
     let schema = Schema::build(
         routes::dips::AgreementQuery {},
         routes::dips::AgreementMutation {
-            expected_payee: Address::from_str(&config.0.dips.expected_payee).unwrap(),
+            expected_payee: config.0.indexer.indexer_address,
             allowed_payers: config
                 .0
                 .dips

tap-agent/Cargo.toml

@@ -37,7 +37,7 @@ ruint = { version = "1.12.3", features = [
 ], default-features = false }
 futures-util = { version = "0.3.28", default-features = false }
 jsonrpsee = { version = "0.24.0", features = ["http-client", "tracing"] }
-tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "eb8447e" }
+tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "c26e552" }
 ractor = { version = "0.9", features = [
   "async-trait",
 ], default-features = false }