feat: get domain separator from domain config

Author: suchapalaver

crates/service/src/service.rs

@@ -21,7 +21,7 @@ use indexer_dips::{
 use indexer_monitor::{escrow_accounts_v1, escrow_accounts_v2, DeploymentDetails, SubgraphClient};
 use release::IndexerServiceRelease;
 use reqwest::Url;
-use tap_core::tap_eip712_domain;
+use tap_core::{tap_eip712_domain, TapVersion};
 use tokio::{net::TcpListener, signal};
 use tower_http::normalize_path::NormalizePath;
 use tracing::info;
@@ -90,12 +90,6 @@ pub async fn run() -> anyhow::Result<()> {
     let database =
         database::connect(config.database.clone().get_formated_postgres_url().as_ref()).await;
 
-    let domain_separator = tap_eip712_domain(
-        config.blockchain.chain_id as u64,
-        config.blockchain.receipts_verifier_address,
-    );
-    let chain_id = config.blockchain.chain_id as u64;
-
     let host_and_port = config.service.host_and_port;
     let indexer_address = config.indexer.indexer_address;
     let ipfs_url = config.service.ipfs_url.clone();
@@ -108,7 +102,7 @@ pub async fn run() -> anyhow::Result<()> {
     // Determine if we should check for Horizon contracts and potentially enable hybrid mode:
     // - If horizon.enabled = false: Pure legacy mode, no Horizon detection
     // - If horizon.enabled = true: Check if Horizon contracts are active in the network
-    let is_horizon_active = if config.horizon.enabled {
+    let horizon_is_active = if config.horizon.enabled {
         tracing::info!("Horizon migration support enabled - checking if Horizon contracts are active in the network");
         match indexer_monitor::is_horizon_active(network_subgraph).await {
             Ok(active) => {
@@ -135,8 +129,20 @@ pub async fn run() -> anyhow::Result<()> {
         false
     };
 
+    let chain_id = config.blockchain.chain_id as u64;
+
+    let domain_separator = tap_eip712_domain(
+        chain_id,
+        config.blockchain.receipts_verifier_address,
+        if horizon_is_active {
+            TapVersion::V2
+        } else {
+            TapVersion::V1
+        },
+    );
+
     // Configure router with escrow watchers based on automatic Horizon detection
-    let router = if is_horizon_active {
+    let router = if horizon_is_active {
         tracing::info!("Horizon contracts detected - using Horizon migration mode: V2 receipts only, but processing existing V1 receipts");
 
         // Create V1 escrow watcher for processing existing receipts

crates/service/src/tap/checks/receipt_max_val_check.rs

@@ -66,7 +66,7 @@ mod tests {
             .unwrap();
 
         let eip712_domain_separator: Eip712Domain =
-            tap_eip712_domain(1, Address::from([0x11u8; 20]));
+            tap_eip712_domain(1, Address::from([0x11u8; 20]), tap_core::TapVersion::V1);
 
         let timestamp = SystemTime::now()
             .duration_since(SystemTime::UNIX_EPOCH)

crates/service/src/tap/checks/timestamp_check.rs

@@ -75,7 +75,7 @@ mod tests {
             .build()
             .unwrap();
         let eip712_domain_separator: Eip712Domain =
-            tap_eip712_domain(1, Address::from([0x11u8; 20]));
+            tap_eip712_domain(1, Address::from([0x11u8; 20]), tap_core::TapVersion::V1);
         let value: u128 = 1234;
         let nonce: u64 = 10;
         let receipt = Eip712SignedMessage::new(

crates/tap-agent/src/agent.rs

@@ -49,7 +49,7 @@ use sender_accounts_manager::SenderAccountsManager;
 
 use crate::{
     agent::sender_accounts_manager::{SenderAccountsManagerArgs, SenderAccountsManagerMessage},
-    database, CONFIG, EIP_712_DOMAIN,
+    database, CONFIG,
 };
 
 /// Actor, Arguments, State, Messages and implementation for [crate::agent::sender_account::SenderAccount]
@@ -169,7 +169,7 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     // Determine if we should check for Horizon contracts and potentially enable hybrid mode:
     // - If horizon.enabled = false: Pure legacy mode, no Horizon detection
     // - If horizon.enabled = true: Check if Horizon contracts are active in the network
-    let is_horizon_enabled = if CONFIG.horizon.enabled {
+    let horizon_is_enabled = if CONFIG.horizon.enabled {
         tracing::info!("Horizon migration support enabled - checking if Horizon contracts are active in the network");
         match indexer_monitor::is_horizon_active(network_subgraph).await {
             Ok(active) => {
@@ -198,7 +198,7 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
 
     // Create V2 escrow accounts watcher only if Horizon is active
     // V2 escrow accounts are in the network subgraph, not a separate TAP v2 subgraph
-    let escrow_accounts_v2 = if is_horizon_enabled {
+    let escrow_accounts_v2 = if horizon_is_enabled {
         escrow_accounts_v2(
             network_subgraph,
             *indexer_address,
@@ -213,7 +213,7 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     };
 
     // In both modes we need both watchers for the hybrid processing
-    let (escrow_accounts_v1_final, escrow_accounts_v2_final) = if is_horizon_enabled {
+    let (escrow_accounts_v1_final, escrow_accounts_v2_final) = if horizon_is_enabled {
         tracing::info!("TAP Agent: Horizon migration mode - processing existing V1 receipts and new V2 receipts");
         (escrow_accounts_v1, escrow_accounts_v2)
     } else {
@@ -223,13 +223,23 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
 
     let config = Box::leak(Box::new({
         let mut config = SenderAccountConfig::from_config(&CONFIG);
-        config.horizon_enabled = is_horizon_enabled;
+        config.horizon_enabled = horizon_is_enabled;
         config
     }));
 
+    let domain_separator = tap_core::tap_eip712_domain(
+        CONFIG.blockchain.chain_id as u64,
+        CONFIG.blockchain.receipts_verifier_address,
+        if horizon_is_enabled {
+            tap_core::TapVersion::V2
+        } else {
+            tap_core::TapVersion::V1
+        },
+    );
+
     let args = SenderAccountsManagerArgs {
         config,
-        domain_separator: EIP_712_DOMAIN.clone(),
+        domain_separator,
         pgpool,
         indexer_allocations,
         escrow_accounts_v1: escrow_accounts_v1_final,

crates/tap-agent/src/lib.rs

@@ -14,19 +14,10 @@
 use std::sync::LazyLock;
 
 use indexer_config::Config;
-use tap_core::tap_eip712_domain;
-use thegraph_core::alloy::sol_types::Eip712Domain;
 
 /// Static configuration
 pub static CONFIG: LazyLock<Config> =
     LazyLock::new(|| cli::get_config().expect("Failed to load configuration"));
-/// Static EIP_712_DOMAIN used with config values
-pub static EIP_712_DOMAIN: LazyLock<Eip712Domain> = LazyLock::new(|| {
-    tap_eip712_domain(
-        CONFIG.blockchain.chain_id as u64,
-        CONFIG.blockchain.receipts_verifier_address,
-    )
-});
 
 pub mod adaptative_concurrency;
 pub mod agent;

crates/tap-agent/src/test.rs

@@ -19,7 +19,7 @@ use rand::{distr::Alphanumeric, rng, Rng};
 use reqwest::Url;
 use sqlx::{types::BigDecimal, PgPool};
 use tap_aggregator::server::run_server;
-use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
+use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain, TapVersion};
 use tap_graph::{Receipt, ReceiptAggregateVoucher, SignedRav, SignedReceipt};
 use test_assets::{flush_messages, TAP_SENDER as SENDER, TAP_SIGNER as SIGNER};
 use thegraph_core::alloy::{
@@ -56,7 +56,7 @@ use crate::{
 pub static SENDER_2: LazyLock<(PrivateKeySigner, Address)> = LazyLock::new(|| wallet(1));
 pub static INDEXER: LazyLock<(PrivateKeySigner, Address)> = LazyLock::new(|| wallet(3));
 pub static TAP_EIP712_DOMAIN_SEPARATOR: LazyLock<Eip712Domain> =
-    LazyLock::new(|| tap_eip712_domain(1, Address::from([0x11u8; 20])));
+    LazyLock::new(|| tap_eip712_domain(1, Address::from([0x11u8; 20]), TapVersion::V1));
 
 pub const TRIGGER_VALUE: u128 = 500;
 pub const RECEIPT_LIMIT: u64 = 10000;

crates/test-assets/src/lib.rs

@@ -372,7 +372,7 @@ pub static TAP_SIGNER: LazyLock<(PrivateKeySigner, Address)> = LazyLock::new(||
 });
 
 pub static TAP_EIP712_DOMAIN: LazyLock<Eip712Domain> =
-    LazyLock::new(|| tap_eip712_domain(1, VERIFIER_ADDRESS));
+    LazyLock::new(|| tap_eip712_domain(1, VERIFIER_ADDRESS, tap_core::TapVersion::V1));
 
 #[derive(bon::Builder)]
 pub struct SignedReceiptRequest {

integration-tests/src/signature_test.rs

@@ -5,7 +5,7 @@
 
 use anyhow::Result;
 use std::str::FromStr;
-use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
+use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain, TapVersion};
 use tap_graph::v2::Receipt as V2Receipt;
 use thegraph_core::{
     alloy::{primitives::Address, signers::local::PrivateKeySigner},
@@ -24,7 +24,11 @@ pub async fn test_v2_signature_recovery() -> Result<()> {
     println!("Wallet address: {wallet_address:?}");
 
     // Create EIP-712 domain - V2 uses GraphTallyCollector
-    let domain = tap_eip712_domain(CHAIN_ID, Address::from_str(GRAPH_TALLY_COLLECTOR_CONTRACT)?);
+    let domain = tap_eip712_domain(
+        CHAIN_ID,
+        Address::from_str(GRAPH_TALLY_COLLECTOR_CONTRACT)?,
+        TapVersion::V2,
+    );
     println!("Using domain: chain_id={CHAIN_ID}, verifier={GRAPH_TALLY_COLLECTOR_CONTRACT}");
 
     // Create a V2 receipt

integration-tests/src/utils.rs

@@ -14,7 +14,7 @@ use rand::{rng, Rng};
 use reqwest::Client;
 use serde_json::json;
 use tap_aggregator::grpc;
-use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain};
+use tap_core::{signed_message::Eip712SignedMessage, tap_eip712_domain, TapVersion};
 use tap_graph::Receipt;
 use thegraph_core::alloy::{primitives::Address, signers::local::PrivateKeySigner};
 use thegraph_core::CollectionId;
@@ -37,8 +37,11 @@ pub fn create_tap_receipt(
     let timestamp_ns = timestamp as u64;
 
     // Create domain separator
-    let eip712_domain_separator =
-        tap_eip712_domain(chain_id, Address::from_str(verifier_contract)?);
+    let eip712_domain_separator = tap_eip712_domain(
+        chain_id,
+        Address::from_str(verifier_contract)?,
+        TapVersion::V1,
+    );
 
     // Create and sign receipt
     println!("Creating and signing receipt...");
@@ -78,8 +81,11 @@ pub fn create_tap_receipt_v2(
     let collection_id = CollectionId::from(*allocation_id);
 
     // Create domain separator - V2 uses GraphTallyCollector
-    let eip712_domain_separator =
-        tap_eip712_domain(chain_id, Address::from_str(GRAPH_TALLY_COLLECTOR_CONTRACT)?);
+    let eip712_domain_separator = tap_eip712_domain(
+        chain_id,
+        Address::from_str(GRAPH_TALLY_COLLECTOR_CONTRACT)?,
+        TapVersion::V2,
+    );
 
     let wallet_address = wallet.address();
     // Create and sign V2 receipt