forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 22:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(rollup-verifier): make withdraw root check optional (#1182)

Browse source
This commit is contained in:
Péter Garamvölgyi 2025-05-09 17:32:01 +02:00 committed by GitHub
parent 0d72990d8e
commit 3edb331d88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
params/version.go
View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 8 // Minor version component of the current release VersionMinor = 8 // Minor version component of the current release
VersionPatch = 43 // Patch version component of the current release VersionPatch = 44 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )

22
rollup/rollup_sync_service/rollup_sync_service.go
View file

@ -394,16 +394,20 @@ func (s *RollupSyncService) getLocalChunksForBatch(chunkBlockRanges []*rawdb.Chu
return nil, fmt.Errorf("failed to get block by number: %v", i) return nil, fmt.Errorf("failed to get block by number: %v", i)
} }
txData := encoding.TxsToTxsData(block.Transactions()) txData := encoding.TxsToTxsData(block.Transactions())
state, err := s.bc.StateAt(block.Root())
if err != nil {
return nil, fmt.Errorf("failed to get block state, block: %v, err: %w", block.Hash().Hex(), err)
}
withdrawRoot := withdrawtrie.ReadWTRSlot(rcfg.L2MessageQueueAddress, state)
chunks[i].Blocks[j-cr.StartBlockNumber] = &encoding.Block{ chunks[i].Blocks[j-cr.StartBlockNumber] = &encoding.Block{
Header: block.Header(), Header: block.Header(),
Transactions: txData, Transactions: txData,
WithdrawRoot: withdrawRoot,
} }
// read withdraw root, if available
// note: historical state is not available on full nodes
state, err := s.bc.StateAt(block.Root())
if err != nil {
log.Trace("State is not available, skipping withdraw trie validation", "blockNumber", block.NumberU64(), "blockHash", block.Hash().Hex(), "err", err)
continue
}
withdrawRoot := withdrawtrie.ReadWTRSlot(rcfg.L2MessageQueueAddress, state)
chunks[i].Blocks[j-cr.StartBlockNumber].WithdrawRoot = withdrawRoot
} }
} }
@ -574,7 +578,9 @@ func validateBatch(batchIndex uint64, event *l1.FinalizeBatchEvent, parentFinali
os.Exit(1) os.Exit(1)
} }
if localWithdrawRoot != event.WithdrawRoot() { // note: this check is optional,
// withdraw root correctness is already implied by state root correctness.
if localWithdrawRoot != (common.Hash{}) && localWithdrawRoot != event.WithdrawRoot() {
log.Error("Withdraw root mismatch", "batch index", event.BatchIndex().Uint64(), "start block", startBlock.Header.Number.Uint64(), "end block", endBlock.Header.Number.Uint64(), "parent batch hash", parentFinalizedBatchMeta.BatchHash.Hex(), "l1 finalized withdraw root", event.WithdrawRoot().Hex(), "l2 withdraw root", localWithdrawRoot.Hex()) log.Error("Withdraw root mismatch", "batch index", event.BatchIndex().Uint64(), "start block", startBlock.Header.Number.Uint64(), "end block", endBlock.Header.Number.Uint64(), "parent batch hash", parentFinalizedBatchMeta.BatchHash.Hex(), "l1 finalized withdraw root", event.WithdrawRoot().Hex(), "l2 withdraw root", localWithdrawRoot.Hex())
stack.Close() stack.Close()
os.Exit(1) os.Exit(1)
@ -603,7 +609,7 @@ func validateBatch(batchIndex uint64, event *l1.FinalizeBatchEvent, parentFinali
BatchHash: localBatchHash, BatchHash: localBatchHash,
TotalL1MessagePopped: totalL1MessagePopped, TotalL1MessagePopped: totalL1MessagePopped,
StateRoot: localStateRoot, StateRoot: localStateRoot,
WithdrawRoot: localWithdrawRoot, WithdrawRoot: event.WithdrawRoot(),
} }
return endBlock.Header.Number.Uint64(), finalizedBatchMeta, nil return endBlock.Header.Number.Uint64(), finalizedBatchMeta, nil
} }