refactor: configure system for transition mode

Signed-off-by: Joseph Livesey <[email protected]>

Author: suchapalaver

contrib/indexer-service/config.toml

@@ -46,4 +46,8 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-enabled = true
+# Horizon migration mode: legacy | transition | full
+# - legacy: Only v1 TAP receipts supported (pre-migration)
+# - transition: Both v1 and v2 TAP receipts supported (during migration)  
+# - full: Only v2 TAP receipts supported (post-migration)
+mode = "transition"

contrib/tap-agent/config.toml

@@ -12,10 +12,18 @@ status_url = "http://graph-node:8030/graphql"
 [subgraphs.network]
 query_url = "http://graph-node:8000/subgraphs/name/graph-network"
 deployment_id = "NETWORK_DEPLOYMENT_PLACEHOLDER"
+syncing_interval_secs = 30
+recently_closed_allocation_buffer_secs = 60
 
 [subgraphs.escrow]
 query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"
 deployment_id = "ESCROW_DEPLOYMENT_PLACEHOLDER"
+syncing_interval_secs = 30
+
+[subgraphs.escrow_v2]
+query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap-v2"
+deployment_id = "ESCROW_V2_DEPLOYMENT_PLACEHOLDER"
+syncing_interval_secs = 30
 
 [blockchain]
 chain_id = 1337
@@ -46,4 +54,8 @@ trigger_value_divisor = 500_000
 "ACCOUNT0_ADDRESS_PLACEHOLDER" = "http://tap-aggregator:7610"
 
 [horizon]
-enabled = true
+# Horizon migration mode: legacy | transition | full
+# - legacy: Only v1 TAP receipts supported (pre-migration)
+# - transition: Both v1 and v2 TAP receipts supported (during migration)  
+# - full: Only v2 TAP receipts supported (post-migration)
+mode = "transition"

contrib/tap-agent/start.sh

@@ -105,12 +105,43 @@ fi
 
 echo "Escrow subgraph deployment ID: $ESCROW_DEPLOYMENT"
 
