From a3ec1737960c34b1d181b994717970f2384b0e2e Mon Sep 17 00:00:00 2001 From: Sebastian Stammler Date: Fri, 9 May 2025 11:46:02 +0200 Subject: [PATCH] go: Update op-geth to v1.101510.0, based on geth v1.15.10 --- go.mod | 2 +- go.sum | 4 ++-- op-program/client/l2/engineapi/block_processor.go | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 8a8f1238c83..d12ca0bcc7c 100644 --- a/go.mod +++ b/go.mod @@ -293,7 +293,7 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101507.0-synctest.4 +replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101510.0-synctest.1 //replace github.com/ethereum/go-ethereum => ../op-geth diff --git a/go.sum b/go.sum index 4916fc443aa..acf18b978b3 100644 --- a/go.sum +++ b/go.sum @@ -204,8 +204,8 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc= github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs= -github.com/ethereum-optimism/op-geth v1.101507.0-synctest.4 h1:hIzKJ4Q1DLfGY5U785U431kXeCunb609cfgJOunwzyY= -github.com/ethereum-optimism/op-geth v1.101507.0-synctest.4/go.mod h1:gsNKIWhHa7Q3DlgHFNxffXxD0Prw5Y2pFJBYdZXGQzI= +github.com/ethereum-optimism/op-geth v1.101510.0-synctest.1 h1:uCgxKRBXrJK2o3S9mk3W8+A3xt1kCp9vS+egqhwtbbU= +github.com/ethereum-optimism/op-geth v1.101510.0-synctest.1/go.mod h1:gsNKIWhHa7Q3DlgHFNxffXxD0Prw5Y2pFJBYdZXGQzI= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250314162817-2c60e5723c64 h1:teDhU4h4ryaE8rSBl+vJJiwKHjxdnnHPkKZ9iNr2R8k= github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20250314162817-2c60e5723c64/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y= github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA= diff --git a/op-program/client/l2/engineapi/block_processor.go b/op-program/client/l2/engineapi/block_processor.go index 03fe63475ea..953b6d526d8 100644 --- a/op-program/client/l2/engineapi/block_processor.go +++ b/op-program/client/l2/engineapi/block_processor.go @@ -165,9 +165,13 @@ func (b *BlockProcessor) Assemble() (*types.Block, types.Receipts, error) { _requests := [][]byte{} // EIP-6110 - no-op because we just ignore all deposit requests, so no need to parse logs // EIP-7002 - core.ProcessWithdrawalQueue(&_requests, b.evm) + if err := core.ProcessWithdrawalQueue(&_requests, b.evm); err != nil { + return nil, nil, err + } // EIP-7251 - core.ProcessConsolidationQueue(&_requests, b.evm) + if err := core.ProcessConsolidationQueue(&_requests, b.evm); err != nil { + return nil, nil, err + } } block, err := b.dataProvider.Engine().FinalizeAndAssemble(b.dataProvider, b.header, b.state, &body, b.receipts)