From db063c21ac17a9ebf557592bee869f6023123a34 Mon Sep 17 00:00:00 2001 From: alvarof2 <35505302+alvarof2@users.noreply.github.com> Date: Tue, 12 Nov 2024 14:43:19 +0000 Subject: [PATCH 1/2] [Automatic] - Update op-geth dependencies Update the go package dependency and the devnet docker container reference of the \`l2\` service to the latest commit ('') in the '' ref." --- go.mod | 2 +- go.sum | 4 ++-- ops-bedrock/l2-op-geth.Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 30567fb101faa..3266bcd77b1d1 100644 --- a/go.mod +++ b/go.mod @@ -257,7 +257,7 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/ethereum/go-ethereum => github.com/celo-org/op-geth v1.101408.1-0.20241011074051-d8e6791dbc37 +replace github.com/ethereum/go-ethereum => github.com/celo-org/op-geth v1.101408.1-0.20241106161643-3072aa7694dd // replace github.com/ethereum/go-ethereum => ../op-geth diff --git a/go.sum b/go.sum index 7b1264f5fe26c..a3fa6e5e48331 100644 --- a/go.sum +++ b/go.sum @@ -81,8 +81,8 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/celo-org/op-geth v1.101408.1-0.20241011074051-d8e6791dbc37 h1:vOpdVeAT5E+6jfvsTlyFfUwUW7r0gM/EJLi/YzfLPXQ= -github.com/celo-org/op-geth v1.101408.1-0.20241011074051-d8e6791dbc37/go.mod h1:Mk8AhvlqFbjI9oW2ymThSSoqc6kiEH0/tCmHGMEu6ac= +github.com/celo-org/op-geth v1.101408.1-0.20241106161643-3072aa7694dd h1:Kp3wYwLXjV4MGwOgXx4N2VcBjcTv+LSP+GPaG0BRTcQ= +github.com/celo-org/op-geth v1.101408.1-0.20241106161643-3072aa7694dd/go.mod h1:Mk8AhvlqFbjI9oW2ymThSSoqc6kiEH0/tCmHGMEu6ac= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= diff --git a/ops-bedrock/l2-op-geth.Dockerfile b/ops-bedrock/l2-op-geth.Dockerfile index e3138abb9be1a..909405e8dade1 100644 --- a/ops-bedrock/l2-op-geth.Dockerfile +++ b/ops-bedrock/l2-op-geth.Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 us-west1-docker.pkg.dev/blockchaintestsglobaltestnet/dev-images/op-geth@sha256:fab76a990c21271419a40dfe5d28e30905869183b18ee9e6f711fe562365bc8e +FROM --platform=linux/amd64 us-west1-docker.pkg.dev/blockchaintestsglobaltestnet/dev-images/op-geth@sha256:93694cd5e2e94ac6c1b60539e185eeb6584c3400e43c239c47bd26be06dd656a RUN apk add --no-cache jq From aa832123f08f5e5804e56f95b3532fa48289f8af Mon Sep 17 00:00:00 2001 From: Maximilian Langenfeld <15726643+ezdac@users.noreply.github.com> Date: Tue, 12 Nov 2024 17:52:55 -0500 Subject: [PATCH 2/2] fix(op-program): add missing arg to block-context initializer --- op-program/client/l2/engineapi/block_processor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/op-program/client/l2/engineapi/block_processor.go b/op-program/client/l2/engineapi/block_processor.go index 2e6cc5beade49..42252cca55284 100644 --- a/op-program/client/l2/engineapi/block_processor.go +++ b/op-program/client/l2/engineapi/block_processor.go @@ -83,7 +83,7 @@ func NewBlockProcessorFromHeader(provider BlockDataProvider, h *types.Header) (* if h.ParentBeaconRoot != nil { // Unfortunately this is not part of any Geth environment setup, // we just have to apply it, like how the Geth block-builder worker does. - context := core.NewEVMBlockContext(header, provider, nil, provider.Config(), statedb) + context := core.NewEVMBlockContext(header, provider, nil, provider.Config(), statedb, nil) // NOTE: Unlikely to be needed for the beacon block root, but we setup any precompile overrides anyways for forwards-compatibility var precompileOverrides vm.PrecompileOverrides if vmConfig := provider.GetVMConfig(); vmConfig != nil && vmConfig.PrecompileOverrides != nil {