chore(deps): update rust crate thegraph-core to v0.x.x

Signed-off-by: Lorenzo Delgado <[email protected]>
edgeandnode · Nov 26, 2024 · b432eba · b432eba
1 parent 474e715
commit b432eba
Show file tree

Hide file tree

Showing 28 changed files with 951 additions and 182 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,6 @@ inherits = "release"
 debug = true
 
 [dependencies]
-alloy = { version = "0.5.4", features = ["contract", "signer-local"] }
 anyhow = "1.0"
 axum = { version = "0.7.7", default-features = false, features = [
     "json",
@@ -52,8 +51,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0.116", features = ["raw_value"] }
 serde_with = "3.8.1"
 snmalloc-rs = "0.3"
-tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "61b47b3" }
-thegraph-core = { version = "0.7.0", features = ["serde"] }
+tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "a02e63e" }
+thegraph-core = { version = "0.8.4", features = ["serde", "alloy-signer-local", "alloy-contract"] }
 thegraph-graphql-http = { version = "0.2.1", features = [
     "http-client-reqwest",
 ] }
@@ -81,6 +80,5 @@ url = "2.5.0"
 assert_matches = "1.5.0"
 http-body-util = "0.1.1"
 hyper = "1.3.1"
-test-with = { version = "0.14.0", default-features = false }
 tokio-test = "0.4.4"
 tower-test = "0.4.0"
