test: add new setting to services configuration

Author: neithanmo

contrib/indexer-service/start.sh

@@ -10,35 +10,43 @@ cat /opt/.env
 
 # Extract GraphTallyCollector address from horizon.json
 stdbuf -oL echo "🔍 DEBUG: Extracting GraphTallyCollector address from horizon.json..."
-GRAPH_TALLY_VERIFIER=$(jq -r '."1337".GraphTallyCollector.address' /opt/horizon.json)
-stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
 
-TAP_VERIFIER=$(jq -r '."1337".TAPVerifier.address' /opt/contracts.json)
-stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $TAP_VERIFIER"
+subgraph_service=$(jq -r '."1337".SubgraphService.address' /opt/subgraph-service.json)
+
+# Handle mixed format - try with .address first, fallback to direct value
+graph_tally_verifier=$(jq -r '."1337".GraphTallyCollector.address // ."1337".GraphTallyCollector' /opt/horizon.json)
+stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $graph_tally_verifier"
+
+# For your indexer-agent script, update the extraction:
+tap_verifier=$(jq -r '."1337".TAPVerifier' /opt/contracts.json)
+stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $tap_verifier"
+
+allocation_id_tracker=$(jq -c '."1337".AllocationIDTracker' /opt/contracts.json)
+escrow=$(jq -c '."1337".Escrow' /opt/contracts.json)
 
 # Override with test values taken from test-assets/src/lib.rs
 ALLOCATION_ID="0xfa44c72b753a66591f241c7dc04e8178c30e13af" # ALLOCATION_ID_0
 
 # Get network subgraph deployment ID
 stdbuf -oL echo "🔍 DEBUG: Fetching network subgraph deployment ID..."