+# Get escrow v2 subgraph deployment ID with retries
+echo "Getting escrow v2 subgraph deployment ID..."
+MAX_ATTEMPTS=30
+ATTEMPT=0
+ESCROW_V2_DEPLOYMENT=""
+
+while [ -z "$ESCROW_V2_DEPLOYMENT" ] || [ "$ESCROW_V2_DEPLOYMENT" = "null" ] && [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
+    ESCROW_V2_DEPLOYMENT=$(curl -s "http://graph-node:8000/subgraphs/name/semiotic/tap-v2" \
+        -H 'content-type: application/json' \
+        -d '{"query": "{ _meta { deployment } }"}' | jq -r '.data._meta.deployment' 2>/dev/null)
+
+    if [ -z "$ESCROW_V2_DEPLOYMENT" ] || [ "$ESCROW_V2_DEPLOYMENT" = "null" ]; then
+        ATTEMPT=$((ATTEMPT + 1))
+        echo "Waiting for escrow v2 subgraph to be deployed... Attempt $ATTEMPT/$MAX_ATTEMPTS"
+        sleep 5
+    fi
+done
+
+if [ -z "$ESCROW_V2_DEPLOYMENT" ] || [ "$ESCROW_V2_DEPLOYMENT" = "null" ]; then
+    echo "WARNING: Failed to get escrow v2 subgraph deployment ID after $MAX_ATTEMPTS attempts"
+    # Continue without v2 for backward compatibility
+else
+    echo "Escrow v2 subgraph deployment ID: $ESCROW_V2_DEPLOYMENT"
+fi
+
 # Copy the config template
 cp /opt/config/config.toml /opt/config.toml
 
 # Replace the placeholders with actual values
 sed -i "s/NETWORK_DEPLOYMENT_PLACEHOLDER/$NETWORK_DEPLOYMENT/g" /opt/config.toml
 sed -i "s/ESCROW_DEPLOYMENT_PLACEHOLDER/$ESCROW_DEPLOYMENT/g" /opt/config.toml
+if [ ! -z "$ESCROW_V2_DEPLOYMENT" ] && [ "$ESCROW_V2_DEPLOYMENT" != "null" ]; then
+    sed -i "s/ESCROW_V2_DEPLOYMENT_PLACEHOLDER/$ESCROW_V2_DEPLOYMENT/g" /opt/config.toml
+else
+    # Remove the escrow_v2 section if deployment not found
+    sed -i '/\[subgraphs.escrow_v2\]/,/^$/d' /opt/config.toml
+fi
 sed -i "s/VERIFIER_ADDRESS_PLACEHOLDER/$VERIFIER_ADDRESS/g" /opt/config.toml
 sed -i "s/INDEXER_ADDRESS_PLACEHOLDER/$RECEIVER_ADDRESS/g" /opt/config.toml
 sed -i "s/INDEXER_MNEMONIC_PLACEHOLDER/$INDEXER_MNEMONIC/g" /opt/config.toml

crates/config/maximal-config-example.toml

@@ -67,8 +67,8 @@ recently_closed_allocation_buffer_secs = 3600
 
 [subgraphs.escrow]
 # NOTE: It is heavily recomended to use both `query_url` and `deployment_id`,
-# Query URL for the Escrow subgraph.
-query_url = "http://example.com/network-subgraph"
+# Query URL for the Escrow subgraph (v1).
+query_url = "http://example.com/escrow-subgraph"
 # Optional, Auth token will used a "bearer auth"
 # query_auth_token = "super-secret"
 
@@ -78,6 +78,14 @@ deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 # Refreshing interval for the Escrow contracts information from the Escrow subgraph.
 syncing_interval_secs = 60
 
+[subgraphs.escrow_v2]
+# Query URL for the Escrow v2 subgraph (Horizon).
+query_url = "http://example.com/escrow-v2-subgraph"
+# Optional, Auth token will used a "bearer auth"
+# query_auth_token = "super-secret"
+# Refreshing interval for the Escrow v2 contracts information.
+syncing_interval_secs = 30
+
 [blockchain]
 # The chain ID of the network that the graph network is running on
 chain_id = 1337
@@ -170,4 +178,4 @@ hardhat = "100"
 "eip155:1337" = "hardhat"
 
 [horizon]
-enabled = false
+mode = "transition"

crates/config/minimal-config-example.toml

@@ -42,13 +42,18 @@ query_url = "http://example.com/network-subgraph"
 deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 
 [subgraphs.escrow]
-# Query URL for the Escrow subgraph.
-query_url = "http://example.com/network-subgraph"
+# Query URL for the Escrow subgraph (v1).
+query_url = "http://example.com/escrow-subgraph"
 # Optional, deployment to look for in the local `graph-node`, if locally indexed.
 # Locally indexing the subgraph is recommended.
 # NOTE: Use `query_url` or `deployment_id` only
 deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
 
+[subgraphs.escrow_v2]
+# Query URL for the Escrow v2 subgraph (Horizon).
+query_url = "http://example.com/escrow-v2-subgraph"
+syncing_interval_secs = 30
+
 [blockchain]
 # The chain ID of the network that the graph network is running on
 chain_id = 1337
@@ -63,3 +68,6 @@ receipts_verifier_address = "0x2222222222222222222222222222222222222222"
 # Key-Value of all senders and their aggregator endpoints
 0xDDE4cfFd3D9052A9cb618fC05a1Cd02be1f2F467 = "https://tap-aggregator.network.thegraph.com"
 0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
+
+[horizon]
+mode = "transition"

crates/config/src/config.rs

@@ -303,6 +303,7 @@ impl MetricsConfig {
 pub struct SubgraphsConfig {
     pub network: NetworkSubgraphConfig,
     pub escrow: EscrowSubgraphConfig,
+    pub escrow_v2: Option<EscrowSubgraphConfig>,
 }
 
 #[serde_as]
@@ -446,13 +447,26 @@ pub struct RavRequestConfig {
     pub max_receipts_per_request: u64,
 }
 
+/// Horizon upgrade mode configuration
+#[derive(Debug, Clone, Deserialize, PartialEq, Default)]
+#[serde(rename_all = "lowercase")]
+pub enum HorizonMode {
+    /// Legacy mode: Only v1 TAP receipts supported
+    #[default]
+    Legacy,
+    /// Transition mode: Both v1 and v2 TAP receipts supported (for migration)
+    Transition,
+    /// Full mode: Only v2 TAP receipts supported (post-migration)
+    Full,
+}
+
 /// Configuration for the horizon
 /// standard
 #[derive(Debug, Default, Deserialize)]
 #[cfg_attr(test, derive(PartialEq))]
 pub struct HorizonConfig {
-    /// Whether the horizon is enabled or not
-    pub enabled: bool,
+    /// Horizon upgrade mode
+    pub mode: HorizonMode,
 }
 
 #[cfg(test)]