Fix EIP-8282 builder contract resolution from eth_config#798
Merged
Conversation
qu0b
approved these changes
Jul 16, 2026
pk910
enabled auto-merge
July 16, 2026 10:33
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix EIP-8282 builder contract resolution from eth_config
Problem
Builder deposit/exit transactions were not being indexed (empty
builder_deposit_request_txs/builder_exit_request_txstables, empty tx hashes on/builders/deposits), even though the EL clients supply the correct contract addresses viaeth_config.Two issues caused this:
Wrong
systemContractslookup keys: dora looked up the builder contracts underBUILDER_DEPOSIT_REQUEST_PREDEPLOY_ADDRESS/BUILDER_EXIT_REQUEST_PREDEPLOY_ADDRESS, but EL clients report them asBUILDER_DEPOSIT_CONTRACT_ADDRESS/BUILDER_EXIT_CONTRACT_ADDRESS. The lookup never matched, so dora always fell back to the hardcoded default addresses — which were outdated EIP-8282 draft addresses. The contract indexers scanned a contract with no logs and found nothing.Contract address captured once at startup: the system contract indexers resolved the contract address a single time at construction and baked it into the indexer options. If the indexers started before any client delivered its
eth_config(a startup race), or the address changed at a fork boundary, the indexer kept scanning the stale address forever.Changes
clients/execution/rpc/ethconfig.go: rename the builder contractsystemContractskeys toBUILDER_DEPOSIT_CONTRACT_ADDRESS/BUILDER_EXIT_CONTRACT_ADDRESS, matching what EL clients report.clients/execution/chainstate.go: updateDefaultSystemContractAddressesto the current EIP-8282 addresses (0x0000bFF46984e3725691FA540a8C7589300D8282for deposits,0x000064D678505ad48F8cCb093BC65613800E8282for exits).indexer/execution/system_contracts/contract_indexer.go:contractIndexerOptions.contractAddressis now afunc() common.Addressresolver, evaluated on every log scan (finalized and recent), so late-arriving client configs and fork-boundary address changes are picked up.Deployment note
On instances that already ran with the wrong address, the contract indexer state has advanced past the affected blocks. To backfill missed builder deposits/exits, reset the
indexer.builderdepositindexer,indexer.builderdepositmatcher,indexer.builderexitindexerandindexer.builderexitmatcherrows inexplorer_stateso the indexers re-crawl from the Gloas deploy block.