diff --git a/src/auth.rs b/src/auth.rs
@@ -146,7 +146,7 @@ pub fn is_domain_authorized<S: AsRef<str>>(authorized: &[S], origin: &str) -> bo
 
 #[cfg(test)]
 mod tests {
-    use alloy::primitives::hex;
+    use thegraph_core::alloy::primitives::hex;
 
     use super::{is_domain_authorized, parse_api_key};
 

diff --git a/src/block_constraints.rs b/src/block_constraints.rs
@@ -11,7 +11,7 @@ use graphql::{
 };
 use itertools::Itertools as _;
 use serde_json::{self, json};
-use thegraph_core::{BlockHash, BlockNumber};
+use thegraph_core::alloy::primitives::{BlockHash, BlockNumber};
 
 use crate::{blocks::BlockConstraint, chain::Chain, errors::Error};
 
@@ -298,7 +298,7 @@ fn parse_number<'c, T: Text<'c>>(
 mod tests {
     use std::iter::FromIterator as _;
 
-    use alloy::primitives::hex;
+    use thegraph_core::alloy::primitives::hex;
 
     use super::*;
 

diff --git a/src/blocks.rs b/src/blocks.rs
@@ -1,5 +1,5 @@
 use serde::Deserialize;
-use thegraph_core::{BlockHash, BlockNumber, BlockTimestamp};
+use thegraph_core::alloy::primitives::{BlockHash, BlockNumber, BlockTimestamp};
 
 #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Deserialize)]
 pub struct Block {

diff --git a/src/chain.rs b/src/chain.rs
@@ -3,7 +3,7 @@ use std::{
     iter,
 };
 
-use thegraph_core::{BlockHash, IndexerId};
+use thegraph_core::{alloy::primitives::BlockHash, IndexerId};
 
 use crate::blocks::Block;
 
@@ -107,12 +107,14 @@ impl Chain {
 
 #[cfg(test)]
 mod tests {
-    use alloy::primitives::U256;
     use itertools::Itertools;
     use rand::{
         rngs::SmallRng, seq::SliceRandom as _, thread_rng, Rng as _, RngCore as _, SeedableRng,
     };
-    use thegraph_core::{Address, BlockHash, IndexerId};
+    use thegraph_core::{
+        alloy::primitives::{Address, BlockHash, U256},
+        IndexerId,
+    };
     use toolshed::concat_bytes;
 
     use super::{Block, Chain, MAX_LEN};

diff --git a/src/client_query.rs b/src/client_query.rs
@@ -20,7 +20,7 @@ use prost::bytes::Buf;
 use rand::{thread_rng, Rng as _};
 use serde::Deserialize;
 use serde_json::value::RawValue;
-use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId};
+use thegraph_core::{alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId};
 use tokio::sync::mpsc;
 use tracing::{info_span, Instrument as _};
 use url::Url;

diff --git a/src/client_query/context.rs b/src/client_query/context.rs
@@ -1,5 +1,5 @@
-use alloy::dyn_abi::Eip712Domain;
 use ordered_float::NotNan;
+use thegraph_core::alloy::dyn_abi::Eip712Domain;
 use tokio::sync::{mpsc, watch};
 
 use crate::{

diff --git a/src/config.rs b/src/config.rs
@@ -5,14 +5,16 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use alloy::primitives::{B256, U256};
 use anyhow::Context;
 use ipnetwork::IpNetwork;
 use ordered_float::NotNan;
 use semver::Version;
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
-use thegraph_core::{Address, BlockNumber, DeploymentId};
+use thegraph_core::{
+    alloy::primitives::{Address, BlockNumber, B256, U256},
+    DeploymentId,
+};
 use url::Url;
 
 use crate::{auth::APIKey, network::subgraph_client::TrustedIndexer};

diff --git a/src/errors.rs b/src/errors.rs
@@ -5,7 +5,7 @@ use std::{
 
 use axum::response::{IntoResponse, Response};
 use itertools::Itertools as _;
-use thegraph_core::{BlockNumber, IndexerId};
+use thegraph_core::{alloy::primitives::BlockNumber, IndexerId};
 
 use crate::graphql;
 

diff --git a/src/exchange_rate.rs b/src/exchange_rate.rs
@@ -1,8 +1,10 @@
 use std::{sync::Arc, time::Duration};
 
-use alloy::{primitives::Address, providers::ProviderBuilder, sol, transports::http::Http};
 use anyhow::ensure;
 use ordered_float::NotNan;
+use thegraph_core::alloy::{
+    primitives::Address, providers::ProviderBuilder, sol, transports::http::Http,
+};
 use tokio::{
     sync::watch,
     time::{interval, MissedTickBehavior},
@@ -17,7 +19,7 @@ sol!(
 );
 
 // TODO: figure out how to erase this type
-type Provider = alloy::providers::RootProvider<Http<reqwest::Client>>;
+type Provider = thegraph_core::alloy::providers::RootProvider<Http<reqwest::Client>>;
 
 pub async fn grt_per_usd(provider: Url) -> watch::Receiver<NotNan<f64>> {
     // https://data.chain.link/feeds/arbitrum/mainnet/grt-usd

diff --git a/src/indexer_client.rs b/src/indexer_client.rs
@@ -1,9 +1,11 @@
-use alloy::dyn_abi::Eip712Domain;
 use reqwest::header::AUTHORIZATION;
 use serde::{Deserialize, Serialize};
 use thegraph_core::{
+    alloy::{
+        dyn_abi::Eip712Domain,
+        primitives::{BlockHash, BlockNumber},
+    },
     attestation::{self, Attestation},
-    BlockHash, BlockNumber,
 };
 use thegraph_graphql_http::http::response::Error as GQLError;
 use url::Url;

diff --git a/src/indexers/indexing_progress.rs b/src/indexers/indexing_progress.rs
@@ -1,6 +1,6 @@
 use serde::Deserialize;
 use serde_with::serde_as;
-use thegraph_core::{BlockNumber, DeploymentId};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId};
 use thegraph_graphql_http::{
     graphql::{Document, IntoDocument, IntoDocumentWithVariables},
     http_client::{RequestError, ReqwestExt as _, ResponseError},

diff --git a/src/indexers/public_poi.rs b/src/indexers/public_poi.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use serde_with::{serde_as, DisplayFromStr};
-use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing};
 use thegraph_graphql_http::{
     graphql::{Document, IntoDocument, IntoDocumentWithVariables},
     http_client::{RequestError, ReqwestExt, ResponseError},
@@ -133,7 +133,7 @@ pub struct PartialBlockPtr {
 
 #[cfg(test)]
 mod tests {
-    use thegraph_core::{deployment_id, poi};
+    use thegraph_core::{deployment_id, proof_of_indexing as poi};
 
     use super::Response;
 

diff --git a/src/indexing_performance.rs b/src/indexing_performance.rs
@@ -1,7 +1,7 @@
 use std::{collections::HashMap, ops::Deref, time::Duration};
 
 use parking_lot::RwLock;
-use thegraph_core::{BlockNumber, DeploymentId, IndexerId};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, IndexerId};
 use tokio::{self, sync::mpsc, time::MissedTickBehavior};
 
 use crate::network::NetworkService;

diff --git a/src/main.rs b/src/main.rs
@@ -36,7 +36,6 @@ use std::{
     time::Duration,
 };
 
-use alloy::{dyn_abi::Eip712Domain, signers::local::PrivateKeySigner};
 use auth::AuthContext;
 use axum::{
     extract::DefaultBodyLimit,
@@ -55,7 +54,10 @@ use middleware::{
 use network::subgraph_client::Client as SubgraphClient;
 use prometheus::{self, Encoder as _};
 use receipts::ReceiptSigner;
-use thegraph_core::{attestation, ChainId};
+use thegraph_core::{
+    alloy::{dyn_abi::Eip712Domain, primitives::ChainId, signers::local::PrivateKeySigner},
+    attestation,
+};
 use tokio::{net::TcpListener, signal::unix::SignalKind, sync::watch};
 use tower_http::cors::{self, CorsLayer};
 use tracing_subscriber::{prelude::*, EnvFilter};

diff --git a/src/network/indexer_indexing_poi_blocklist.rs b/src/network/indexer_indexing_poi_blocklist.rs
@@ -9,7 +9,7 @@
 
 use std::collections::{HashMap, HashSet};
 
-use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing};
 
 use crate::config::BlockedPoi;
 

diff --git a/src/network/indexer_indexing_poi_resolver.rs b/src/network/indexer_indexing_poi_resolver.rs
@@ -9,7 +9,7 @@
 use std::{collections::HashMap, time::Duration};
 
 use parking_lot::RwLock;
-use thegraph_core::{BlockNumber, DeploymentId, ProofOfIndexing};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, ProofOfIndexing};
 use url::Url;
 
 use crate::{

diff --git a/src/network/indexer_indexing_progress_resolver.rs b/src/network/indexer_indexing_progress_resolver.rs
@@ -3,7 +3,7 @@
 use std::{collections::HashMap, time::Duration};
 
 use parking_lot::{Mutex, RwLock};
-use thegraph_core::{BlockNumber, DeploymentId};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId};
 use url::Url;
 
 use crate::{

diff --git a/src/network/internal/indexer_processing.rs b/src/network/internal/indexer_processing.rs
@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use custom_debug::CustomDebug;
 use ipnetwork::IpNetwork;
 use semver::Version;
-use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId};
+use thegraph_core::{alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId};
 use tracing::Instrument;
 use url::Url;
 

diff --git a/src/network/internal/snapshot.rs b/src/network/internal/snapshot.rs
@@ -8,7 +8,9 @@ use std::{
 
 use custom_debug::CustomDebug;
 use semver::Version;
-use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId};
+use thegraph_core::{
+    alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId,
+};
 use url::Url;
 
 use super::{DeploymentInfo, SubgraphInfo};

diff --git a/src/network/internal/state.rs b/src/network/internal/state.rs
@@ -1,7 +1,7 @@
 use std::collections::{BTreeMap, HashSet};
 
 use ipnetwork::IpNetwork;
-use thegraph_core::Address;
+use thegraph_core::alloy::primitives::Address;
 
 use crate::{
     config::BlockedIndexer,

diff --git a/src/network/internal/subgraph_processing.rs b/src/network/internal/subgraph_processing.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 
-use thegraph_core::{BlockNumber, DeploymentId, IndexerId, SubgraphId};
+use thegraph_core::{alloy::primitives::BlockNumber, DeploymentId, IndexerId, SubgraphId};
 
 use crate::network::errors::{DeploymentError, SubgraphError};
 

diff --git a/src/network/service.rs b/src/network/service.rs
@@ -9,7 +9,10 @@ use std::{
 
 use ipnetwork::IpNetwork;
 use semver::Version;
-use thegraph_core::{Address, BlockNumber, DeploymentId, SubgraphId};
+use thegraph_core::{
+    alloy::primitives::{Address, BlockNumber},
+    DeploymentId, SubgraphId,
+};
 use tokio::{sync::watch, time::MissedTickBehavior};
 
 use super::{

diff --git a/src/network/subgraph_client.rs b/src/network/subgraph_client.rs
@@ -9,7 +9,7 @@ use custom_debug::CustomDebug;
 use serde::{ser::SerializeMap, Deserialize, Serialize, Serializer};
 use serde_json::json;
 use serde_with::serde_as;
-use thegraph_core::{BlockHash, BlockNumber, BlockTimestamp};
+use thegraph_core::alloy::primitives::{BlockHash, BlockNumber, BlockTimestamp};
 use thegraph_graphql_http::http::response::Error as GqlError;
 use types::Subgraph;
 use url::Url;
@@ -33,7 +33,9 @@ use crate::{
 pub mod types {
     use serde::Deserialize;
     use serde_with::serde_as;
-    use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId};
+    use thegraph_core::{
+        alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId,
+    };
 
     #[derive(Debug, Clone, Deserialize)]
     #[serde(rename_all = "camelCase")]

diff --git a/src/receipts.rs b/src/receipts.rs
@@ -1,13 +1,19 @@
 use std::{collections::HashMap, sync::Arc, time::SystemTime};
 
-use alloy::{dyn_abi::Eip712Domain, primitives::U256, signers::local::PrivateKeySigner};
 use parking_lot::{Mutex, RwLock};
 use rand::RngCore;
 pub use receipts::QueryStatus as ReceiptStatus;
 use receipts::ReceiptPool;
 use secp256k1::SecretKey;
 use tap_core::{receipt::Receipt as TapReceipt, signed_message::EIP712SignedMessage};
-use thegraph_core::{Address, AllocationId};
+use thegraph_core::{
+    alloy::{
+        dyn_abi::Eip712Domain,
+        primitives::{Address, U256},
+        signers::local::PrivateKeySigner,
+    },
+    AllocationId,
+};
 
 /// A receipt for an indexer request.
 #[derive(Debug, Clone)]
@@ -211,7 +217,10 @@ impl ReceiptSigner {
 
 #[cfg(test)]
 mod tests {
-    use thegraph_core::{address, allocation_id};
+    use thegraph_core::{
+        allocation_id,
+        alloy::{primitives::address, signers::local::PrivateKeySigner},
+    };
 
     use super::*;
 
@@ -271,7 +280,10 @@ mod tests {
     }
 
     mod tap {
-        use thegraph_core::{address, allocation_id};
+        use thegraph_core::{
+            allocation_id,
+            alloy::{primitives::address, signers::local::PrivateKeySigner},
+        };
 
         use super::*;
 

diff --git a/src/reports.rs b/src/reports.rs
@@ -1,7 +1,7 @@
 use anyhow::{anyhow, Context};
 use ordered_float::NotNan;
 use prost::Message;
-use thegraph_core::{Address, AllocationId, DeploymentId, IndexerId};
+use thegraph_core::{alloy::primitives::Address, AllocationId, DeploymentId, IndexerId};
 use tokio::sync::mpsc;
 use toolshed::concat_bytes;
 

diff --git a/src/vouchers.rs b/src/vouchers.rs
@@ -1,11 +1,10 @@
-use alloy::primitives::{FixedBytes, U256};
 use axum::{body::Bytes, extract::State, http::StatusCode};
 use lazy_static::lazy_static;
 use receipts::{self, combine_partial_vouchers, receipts_to_partial_voucher, receipts_to_voucher};
 use secp256k1::{PublicKey, Secp256k1, SecretKey};
 use serde::Deserialize;
 use serde_json::json;
-use thegraph_core::Address;
+use thegraph_core::alloy::primitives::{Address, FixedBytes, U256};
 
 use crate::{
     json::{json_response, JsonResponse},