Skip to content

Commit da4a2e1

Browse files
committed
feat(config): add receipts_verifier_address_v2 configuration field
- Add optional receipts_verifier_address_v2 to BlockchainConfig - Update configuration examples with V2 verifier documentation - Prepare infrastructure for dual domain separator support
1 parent a337bab commit da4a2e1

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

contrib/indexer-service/start.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ stdbuf -oL echo "🔍 DEBUG: Extracting GraphTallyCollector address from horizon
1313
GRAPH_TALLY_VERIFIER=$(jq -r '."1337".GraphTallyCollector.address' /opt/horizon.json)
1414
stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
1515

16+
TAP_VERIFIER=$(jq -r '."1337".TAPVerifier' /opt/contracts.json)
17+
stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $TAP_VERIFIER"
18+
1619
# Override with test values taken from test-assets/src/lib.rs
1720
ALLOCATION_ID="0xfa44c72b753a66591f241c7dc04e8178c30e13af" # ALLOCATION_ID_0
1821

@@ -65,7 +68,8 @@ syncing_interval_secs = 30
6568
6669
[blockchain]
6770
chain_id = 1337
68-
receipts_verifier_address = "${GRAPH_TALLY_VERIFIER}"
71+
receipts_verifier_address = "${TAP_VERIFIER}"
72+
receipts_verifier_address_v2 ="${GRAPH_TALLY_VERIFIER}"
6973
7074
[service]
7175
free_query_auth_token = "freestuff"

contrib/tap-agent/start.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@ cat /opt/.env
1111

1212
# Extract GraphTallyCollector address from horizon.json
1313
stdbuf -oL echo "🔍 DEBUG: Extracting GraphTallyCollector address from horizon.json..."
14+
1415
GRAPH_TALLY_VERIFIER=$(jq -r '."1337".GraphTallyCollector.address' /opt/horizon.json)
1516
stdbuf -oL echo "🔍 DEBUG: GraphTallyCollector address: $GRAPH_TALLY_VERIFIER"
1617

18+
stdbuf -oL echo "🔍 DEBUG: Extracting TAP address from contracts.json..."
19+
TAP_VERIFIER=$(jq -r '."1337".TAPVerifier' /opt/contracts.json)
20+
stdbuf -oL echo "🔍 DEBUG: TAPVerifier address: $TAP_VERIFIER"
21+
1722
# Override with test values taken from test-assets/src/lib.rs
1823
ALLOCATION_ID="0xfa44c72b753a66591f241c7dc04e8178c30e13af" # ALLOCATION_ID_0
1924

@@ -120,7 +125,8 @@ syncing_interval_secs = 30
120125
121126
[blockchain]
122127
chain_id = 1337
123-
receipts_verifier_address = "${GRAPH_TALLY_VERIFIER}"
128+
receipts_verifier_address = "${TAP_VERIFIER}"
129+
receipts_verifier_address_v2 = "${GRAPH_TALLY_VERIFIER}"
124130
125131
[service]
126132
host_and_port = "0.0.0.0:${INDEXER_SERVICE}"

crates/config/maximal-config-example.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ syncing_interval_secs = 60
8686
chain_id = 1337
8787
# Contract address of TAP's receipt aggregate voucher (RAV) verifier.
8888
receipts_verifier_address = "0x2222222222222222222222222222222222222222"
89+
# Optional: Contract address of TAP V2 (Horizon) receipt verifier. If not specified, uses receipts_verifier_address for both V1 and V2.
90+
# receipts_verifier_address_v2 = "0x3333333333333333333333333333333333333333"
8991

9092
##############################################
9193
# Specific configurations to indexer-service #

crates/config/minimal-config-example.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
5454
chain_id = 1337
5555
# Contract address of TAP's receipt aggregate voucher (RAV) verifier.
5656
receipts_verifier_address = "0x2222222222222222222222222222222222222222"
57+
# Optional: Contract address of TAP V2 (Horizon) receipt verifier. If not specified, uses receipts_verifier_address for both V1 and V2.
58+
# receipts_verifier_address_v2 = "0x3333333333333333333333333333333333333333"
5759

5860
########################################
5961
# Specific configurations to tap-agent #

crates/config/src/config.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,10 @@ pub enum TheGraphChainId {
353353
pub struct BlockchainConfig {
354354
pub chain_id: TheGraphChainId,
355355
pub receipts_verifier_address: Address,
356+
/// Verifier address for V2 receipts(Horizon)
357+
/// after transition period this will be the only address used
358+
/// to verify receipts
359+
pub receipts_verifier_address_v2: Option<Address>,
356360
}
357361

358362
#[derive(Debug, Deserialize)]

0 commit comments

Comments
 (0)