refactor: use alloy imports instead

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

Author: LNSD

crates/allocation/src/lib.rs

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

crates/attestation/src/lib.rs

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use alloy::{
-    dyn_abi::Eip712Domain,
+    primitives::{Address, ChainId},
     signers::{
         k256,
         local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
     },
+    sol_types::Eip712Domain,
 };
 use indexer_allocation::Allocation;
-use thegraph_core::{attestation, Address, Attestation, ChainId, DeploymentId};
+use thegraph_core::{attestation, Attestation, DeploymentId};
 
 pub fn derive_key_pair(
     indexer_mnemonic: &str,

crates/config/src/config.rs

@@ -424,7 +424,7 @@ pub struct RavRequestConfig {
 mod tests {
     use std::{env, fs, path::PathBuf, str::FromStr};
 
-    use alloy::primitives::FixedBytes;
+    use alloy::primitives::{Address, FixedBytes};
     use figment::value::Uncased;
     use sealed_test::prelude::*;
     use tracing_test::traced_test;
@@ -450,7 +450,7 @@ mod tests {
         )
         .unwrap();
         max_config.dips = Some(crate::DipsConfig {
-            allowed_payers: vec![thegraph_core::Address(
+            allowed_payers: vec![Address(
                 FixedBytes::<20>::from_str("0x3333333333333333333333333333333333333333").unwrap(),
             )],
             cancellation_time_tolerance: None,

crates/dips/src/lib.rs

@@ -12,10 +12,10 @@ use alloy::{
     primitives::PrimitiveSignature as Signature,
     rlp::{RlpDecodable, RlpEncodable},
     signers::SignerSync,
+    sol_types::{sol, Eip712Domain, SolStruct},
 };
 pub use alloy_rlp;
 use alloy_rlp::Encodable;
-use thegraph_core::alloy_sol_types::{sol, Eip712Domain, SolStruct};
 use thiserror::Error;
 
 sol! {

crates/monitor/src/attestation.rs

@@ -6,11 +6,11 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use alloy::primitives::{Address, ChainId};
 use bip39::Mnemonic;
 use indexer_allocation::Allocation;
 use indexer_attestation::AttestationSigner;
 use indexer_watcher::join_and_map_watcher;
-use thegraph_core::{Address, ChainId};
 use tokio::sync::watch::Receiver;
 use tracing::warn;
 
@@ -51,7 +51,7 @@ fn modify_sigers(
     attestation_signers_map: &'static Mutex<HashMap<Address, AttestationSigner>>,
     allocations: &HashMap<Address, Allocation>,
     dispute_manager: &Address,
-) -> HashMap<thegraph_core::Address, AttestationSigner> {
+) -> HashMap<Address, AttestationSigner> {
     let mut signers = attestation_signers_map.lock().unwrap();
     // Remove signers for allocations that are no longer active or recently closed
     signers.retain(|id, _| allocations.contains_key(id));

crates/monitor/src/deployment_to_allocation.rs

@@ -3,8 +3,9 @@
 
 use std::collections::HashMap;
 
+use alloy::primitives::Address;
 use indexer_watcher::map_watcher;
-use thegraph_core::{Address, DeploymentId};
+use thegraph_core::DeploymentId;
 use tokio::sync::watch::Receiver;
 
 use crate::AllocationWatcher;

crates/service/src/middleware/sender.rs

@@ -1,7 +1,7 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
-use alloy::{dyn_abi::Eip712Domain, primitives::Address};
+use alloy::{primitives::Address, sol_types::Eip712Domain};
 use axum::{
     extract::{Request, State},
     middleware::Next,

crates/service/src/routes/dips.rs

@@ -8,7 +8,7 @@ use async_graphql::{Context, EmptySubscription, FieldResult, Object, Schema, Sim
 use base64::{engine::general_purpose::STANDARD, Engine};
 use indexer_config::{BlockchainConfig, DipsConfig};
 use indexer_dips::{
-    alloy::{core::primitives::Address, dyn_abi::Eip712Domain},
+    alloy::{core::primitives::Address, sol_types::Eip712Domain},
     alloy_rlp::Decodable,
     SignedCancellationRequest, SignedIndexingAgreementVoucher, SubgraphIndexingVoucherMetadata,
 };

crates/service/src/service/router.rs

@@ -3,7 +3,7 @@
 
 use std::{sync::Arc, time::Duration};
 
-use alloy::dyn_abi::Eip712Domain;
+use alloy::sol_types::Eip712Domain;
 use async_graphql_axum::GraphQL;
 use axum::{
     extract::MatchedPath,

crates/service/src/tap.rs

@@ -3,7 +3,7 @@
 
 use std::{collections::HashMap, fmt::Debug, sync::Arc, time::Duration};
 
-use alloy::{dyn_abi::Eip712Domain, primitives::Address};
+use alloy::{primitives::Address, sol_types::Eip712Domain};
 use indexer_allocation::Allocation;
 use indexer_monitor::EscrowAccounts;
 use receipt_store::{DatabaseReceipt, InnerContext};