feat(tap-agent): integrate V2 domain separator throughout agent

  Add V2 domain separator support to sender account management, allocation
  handling, and receipt processing. Maintains single allocation type invariant
  while enabling version-appropriate domain usage.

Author: neithanmo

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, EIP_712_DOMAIN, EIP_712_DOMAIN_V2,
 };
 
 /// Actor, Arguments, State, Messages and implementation for [crate::agent::sender_account::SenderAccount]
@@ -244,6 +244,7 @@ pub async fn start_agent() -> (ActorRef<SenderAccountsManagerMessage>, JoinHandl
     let args = SenderAccountsManagerArgs {
         config,
         domain_separator: EIP_712_DOMAIN.clone(),
+        domain_separator_v2: EIP_712_DOMAIN_V2.clone(),
         pgpool,
         indexer_allocations,
         escrow_accounts_v1: escrow_accounts_v1_final,

crates/tap-agent/src/agent/sender_account.rs

@@ -272,6 +272,9 @@ pub struct SenderAccountArgs {
     pub network_subgraph: &'static SubgraphClient,
     /// Domain separator used for tap
     pub domain_separator: Eip712Domain,
+    // TODO: check if we need this
+    /// Domain separator used for horizon
+    pub domain_separator_v2: Eip712Domain,
     /// Endpoint URL for aggregator server
     pub sender_aggregator_endpoint: Url,
     /// List of allocation ids that must created at startup
@@ -349,6 +352,8 @@ pub struct State {
 
     /// Domain separator used for tap
     domain_separator: Eip712Domain,
+    /// Domain separator used for horizon
+    domain_separator_v2: Eip712Domain,
     /// Database connection
     pgpool: PgPool,
     /// Aggregator client for V1
@@ -483,7 +488,7 @@ impl State {
                     .sender(self.sender)
                     .escrow_accounts(self.escrow_accounts.clone())
                     .escrow_subgraph(self.escrow_subgraph)
-                    .domain_separator(self.domain_separator.clone())
+                    .domain_separator(self.domain_separator_v2.clone())
                     .sender_account_ref(sender_account_ref.clone())
                     .sender_aggregator(self.aggregator_v2.clone())
                     .config(AllocationConfig::from_sender_config(self.config))
@@ -783,6 +788,7 @@ impl Actor for SenderAccount {
             escrow_subgraph,
             network_subgraph,
             domain_separator,
+            domain_separator_v2,
             sender_aggregator_endpoint,
             allocation_ids,
             prefix,
@@ -797,7 +803,7 @@ impl Actor for SenderAccount {
             myself_clone
                 .cast(SenderAccountMessage::UpdateAllocationIds(allocation_ids))
                 .unwrap_or_else(|e| {
-                    tracing::error!("Error while updating allocation_ids: {:?}", e);
+                    tracing::error!(error=?e, "Error while updating allocation_ids");
                 });
             async {}
         });
@@ -1093,6 +1099,7 @@ impl Actor for SenderAccount {
             escrow_subgraph,
             network_subgraph,
             domain_separator,
+            domain_separator_v2,
             pgpool,
             aggregator_v1,
             aggregator_v2,

crates/tap-agent/src/agent/sender_accounts_manager.rs

@@ -39,6 +39,8 @@ static RECEIPTS_CREATED: LazyLock<CounterVec> = LazyLock::new(|| {
     .unwrap()
 });
 
+const RETRY_INTERVAL: Duration = Duration::from_secs(30);
+
 /// Notification received by pgnotify for V1 (legacy) receipts
 ///
 /// This contains a list of properties that are sent by postgres when a V1 receipt is inserted
@@ -231,6 +233,9 @@ pub struct SenderAccountsManagerArgs {
     /// Domain separator used for tap
     pub domain_separator: Eip712Domain,
 
+    /// Domain separator used for tap v2 (Horizon)
+    pub domain_separator_v2: Eip712Domain,
+
     /// Database connection
     pub pgpool: PgPool,
     /// Watcher that returns a map of open and recently closed allocation ids
@@ -262,6 +267,7 @@ pub struct State {
 
     config: &'static SenderAccountConfig,
     domain_separator: Eip712Domain,
+    domain_separator_v2: Eip712Domain,
     pgpool: PgPool,
     indexer_allocations: Receiver<HashSet<AllocationId>>,
     /// Watcher containing the escrow accounts for v1
@@ -289,6 +295,7 @@ impl Actor for SenderAccountsManager {
         SenderAccountsManagerArgs {
             config,
             domain_separator,
+            domain_separator_v2,
             indexer_allocations,
             pgpool,
             escrow_accounts_v1,
@@ -299,32 +306,15 @@ impl Actor for SenderAccountsManager {
             prefix,
         }: Self::Arguments,
     ) -> Result<Self::State, ActorProcessingErr> {
-        let is_horizon_active = if config.horizon_enabled {
-            match indexer_monitor::is_horizon_active(network_subgraph).await {
-                Ok(active) => {
-                    if active {
-                        tracing::info!(
-                            "Horizon contracts detected - allocations will use Horizon type"
-                        );
-                    } else {
-                        tracing::info!(
-                            "Horizon contracts not active - allocations will use Legacy type"
-                        );
-                    }
-                    active
-                }
-                Err(e) => {
-                    tracing::warn!(
-                        "Failed to detect Horizon contracts: {}. Using Legacy type",
-                        e
-                    );
-                    false
-                }
-            }
+        // we can use config.horizon_enabled directly
+        // because agent_start method does the horizon smart contract/subgraph validation
+        // and updates the passed in config accordingly
+        let is_horizon_active = config.horizon_enabled;
+        if is_horizon_active {
+            tracing::info!("Horizon enabled in config - allocations will use Horizon type");
         } else {
             tracing::info!("Horizon disabled in config - allocations will use Legacy type");
-            false
-        };
+        }
 
         let indexer_allocations = map_watcher(indexer_allocations, move |allocation_id| {
             let allocations: HashSet<_> = allocation_id
@@ -403,6 +393,7 @@ impl Actor for SenderAccountsManager {
         let mut state = State {
             config,
             domain_separator,
+            domain_separator_v2,
             sender_ids_v1: HashSet::new(),
             sender_ids_v2: HashSet::new(),
             new_receipts_watcher_handle_v1: None,
@@ -998,18 +989,21 @@ impl State {
         allocation_ids: HashSet<AllocationId>,
         sender_type: SenderType,
     ) -> anyhow::Result<SenderAccountArgs> {
+        let escrow_accounts = match sender_type {
+            SenderType::Legacy => self.escrow_accounts_v1.clone(),
+            SenderType::Horizon => self.escrow_accounts_v2.clone(),
+        };
+
         Ok(SenderAccountArgs {
             config: self.config,
             pgpool: self.pgpool.clone(),
             sender_id: *sender_id,
-            escrow_accounts: match sender_type {
-                SenderType::Legacy => self.escrow_accounts_v1.clone(),
-                SenderType::Horizon => self.escrow_accounts_v2.clone(),
-            },
+            escrow_accounts,
             indexer_allocations: self.indexer_allocations.clone(),
             escrow_subgraph: self.escrow_subgraph,
             network_subgraph: self.network_subgraph,
             domain_separator: self.domain_separator.clone(),
+            domain_separator_v2: self.domain_separator_v2.clone(),
             sender_aggregator_endpoint: self
                 .sender_aggregator_endpoints
                 .get(sender_id)
@@ -1020,7 +1014,7 @@ impl State {
                 .clone(),
             allocation_ids,
             prefix: self.prefix.clone(),
-            retry_interval: Duration::from_secs(30),
+            retry_interval: RETRY_INTERVAL,
             sender_type,
         })
     }
@@ -1356,7 +1350,7 @@ mod tests {
             create_rav, create_received_receipt, create_sender_accounts_manager,
             generate_random_prefix, get_grpc_url, get_sender_account_config, store_rav,
             store_receipt, ALLOCATION_ID_0, ALLOCATION_ID_1, INDEXER, SENDER_2,
-            TAP_EIP712_DOMAIN_SEPARATOR,
+            TAP_EIP712_DOMAIN_SEPARATOR, TAP_EIP712_DOMAIN_SEPARATOR_V2,
         },
     };
     const DUMMY_URL: &str = "http://localhost:1234";
@@ -1412,6 +1406,7 @@ mod tests {
             State {
                 config,
                 domain_separator: TAP_EIP712_DOMAIN_SEPARATOR.clone(),
+                domain_separator_v2: TAP_EIP712_DOMAIN_SEPARATOR_V2.clone(),
                 sender_ids_v1: HashSet::new(),
                 sender_ids_v2: HashSet::new(),
                 new_receipts_watcher_handle_v1: None,

crates/tap-agent/src/agent/sender_allocation.rs

@@ -148,7 +148,11 @@ pub struct SenderAllocationState<T: NetworkVersion> {
 
     /// Watcher containing the escrow accounts
     escrow_accounts: Receiver<EscrowAccounts>,
-    /// Domain separator used for tap
+    /// Domain separator used for tap/horizon
+    /// depending if SenderAllocationState<Legacy> or SenderAllocationState<Horizon>??
+    /// TODO: Double check if we actually need to add an additional domain_sepparator_v2 field
+    /// at first glance it seems like each sender allocation will deal only with one allocation
+    /// type. not both
     domain_separator: Eip712Domain,
     /// Reference to [super::sender_account::SenderAccount] actor
     ///