-NETWORK_DEPLOYMENT=$(curl -s --max-time 10 "http://graph-node:8000/subgraphs/name/graph-network" \
+network_deployment=$(curl -s --max-time 10 "http://graph-node:8000/subgraphs/name/graph-network" \
     -H 'content-type: application/json' \
     -d '{"query": "{ _meta { deployment } }"}' | jq -r '.data._meta.deployment' 2>/dev/null)
-stdbuf -oL echo "🔍 DEBUG: Network deployment result: $NETWORK_DEPLOYMENT"
+stdbuf -oL echo "🔍 DEBUG: Network deployment result: $network_deployment"
 
 # Get escrow subgraph deployment ID
 stdbuf -oL echo "🔍 DEBUG: Fetching escrow subgraph deployment ID..."
-ESCROW_DEPLOYMENT=$(curl -s --max-time 10 "http://graph-node:8000/subgraphs/name/semiotic/tap" \
+escrow_deployment=$(curl -s --max-time 10 "http://graph-node:8000/subgraphs/name/semiotic/tap" \
     -H 'content-type: application/json' \
     -d '{"query": "{ _meta { deployment } }"}' | jq -r '.data._meta.deployment' 2>/dev/null)
-stdbuf -oL echo "🔍 DEBUG: Escrow deployment result: $ESCROW_DEPLOYMENT"
+stdbuf -oL echo "🔍 DEBUG: Escrow deployment result: $escrow_deployment"
 
 # Run basic connectivity tests
 stdbuf -oL echo "Testing graph-node endpoints..."
 curl -s "http://graph-node:8000" >/dev/null && stdbuf -oL echo "Query endpoint OK" || stdbuf -oL echo "Query endpoint FAILED"
 curl -s "http://graph-node:8030/graphql" >/dev/null && stdbuf -oL echo "Status endpoint OK" || stdbuf -oL echo "Status endpoint FAILED"
 
-stdbuf -oL echo "Using GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
+stdbuf -oL echo "Using GraphTallyCollector address: $graph_tally_verifier"
 stdbuf -oL echo "Using test Indexer address: $RECEIVER_ADDRESS"
 stdbuf -oL echo "Using test Account0 address: $ACCOUNT0_ADDRESS"
 
@@ -56,20 +64,20 @@ query_url = "http://graph-node:8000"
 status_url = "http://graph-node:8030/graphql"
 
 [subgraphs.network]
-query_url = "http://graph-node:8000/subgraphs/name/graph-network"$(if [ -n "$NETWORK_DEPLOYMENT" ] && [ "$NETWORK_DEPLOYMENT" != "null" ]; then echo "
-deployment_id = \"$NETWORK_DEPLOYMENT\""; fi)
+query_url = "http://graph-node:8000/subgraphs/name/graph-network"$(if [ -n "$network_deployment" ] && [ "$network_deployment" != "null" ]; then echo "
+deployment_id = \"$network_deployment\""; fi)
 recently_closed_allocation_buffer_secs = 60
 syncing_interval_secs = 30
 
 [subgraphs.escrow]
-query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"$(if [ -n "$ESCROW_DEPLOYMENT" ] && [ "$ESCROW_DEPLOYMENT" != "null" ]; then echo "
-deployment_id = \"$ESCROW_DEPLOYMENT\""; fi)
+query_url = "http://graph-node:8000/subgraphs/name/semiotic/tap"$(if [ -n "$escrow_deployment" ] && [ "$escrow_deployment" != "null" ]; then echo "
+deployment_id = \"$escrow_deployment\""; fi)
 syncing_interval_secs = 30
 
 [blockchain]
 chain_id = 1337
-receipts_verifier_address = "${TAP_VERIFIER}"
-receipts_verifier_address_v2 ="${GRAPH_TALLY_VERIFIER}" 
+receipts_verifier_address = "${tap_verifier}"
+receipts_verifier_address_v2 ="${graph_tally_verifier}" 
 
 [service]
 free_query_auth_token = "freestuff"
@@ -108,6 +116,7 @@ ${ACCOUNT0_ADDRESS} = "http://tap-aggregator:${TAP_AGGREGATOR}"
 #   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
 # When disabled: Pure legacy mode, no Horizon detection performed
 enabled = true
+subgraph_service_address = "${subgraph_service}"
 EOF
 
 stdbuf -oL echo "Starting indexer-service with config:"

contrib/tap-agent/start.sh

@@ -12,12 +12,14 @@ cat /opt/.env
 # Extract GraphTallyCollector address from horizon.json
 stdbuf -oL echo "🔍 DEBUG: Extracting GraphTallyCollector address from horizon.json..."
 
-GRAPH_TALLY_VERIFIER=$(jq -r '."1337".GraphTallyCollector.address' /opt/horizon.json)
-stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
+subgraph_service=$(jq -r '."1337".SubgraphService.address' /opt/subgraph-service.json)
+graph_tally_verifier=$(jq -r '."1337".GraphTallyCollector.address // ."1337".GraphTallyCollector' /opt/horizon.json)
+stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $graph_tally_verifier"
 
+# For your indexer-agent script, update the extraction:
 stdbuf -oL echo "🔍 DEBUG: Extracting TAP address from contracts.json..."
-TAP_VERIFIER=$(jq -r '."1337".TAPVerifier.address' /opt/contracts.json)
-stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $TAP_VERIFIER"
+tap_verifier=$(jq -r '."1337".TAPVerifier' /opt/contracts.json)
+stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $tap_verifier"
 
 # Override with test values taken from test-assets/src/lib.rs
 ALLOCATION_ID="0xfa44c72b753a66591f241c7dc04e8178c30e13af" # ALLOCATION_ID_0
@@ -89,7 +91,7 @@ fi
 
 stdbuf -oL echo "🔍 DEBUG: Escrow subgraph deployment ID: $ESCROW_DEPLOYMENT"
 
-stdbuf -oL echo "🔍 DEBUG: Using GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
+stdbuf -oL echo "🔍 DEBUG: Using GraphTallyCollector address: $graph_tally_verifier"
 stdbuf -oL echo "🔍 DEBUG: Using Indexer address: $RECEIVER_ADDRESS"
 stdbuf -oL echo "🔍 DEBUG: Using Account0 address: $ACCOUNT0_ADDRESS"
 
@@ -125,8 +127,8 @@ syncing_interval_secs = 30
 
 [blockchain]
 chain_id = 1337
-receipts_verifier_address = "${TAP_VERIFIER}"
-receipts_verifier_address_v2 = "${GRAPH_TALLY_VERIFIER}"
+receipts_verifier_address = "${tap_verifier}"
+receipts_verifier_address_v2 = "${graph_tally_verifier}"
 
 [service]
 host_and_port = "0.0.0.0:${INDEXER_SERVICE}"
@@ -164,6 +166,7 @@ ${ACCOUNT0_ADDRESS} = "http://tap-aggregator:${TAP_AGGREGATOR}"
 #   - If Horizon contracts not detected: Remain in legacy mode (V1 receipts only)
 # When disabled: Pure legacy mode, no Horizon detection performed
 enabled = true
+subgraph_service_address = "${subgraph_service}"
 EOF
 
 stdbuf -oL echo "Starting tap-agent with config:"