Skip to content

chore: clean up pre horizon code #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tmigone merged 8 commits into from
Apr 20, 2026
Merged

chore: clean up pre horizon code #1016

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d06030c
fix: remove duplicated config item
tmigone Apr 17, 2026
8b21ab6
fix: remove horizon enabled config entry, assume horizon always
tmigone Apr 17, 2026
0c8f6d9
chore: simplify subgraph service config and access
tmigone Apr 17, 2026
4e68e13
feat: remove v1 escrow
tmigone Apr 17, 2026
9f27d14
fix: couple fixes
tmigone Apr 17, 2026
df5d962
chore: clean up pre horizon code
tmigone Apr 17, 2026
3eb5057
Merge branch 'main' into tmigone/more-horizon-cleanup
tmigone Apr 20, 2026
bde084e
Merge branch 'main' into tmigone/more-horizon-cleanup
MoonBoi9001 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions contrib/indexer-service/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ 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)
syncing_interval_secs = 30

[blockchain]
chain_id = 1337
receipts_verifier_address = "${tap_verifier}"
Expand All @@ -85,7 +80,6 @@ free_query_auth_token = "freestuff"
host_and_port = "0.0.0.0:7601"
url_prefix = "/"
serve_network_subgraph = false
serve_escrow_subgraph = false


[service.tap]
Expand Down
6 changes: 0 additions & 6 deletions contrib/tap-agent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,6 @@ deployment_id = \"$NETWORK_DEPLOYMENT\""; fi)
recently_closed_allocation_buffer_secs = 60
syncing_interval_secs = 30

[subgraphs.escrow]
query_url = "http://graph-node:${GRAPH_NODE_GRAPHQL}/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}"
Expand All @@ -135,7 +130,6 @@ subgraph_service_address = "${subgraph_service}"
host_and_port = "0.0.0.0:${INDEXER_SERVICE}"
url_prefix = "/"
serve_network_subgraph = false
serve_escrow_subgraph = false


[service.tap]
Expand Down
17 changes: 1 addition & 16 deletions crates/config/default_values.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,9 @@ max_data_staleness_mins = 30
escrow_min_balance_grt_wei = "100000000000000000"
max_signers_per_payer = 0

[subgraphs.escrow]
syncing_interval_secs = 60

[service]
ipfs_url = "https://api.thegraph.com/ipfs/"
serve_network_subgraph = false
serve_escrow_subgraph = false
host_and_port = "0.0.0.0:7600"
url_prefix = "/"
max_cost_model_batch_size = 200
Expand Down Expand Up @@ -47,15 +43,4 @@ chain_id = 1337
# Horizon verifier (required).
receipts_verifier_address_v2 = "0x3333333333333333333333333333333333333333"
# SubgraphService contract (required).
subgraph_service_address = "0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9"
# GraphTallyCollector contract (required for V2 escrow filtering).
graph_tally_collector_address = "0x4444444444444444444444444444444444444444"

[horizon]
# Enable Horizon support and detection
# When enabled: checks that Horizon contracts are active via the network subgraph
# When enabled, set `blockchain.subgraph_service_address` and
# `blockchain.receipts_verifier_address_v2`
#
# Horizon is required in production.
enabled = true
subgraph_service_address = "0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9"
30 changes: 1 addition & 29 deletions crates/config/maximal-config-example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,12 @@ escrow_min_balance_grt_wei = "100000000000000000"
# signers, orphaning receipts and enabling free queries.
max_signers_per_payer = 0

[subgraphs.escrow]
# NOTE: It is heavily recomended to use both `query_url` and `deployment_id`,
# Query URL for the Escrow subgraph (v1). This is the old escrow subgraph.
# NOTE: This is not used in v2, as the escrow subgraph is now in the network subgraph.
query_url = "http://example.com/escrow-subgraph"
# Optional, Auth token will used a "bearer auth"
# query_auth_token = "super-secret"

# Optional, deployment to look for in the local `graph-node`, if locally indexed.
# Locally indexing the subgraph is recommended.
deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
# Refreshing interval for the Escrow contracts information from the Escrow subgraph.
syncing_interval_secs = 60

# NOTE: V2 escrow accounts are now in the network subgraph, not a separate escrow_v2 subgraph

[blockchain]
# The chain ID of the network that the graph network is running on
chain_id = 1337
# Horizon addresses; required when [horizon].enabled = true
# Horizon addresses (required)
receipts_verifier_address_v2 = "0x3333333333333333333333333333333333333333"
subgraph_service_address = "0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9"
graph_tally_collector_address = "0x4444444444444444444444444444444444444444"

##############################################
# Specific configurations to indexer-service #
Expand All @@ -126,8 +109,6 @@ host_and_port = "0.0.0.0:7600"
url_prefix = "/"
# Serve the network subgraph on `common.server.host_and_port`/network
serve_network_subgraph = false
# Serve the escrow subgraph on `common.server.host_and_port`/escrow
serve_escrow_subgraph = false
#### OPTIONAL VALUES ####
## use this to add a layer while serving network/escrow subgraph
# serve_auth_token = "token"
Expand Down Expand Up @@ -208,12 +189,3 @@ hardhat = "100"

[dips.additional_networks]
"eip155:1337" = "hardhat"

[horizon]
# Enable Horizon support and detection
# When enabled: checks that Horizon contracts are active via the network subgraph
# When enabled, set `blockchain.subgraph_service_address` and
# `blockchain.receipts_verifier_address_v2`
#
# Horizon is required in production.
enabled = true
22 changes: 2 additions & 20 deletions crates/config/minimal-config-example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,12 @@ query_url = "http://example.com/network-subgraph"
# NOTE: Use `query_url` or `deployment_id` only
deployment_id = "Qmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"

[subgraphs.escrow]
# 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"

[blockchain]
# The chain ID of the network that the graph network is running on
chain_id = 1337
# Horizon addresses; required when [horizon].enabled = true
# Horizon addresses (required)
receipts_verifier_address_v2 = "0x3333333333333333333333333333333333333333"
subgraph_service_address = "0xcf7ed3acca5a467e9e704c703e8d87f634fb0fc9"
graph_tally_collector_address = "0x4444444444444444444444444444444444444444"

########################################
# Specific configurations to tap-agent #
Expand All @@ -70,13 +61,4 @@ graph_tally_collector_address = "0x4444444444444444444444444444444444444444"
[tap.sender_aggregator_endpoints]
# 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]
# Enable Horizon support and detection
# When enabled: checks that Horizon contracts are active via the network subgraph
# When enabled, set `blockchain.subgraph_service_address` and
# `blockchain.receipts_verifier_address_v2`
#
# Horizon is required in production.
enabled = true
0xDD6a6f76eb36B873C1C184e8b9b9e762FE216490 = "https://tap-aggregator-arbitrum-one.graphops.xyz"
Loading
Loading