diff --git a/common/src/attestations/dispute_manager.rs b/common/src/attestations/dispute_manager.rs
index 7c64c6e02..2cdc0fa34 100644
--- a/common/src/attestations/dispute_manager.rs
+++ b/common/src/attestations/dispute_manager.rs
@@ -3,9 +3,9 @@
 
 use std::time::Duration;
 
+use alloy::primitives::Address;
 use eventuals::{timer, Eventual, EventualExt};
 use graphql_client::GraphQLQuery;
-use thegraph_core::Address;
 use tokio::time::sleep;
 use tracing::warn;
 
diff --git a/common/src/escrow_accounts.rs b/common/src/escrow_accounts.rs
index 6a29cefed..ddee549a4 100644
--- a/common/src/escrow_accounts.rs
+++ b/common/src/escrow_accounts.rs
@@ -7,11 +7,10 @@ use std::{
     time::Duration,
 };
 
-use alloy::primitives::U256;
+use alloy::primitives::{Address, U256};
 use anyhow::{anyhow, Result};
 use eventuals::{timer, Eventual, EventualExt};
 use graphql_client::GraphQLQuery;
-use thegraph_core::Address;
 use thiserror::Error;
 use tokio::time::sleep;
 use tracing::{error, warn};
diff --git a/common/src/indexer_service/http/tap_receipt_header.rs b/common/src/indexer_service/http/tap_receipt_header.rs
index 11e2cf8c6..15ced23c4 100644
--- a/common/src/indexer_service/http/tap_receipt_header.rs
+++ b/common/src/indexer_service/http/tap_receipt_header.rs
@@ -67,9 +67,9 @@ impl Header for TapReceipt {
 mod test {
     use std::str::FromStr;
 
+    use alloy::primitives::Address;
     use axum::http::HeaderValue;
     use axum_extra::headers::Header;
-    use thegraph_core::Address;
 
     use crate::test_vectors::create_signed_receipt;
 
diff --git a/common/src/tap.rs b/common/src/tap.rs
index 4749558fd..77298f8c2 100644
--- a/common/src/tap.rs
+++ b/common/src/tap.rs
@@ -8,6 +8,7 @@ use crate::tap::checks::sender_balance_check::SenderBalanceCheck;
 use crate::tap::checks::timestamp_check::TimestampCheck;
 use crate::{escrow_accounts::EscrowAccounts, prelude::Allocation};
 use alloy::dyn_abi::Eip712Domain;
+use alloy::primitives::Address;
 use eventuals::Eventual;
 use receipt_store::{DatabaseReceipt, InnerContext};
 use sqlx::PgPool;
@@ -15,7 +16,6 @@ use std::fmt::Debug;
 use std::time::Duration;
 use std::{collections::HashMap, sync::Arc};
 use tap_core::receipt::checks::ReceiptCheck;
-use thegraph_core::Address;
 use tokio::sync::mpsc::{self, Sender};
 use tokio_util::sync::CancellationToken;
 use tracing::error;
diff --git a/common/src/tap/checks/deny_list_check.rs b/common/src/tap/checks/deny_list_check.rs
index 7048f8613..469e6a848 100644
--- a/common/src/tap/checks/deny_list_check.rs
+++ b/common/src/tap/checks/deny_list_check.rs
@@ -3,6 +3,7 @@
 
 use crate::escrow_accounts::EscrowAccounts;
 use alloy::dyn_abi::Eip712Domain;
+use alloy::primitives::Address;
 use eventuals::Eventual;
 use sqlx::postgres::PgListener;
 use sqlx::PgPool;
@@ -15,7 +16,6 @@ use tap_core::receipt::{
     state::Checking,
     ReceiptWithState,
 };
-use thegraph_core::Address;
 use tracing::error;
 
 pub struct DenyListCheck {
diff --git a/tap-agent/src/agent/sender_account.rs b/tap-agent/src/agent/sender_account.rs
index 8bc3d103d..bbf295e53 100644
--- a/tap-agent/src/agent/sender_account.rs
+++ b/tap-agent/src/agent/sender_account.rs
@@ -13,13 +13,13 @@ use std::time::Duration;
 use tokio::task::JoinHandle;
 
 use alloy::dyn_abi::Eip712Domain;
+use alloy::primitives::Address;
 use anyhow::Result;
 use eventuals::{Eventual, EventualExt, PipeHandle};
 use indexer_common::{escrow_accounts::EscrowAccounts, prelude::SubgraphClient};
 use ractor::{call, Actor, ActorProcessingErr, ActorRef, MessagingErr, SupervisionEvent};
 use sqlx::PgPool;
 use tap_core::rav::SignedRAV;
-use thegraph_core::Address;
 use tracing::{error, Level};
 
 use super::sender_allocation::{SenderAllocation, SenderAllocationArgs};
diff --git a/tap-agent/src/agent/sender_accounts_manager.rs b/tap-agent/src/agent/sender_accounts_manager.rs
index abeff0518..135e4dc63 100644
--- a/tap-agent/src/agent/sender_accounts_manager.rs
+++ b/tap-agent/src/agent/sender_accounts_manager.rs
@@ -8,6 +8,7 @@ use std::{collections::HashMap, str::FromStr};
 use crate::agent::sender_allocation::SenderAllocationMessage;
 use crate::lazy_static;
 use alloy::dyn_abi::Eip712Domain;
+use alloy::primitives::Address;
 use anyhow::Result;
 use anyhow::{anyhow, bail};
 use eventuals::{Eventual, EventualExt, PipeHandle};
@@ -16,7 +17,6 @@ use indexer_common::prelude::{Allocation, SubgraphClient};
 use ractor::{Actor, ActorCell, ActorProcessingErr, ActorRef, SupervisionEvent};
 use serde::Deserialize;
 use sqlx::{postgres::PgListener, PgPool};
-use thegraph_core::Address;
 use tokio::select;
 use tracing::{error, warn};
 
diff --git a/tap-agent/src/agent/sender_allocation.rs b/tap-agent/src/agent/sender_allocation.rs
index c1df14060..dc0e70cb7 100644
--- a/tap-agent/src/agent/sender_allocation.rs
+++ b/tap-agent/src/agent/sender_allocation.rs
@@ -6,6 +6,7 @@ use std::{
     time::{Duration, Instant},
 };
 
+use alloy::primitives::Address;
 use alloy::{dyn_abi::Eip712Domain, hex::ToHexExt};
 use anyhow::{anyhow, ensure, Result};
 use bigdecimal::num_bigint::BigInt;
@@ -26,7 +27,6 @@ use tap_core::{
     },
     signed_message::EIP712SignedMessage,
 };
-use thegraph_core::Address;
 use tracing::{debug, error, warn};
 
 use crate::{agent::sender_account::ReceiptFees, lazy_static};
diff --git a/tap-agent/src/tap/context/escrow.rs b/tap-agent/src/tap/context/escrow.rs
index f004fe72a..a362f6921 100644
--- a/tap-agent/src/tap/context/escrow.rs
+++ b/tap-agent/src/tap/context/escrow.rs
@@ -1,9 +1,9 @@
 // Copyright 2023-, Edge & Node, GraphOps, and Semiotic Labs.
 // SPDX-License-Identifier: Apache-2.0
 
+use alloy::primitives::Address;
 use async_trait::async_trait;
 use tap_core::manager::adapters::EscrowHandler as EscrowAdapterTrait;
-use thegraph_core::Address;
 
 use super::{error::AdapterError, TapAgentContext};
 
diff --git a/tap-agent/src/tap/context/receipt.rs b/tap-agent/src/tap/context/receipt.rs
index a34b709dd..b530629a3 100644
--- a/tap-agent/src/tap/context/receipt.rs
+++ b/tap-agent/src/tap/context/receipt.rs
@@ -8,13 +8,13 @@ use std::{
 };
 
 use alloy::hex::ToHexExt;
+use alloy::primitives::Address;
 use bigdecimal::{num_bigint::ToBigInt, ToPrimitive};
 use sqlx::{postgres::types::PgRange, types::BigDecimal};
 use tap_core::{
     manager::adapters::{safe_truncate_receipts, ReceiptDelete, ReceiptRead},
     receipt::{state::Checking, Receipt, ReceiptWithState, SignedReceipt},
 };
-use thegraph_core::Address;
 
 use crate::tap::signers_trimmed;
 
diff --git a/tap-agent/src/tap/escrow_adapter.rs b/tap-agent/src/tap/escrow_adapter.rs
index 7ef94f341..04ac22553 100644
--- a/tap-agent/src/tap/escrow_adapter.rs
+++ b/tap-agent/src/tap/escrow_adapter.rs
@@ -3,11 +3,11 @@
 
 use std::sync::{Arc, RwLock};
 
+use alloy::primitives::Address;
 use async_trait::async_trait;
 use eventuals::Eventual;
 use indexer_common::escrow_accounts::EscrowAccounts;
 use tap_core::manager::adapters::EscrowHandler as EscrowAdapterTrait;
-use thegraph_core::Address;
 
 use super::context::AdapterError;
 
diff --git a/tap-agent/src/tap/mod.rs b/tap-agent/src/tap/mod.rs
index 1c642b7fa..76356ca92 100644
--- a/tap-agent/src/tap/mod.rs
+++ b/tap-agent/src/tap/mod.rs
@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use alloy::hex::ToHexExt;
+use alloy::primitives::Address;
 use anyhow::anyhow;
 use eventuals::Eventual;
 use indexer_common::escrow_accounts::EscrowAccounts;
-use thegraph_core::Address;
 
 pub mod context;
 pub mod escrow_adapter;
diff --git a/tap-agent/src/tap/test_utils.rs b/tap-agent/src/tap/test_utils.rs
index 28a9f043a..f134df01b 100644
--- a/tap-agent/src/tap/test_utils.rs
+++ b/tap-agent/src/tap/test_utils.rs
@@ -13,6 +13,7 @@ use bigdecimal::num_bigint::BigInt;
 use sqlx::types::BigDecimal;
 
 use alloy::dyn_abi::Eip712Domain;
+use alloy::primitives::Address;
 use lazy_static::lazy_static;
 use sqlx::PgPool;
 use tap_core::{
@@ -20,7 +21,6 @@ use tap_core::{
     receipt::{state::Checking, Receipt, ReceiptWithState, SignedReceipt},
     signed_message::EIP712SignedMessage,
 };
-use thegraph_core::Address;
 
 lazy_static! {
     pub static ref ALLOCATION_ID_0: Address =