chore(deps): use latest thegraph-core crate version

Signed-off-by: Lorenzo Delgado <[email protected]>

Author: LNSD

Cargo.lock

@@ -17,16 +17,6 @@ resolver = "2"
 opt-level = 3
 
 [workspace.dependencies]
-alloy = { version = "=0.5.4", 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.9", default-features = false, features = [
@@ -62,14 +52,23 @@ uuid = { version = "1.11.0", features = ["v7"] }
 tracing = { version = "0.1.40", default-features = false }
 bigdecimal = "0.4.3"
 build-info = "0.0.39"
-tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3", default-features = false }
-tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3", default-features = false }
+tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "1c6e29f", default-features = false }
+tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "1c6e29f", default-features = false }
 tracing-subscriber = { version = "0.3", features = [
     "json",
     "env-filter",
     "ansi",
 ], default-features = false }
-thegraph-core = { git = "https://github.com/edgeandnode/toolshed", rev = "1663534fc1738e2db1b11cb54b5bb478ee970d40" }
+thegraph-core = { version = "0.9.6", features = [
+    "attestation",
+    "alloy-eip712",
+    "alloy-sol-types",
+    "alloy-rlp",
+    "alloy-signers",
+    "alloy-signer-local",
+    "alloy-signer-mnemonic",
+    "serde"
+] }
 thegraph-graphql-http = { version = "0.3.2", features = ["reqwest"] }
 graphql_client = { version = "0.14.0", features = ["reqwest-rustls"] }
 bip39 = "2.0.0"

Cargo.toml

@@ -6,6 +6,5 @@ edition = "2021"
 [dependencies]
 indexer-query = { path = "../query" }
 serde = { workspace = true, features = ["derive"] }
-alloy.workspace = true
 thegraph-core.workspace = true
 anyhow.workspace = true

crates/allocation/Cargo.toml

@@ -3,10 +3,12 @@
 
 use std::str::FromStr;
 
-use alloy::primitives::{Address, U256};
 use indexer_query::allocations_query;
 use serde::{Deserialize, Deserializer};
-use thegraph_core::DeploymentId;
+use thegraph_core::{
+    alloy::primitives::{Address, U256},
+    DeploymentId,
+};
 
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct Allocation {

crates/allocation/src/lib.rs

@@ -5,7 +5,6 @@ edition = "2021"
 
 [dependencies]
 indexer-allocation = { path = "../allocation" }
-alloy.workspace = true
 thegraph-core.workspace = true
 anyhow.workspace = true
 

crates/attestation/Cargo.toml

@@ -1,16 +1,20 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use alloy::{
-    primitives::{Address, ChainId},
-    signers::{
-        k256,
-        local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
+use indexer_allocation::Allocation;
+use thegraph_core::{
+    alloy::{
+        primitives::{Address, ChainId},
+        signers::{
+            k256,
+            local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
+        },
+        sol_types::Eip712Domain,
     },
-    sol_types::Eip712Domain,
+    attestation,
+    attestation::Attestation,
+    DeploymentId,
 };
-use indexer_allocation::Allocation;
-use thegraph_core::{attestation, Attestation, DeploymentId};
 
 pub fn derive_key_pair(
     indexer_mnemonic: &str,
@@ -119,10 +123,10 @@ fn wallet_for_allocation(
 mod tests {
     use std::str::FromStr;
 
-    use alloy::primitives::{address, U256};
     use indexer_allocation::{Allocation, AllocationStatus, SubgraphDeployment};
     use test_assets::DISPUTE_MANAGER_ADDRESS;
     use test_log::test;
+    use thegraph_core::alloy::primitives::{address, U256};
 
     use super::*;
 

crates/attestation/src/lib.rs

@@ -4,7 +4,6 @@ version = "1.2.2"
 edition = "2021"
 
 [dependencies]
-alloy.workspace = true
 serde.workspace = true
 thegraph-core.workspace = true
 tracing.workspace = true

crates/config/Cargo.toml

@@ -10,7 +10,6 @@ use std::{
     time::Duration,
 };
 
-use alloy::primitives::Address;
 use bigdecimal::{BigDecimal, FromPrimitive, ToPrimitive};
 use bip39::Mnemonic;
 use figment::{
@@ -21,7 +20,7 @@ use regex::Regex;
 use serde::Deserialize;
 use serde_repr::Deserialize_repr;
 use serde_with::{serde_as, DurationSecondsWithFrac};
-use thegraph_core::DeploymentId;
+use thegraph_core::{alloy::primitives::Address, DeploymentId};
 use url::Url;
 
 use crate::NonZeroGRT;
@@ -423,9 +422,9 @@ pub struct RavRequestConfig {
 mod tests {
     use std::{env, fs, path::PathBuf, str::FromStr};
 
-    use alloy::primitives::{Address, FixedBytes};
     use figment::value::Uncased;
     use sealed_test::prelude::*;
+    use thegraph_core::alloy::primitives::{Address, FixedBytes};
     use tracing_test::traced_test;
 
     use super::{DatabaseConfig, SHARED_PREFIX};

crates/config/src/config.rs

@@ -4,9 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-alloy.workspace = true 
 thiserror.workspace = true
 anyhow.workspace = true
-alloy-sol-types = "=0.8.15"
-alloy-rlp = "0.3.9" 
+alloy-rlp = "0.3.9"
 thegraph-core.workspace = true

crates/dips/Cargo.toml

@@ -6,16 +6,16 @@ use std::{
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
-pub use alloy;
-use alloy::{
+pub use alloy_rlp;
+use alloy_rlp::Encodable;
+use thegraph_core::alloy::{
     core::primitives::Address,
     primitives::PrimitiveSignature as Signature,
     rlp::{RlpDecodable, RlpEncodable},
     signers::SignerSync,
-    sol_types::{sol, Eip712Domain, SolStruct},
+    sol,
+    sol_types::{Eip712Domain, SolStruct},
 };
-pub use alloy_rlp;
-use alloy_rlp::Encodable;
 use thiserror::Error;
 
 sol! {
@@ -216,12 +216,14 @@ impl SignedCancellationRequest {
 mod test {
     use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
-    use alloy::{
-        primitives::{Address, FixedBytes, U256},
-        signers::local::PrivateKeySigner,
-        sol_types::SolStruct,
+    use thegraph_core::{
+        alloy::{
+            primitives::{Address, FixedBytes, U256},
+            signers::local::PrivateKeySigner,
+            sol_types::SolStruct,
+        },
+        attestation::eip712_domain,
     };
-    use thegraph_core::attestation::eip712_domain;
 
     use crate::{
         AgreementVoucherValidationError, CancellationRequest, CancellationRequestValidationError,