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

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

Cargo.toml

@@ -12,7 +12,6 @@ inherits = "release"
 debug = true
 
 [dependencies]
-alloy-primitives = { version = "0.8.11", features = ["serde"] }
 alloy-signer-local = "0.5.4"
 alloy-sol-types = "0.8.11"
 anyhow = "1.0"
@@ -59,7 +58,7 @@ serde_with = "3.8.1"
 simple-rate-limiter = "1.0"
 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"] }
+thegraph-core = "0.8.1"
 thegraph-graphql-http = { version = "0.2.1", features = [
     "http-client-reqwest",
 ] }

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};
 

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, UnresolvedBlock},
@@ -304,7 +304,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::*;
 

src/blocks.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 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 {

src/chain.rs

@@ -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};

src/client_query.rs

@@ -21,7 +21,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;

src/client_query/context.rs

@@ -1,5 +1,5 @@
-use alloy_sol_types::Eip712Domain;
 use ordered_float::NotNan;
+use thegraph_core::alloy::sol_types::Eip712Domain;
 use tokio::sync::{mpsc, watch};
 
 use crate::{

src/config.rs

@@ -7,7 +7,6 @@ use std::{
     str::FromStr,
 };
 
-use alloy_primitives::{B256, U256};
 use anyhow::Context;
 use custom_debug::CustomDebug;
 use ipnetwork::IpNetwork;
@@ -16,7 +15,10 @@ use secp256k1::SecretKey;
 use semver::Version;
 use serde::Deserialize;
 use serde_with::{serde_as, DeserializeAs, DisplayFromStr};
-use thegraph_core::{Address, DeploymentId};
+use thegraph_core::{
+    alloy::primitives::{Address, B256, U256},
+    DeploymentId,
+};
 use url::Url;
 
 use crate::{

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::{blocks::UnresolvedBlock, graphql};
 

src/indexer_client.rs

@@ -1,9 +1,11 @@
-use alloy_sol_types::Eip712Domain;
 use reqwest::header::AUTHORIZATION;
 use serde::{Deserialize, Serialize};
 use thegraph_core::{
+    alloy::{
+        primitives::{BlockHash, BlockNumber},
+        sol_types::Eip712Domain,
+    },
     attestation::{self, Attestation},
-    BlockHash, BlockNumber,
 };
 use thegraph_graphql_http::http::response::Error as GQLError;
 use url::Url;

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},

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},
@@ -166,7 +166,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;
 

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;

src/main.rs

@@ -8,7 +8,6 @@ use std::{
     time::Duration,
 };
 
-use alloy_sol_types::Eip712Domain;
 use axum::{
     body::Body,
     extract::{ConnectInfo, DefaultBodyLimit, State},
@@ -40,7 +39,13 @@ use prometheus::{self, Encoder as _};
 use secp256k1::SecretKey;
 use serde_json::json;
 use simple_rate_limiter::RateLimiter;
-use thegraph_core::{attestation, Address, ChainId};
+use thegraph_core::{
+    alloy::{
+        primitives::{Address, ChainId},
+        sol_types::Eip712Domain,
+    },
+    attestation,
+};
 use tokio::{
     net::TcpListener,
     signal::unix::SignalKind,

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::indexers::public_poi::ProofOfIndexingInfo;
 

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::{

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::{

src/network/internal/indexer_processing.rs

@@ -4,7 +4,7 @@ use cost_model::CostModel;
 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;
 

src/network/internal/snapshot.rs

@@ -9,7 +9,9 @@ use std::{
 use cost_model::CostModel;
 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};

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,

src/network/internal/subgraph_processing.rs

@@ -1,6 +1,8 @@
 use std::collections::{HashMap, HashSet};
 
-use thegraph_core::{AllocationId, BlockNumber, DeploymentId, IndexerId, SubgraphId};
+use thegraph_core::{
+    alloy::primitives::BlockNumber, AllocationId, DeploymentId, IndexerId, SubgraphId,
+};
 
 use crate::network::errors::{DeploymentError, SubgraphError};
 

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::{

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;
@@ -34,7 +34,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")]

src/receipts.rs

@@ -1,15 +1,19 @@
 use std::{collections::HashMap, sync::Arc, time::SystemTime};
 
-use alloy_primitives::U256;
 use alloy_signer_local::PrivateKeySigner;
-use alloy_sol_types::Eip712Domain;
 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::{
+        primitives::{Address, U256},
+        sol_types::Eip712Domain,
+    },
+    AllocationId,
+};
 
 /// A receipt for an indexer request.
 #[derive(Debug, Clone)]
@@ -216,7 +220,7 @@ impl ReceiptSigner {
 
 #[cfg(test)]
 mod tests {
-    use thegraph_core::{address, allocation_id};
+    use thegraph_core::{allocation_id, alloy::primitives::address};
 
     use super::*;
 
@@ -276,7 +280,7 @@ mod tests {
     }
 
     mod tap {
-        use thegraph_core::{address, allocation_id};
+        use thegraph_core::{allocation_id, alloy::primitives::address};
 
         use super::*;
 

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;
 

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},