Merge pull request #279 from LNSD/lnsd/chore-deps-use-thegraph-core

chore(deps): use thegraph-core's re-exported alloy dependency

Author: suchapalaver

Cargo.toml

@@ -16,7 +16,6 @@ license = "Apache-2.0"
 repository = "https://github.com/semiotic-ai/timeline-aggregation-protocol"
 
 [workspace.dependencies]
-alloy = { version = "0.11.0", features = ["full"] }
 serde = { version = "1.0.217", features = ["derive"] }
 rstest = "0.24.0"
 anyhow = { version = "1.0.95" }
@@ -25,4 +24,5 @@ rand = "0.8.5"
 jsonrpsee = { version = "0.24.7", features = ["macros", "server"] }
 insta = { version = "1.42.0", features = ["json"] }
 serde_json = { version = "1.0.137", features = ["raw_value"] }
+thegraph-core = "0.12.0"
 thiserror = "2.0.11"

tap_aggregator/Cargo.toml

@@ -12,8 +12,6 @@ name = "tap_aggregator"
 path = "src/main.rs"
 
 [dependencies]
-alloy.workspace = true
-alloy-sol-types ={ version = "0.8.21", features = ["eip712-serde"]}
 anyhow.workspace = true
 axum = { version = "0.7.5", features = [
     "http1",
@@ -36,6 +34,7 @@ serde.workspace = true
 serde_json.workspace = true
 strum = { version = "0.26.3", features = ["derive"] }
 tap_core = { path = "../tap_core", version = "3.0.1" }
+thegraph-core = { workspace = true, features = ["alloy-eip712"] }
 tokio.workspace = true
 tonic = { version = "0.12.3", features = ["transport", "zstd"] }
 tower = { version = "0.5.2", features = ["util", "steer"] }

tap_aggregator/src/aggregator/v1.rs

@@ -3,14 +3,14 @@
 
 use std::collections::{hash_set, HashSet};
 
-use alloy::{
-    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
-    sol_types::SolStruct,
-};
 use anyhow::{bail, Ok, Result};
 use rayon::prelude::*;
 use tap_core::signed_message::{Eip712SignedMessage, SignatureBytes, SignatureBytesExt};
 use tap_graph::{Receipt, ReceiptAggregateVoucher};
+use thegraph_core::alloy::{
+    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+    sol_types::SolStruct,
+};
 
 pub fn check_and_aggregate_receipts(
     domain_separator: &Eip712Domain,
@@ -132,10 +132,12 @@ fn check_receipt_timestamps(
 mod tests {
     use std::str::FromStr;
 
-    use alloy::{dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner};
     use rstest::*;
     use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
     use tap_graph::{Receipt, ReceiptAggregateVoucher};
+    use thegraph_core::alloy::{
+        dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+    };
 
     use super::*;
 

tap_aggregator/src/aggregator/v2.rs

@@ -3,14 +3,14 @@
 
 use std::collections::{hash_set, HashSet};
 
-use alloy::{
-    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
-    sol_types::SolStruct,
-};
 use anyhow::{bail, Ok, Result};
 use rayon::prelude::*;
 use tap_core::signed_message::{Eip712SignedMessage, SignatureBytes, SignatureBytesExt};
 use tap_graph::v2::{Receipt, ReceiptAggregateVoucher};
+use thegraph_core::alloy::{
+    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+    sol_types::SolStruct,
+};
 
 pub fn check_and_aggregate_receipts(
     domain_separator: &Eip712Domain,
@@ -185,14 +185,14 @@ fn check_receipt_timestamps(
 
 #[cfg(test)]
 mod tests {
-    use alloy::{
+    use rstest::*;
+    use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
+    use tap_graph::v2::{Receipt, ReceiptAggregateVoucher};
+    use thegraph_core::alloy::{
         dyn_abi::Eip712Domain,
         primitives::{address, Address, Bytes},
         signers::local::PrivateKeySigner,
     };
-    use rstest::*;
-    use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
-    use tap_graph::v2::{Receipt, ReceiptAggregateVoucher};
 
     #[fixture]
     fn keys() -> (PrivateKeySigner, Address) {

tap_aggregator/src/grpc.rs

@@ -141,9 +141,9 @@ pub mod v1 {
 }
 
 pub mod v2 {
-    use alloy::primitives::Bytes;
     use anyhow::anyhow;
     use tap_core::signed_message::Eip712SignedMessage;
+    use thegraph_core::alloy::primitives::Bytes;
 
     tonic::include_proto!("tap_aggregator.v2");
 

tap_aggregator/src/main.rs

@@ -5,12 +5,14 @@
 
 use std::{collections::HashSet, str::FromStr};
 
-use alloy::{dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner};
 use anyhow::Result;
 use clap::Parser;
 use log::{debug, info};
 use tap_aggregator::{metrics, server};
 use tap_core::tap_eip712_domain;
+use thegraph_core::alloy::{
+    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+};
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
@@ -141,7 +143,7 @@ async fn main() -> Result<()> {
 }
 
 fn create_eip712_domain(args: &Args) -> Result<Eip712Domain> {
-    // Transfrom the args into the types expected by Eip712Domain::new().
+    // Transform the args into the types expected by Eip712Domain::new().
 
     // Transform optional strings into optional Cow<str>.
     // Transform optional strings into optional U256.

tap_aggregator/src/server.rs

@@ -3,7 +3,6 @@
 
 use std::{collections::HashSet, str::FromStr};
 
-use alloy::{dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner};
 use anyhow::Result;
 use axum::{error_handling::HandleError, routing::post_service, BoxError, Router};
 use hyper::StatusCode;
@@ -16,6 +15,9 @@ use log::{error, info};
 use prometheus::{register_counter, register_int_counter, Counter, IntCounter};
 use tap_core::signed_message::Eip712SignedMessage;
 use tap_graph::{Receipt, ReceiptAggregateVoucher, SignedReceipt};
+use thegraph_core::alloy::{
+    dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+};
 use tokio::{net::TcpListener, signal, task::JoinHandle};
 use tonic::{codec::CompressionEncoding, service::Routes, Request, Response, Status};
 use tower::{layer::util::Identity, make::Shared};
@@ -493,12 +495,14 @@ fn produce_kafka_records(
 mod tests {
     use std::{collections::HashSet, str::FromStr};
 
-    use alloy::{dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner};
     use jsonrpsee::{core::client::ClientT, http_client::HttpClientBuilder, rpc_params};
     use rand::{prelude::*, seq::SliceRandom};
     use rstest::*;
     use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
     use tap_graph::{Receipt, ReceiptAggregateVoucher};
+    use thegraph_core::alloy::{
+        dyn_abi::Eip712Domain, primitives::Address, signers::local::PrivateKeySigner,
+    };
 
     use crate::server;
 

tap_aggregator/tests/aggregate_test.rs

@@ -3,7 +3,6 @@
 
 use std::{collections::HashSet, str::FromStr};
 
-use alloy::{primitives::Address, signers::local::PrivateKeySigner};
 use jsonrpsee::{core::client::ClientT, http_client::HttpClientBuilder, rpc_params};
 use tap_aggregator::{
     grpc::v1::{tap_aggregator_client::TapAggregatorClient, RavRequest},
@@ -12,6 +11,7 @@ use tap_aggregator::{
 };
 use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
 use tap_graph::{Receipt, ReceiptAggregateVoucher};
+use thegraph_core::alloy::{primitives::Address, signers::local::PrivateKeySigner};
 use tonic::codec::CompressionEncoding;
 
 #[tokio::test]

tap_aggregator/tests/aggregate_v1_and_v2.rs

@@ -3,10 +3,6 @@
 
 use std::collections::HashSet;
 
-use alloy::{
-    primitives::{address, Address},
-    signers::local::PrivateKeySigner,
-};
 use tap_aggregator::{
     grpc::{
         v1::{tap_aggregator_client::TapAggregatorClient as ClientV1, RavRequest as ReqV1},
@@ -16,6 +12,10 @@ use tap_aggregator::{
 };
 use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
 use tap_graph::{v2::Receipt as ReceiptV2, Receipt as ReceiptV1};
+use thegraph_core::alloy::{
+    primitives::{address, Address},
+    signers::local::PrivateKeySigner,
+};
 use tonic::codec::CompressionEncoding;
 
 #[tokio::test]

tap_core/Cargo.toml

@@ -8,21 +8,22 @@ readme = "README.md"
 description = "Core Timeline Aggregation Protocol library: a fast, efficient and trustless unidirectional micro-payments system."
 
 [dependencies]
-alloy.workspace = true
 anyhow.workspace = true
 async-trait = "0.1.85"
 rand.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-tap_receipt = { version = "0.1.0", path = "../tap_receipt" }
 tap_eip712_message = { version = "0.1.0", path = "../tap_eip712_message" }
 tap_graph = { version = "0.2.0", path = "../tap_graph", optional = true }
+tap_receipt = { version = "0.1.0", path = "../tap_receipt" }
+thegraph-core.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["async_std"] }
 insta.workspace = true
 rstest.workspace = true
 serde_json.workspace = true
+thegraph-core = { workspace = true, features = ["alloy-signer-mnemonic"] }
 
 [features]
 default = ["in_memory"]