Update release branch

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.20241211135814-0162ce9d0298
+replace github.com/ethereum/go-ethereum => github.com/celo-org/op-geth v1.101408.1-0.20250130152436-0155629409ed
 
 // replace github.com/ethereum/go-ethereum => ../op-geth
 

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.20241211135814-0162ce9d0298 h1:tv3rg2aT8xQJoL0e2hMyLG+s/a+y4GucB0Ir/TitqaQ=
-github.com/celo-org/op-geth v1.101408.1-0.20241211135814-0162ce9d0298/go.mod h1:Mk8AhvlqFbjI9oW2ymThSSoqc6kiEH0/tCmHGMEu6ac=
+github.com/celo-org/op-geth v1.101408.1-0.20250130152436-0155629409ed h1:+zoFQxAzJExryJlUznqzmEW8pab2keoF+0+CTHvKguE=
+github.com/celo-org/op-geth v1.101408.1-0.20250130152436-0155629409ed/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=

op-chain-ops/cmd/celo-migrate/main.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"runtime/debug"
 	"sync"
 	"time"

op-chain-ops/cmd/celo-migrate/state.go

@@ -90,9 +90,9 @@ var (
 		BaklavaNetworkID:   common.HexToAddress("0x022c5d5837E177B6d145761feb4C5574e5b48F5e"),
 	}
 	celoTokenAddressMap = map[uint64]common.Address{
-		AlfajoresNetworkID: addresses.AlfajoresAddresses.CeloToken,
-		BaklavaNetworkID:   addresses.BaklavaAddresses.CeloToken,
-		MainnetNetworkID:   addresses.MainnetAddresses.CeloToken,
+		AlfajoresNetworkID: addresses.CeloTokenAlfajoresAddress,
+		BaklavaNetworkID:   addresses.CeloTokenBaklavaAddress,
+		MainnetNetworkID:   addresses.CeloTokenAddress,
 	}
 )
 

op-e2e/system/fees/fees_test.go

@@ -138,7 +138,7 @@ func testFees(t *testing.T, cfg e2esys.SystemConfig) {
 
 	baseFeeRecipient := predeploys.BaseFeeVaultAddr
 	if sys.RollupConfig.IsCel2(sys.L2GenesisCfg.Timestamp) {
-		baseFeeRecipient = addresses.GetAddresses(cfg.L2ChainIDBig()).FeeHandler
+		baseFeeRecipient = addresses.FeeHandlerAddress
 	}
 	// BaseFee Recipient
 	baseFeeRecipientStartBalance, err := l2Seq.BalanceAt(context.Background(), baseFeeRecipient, big.NewInt(rpc.EarliestBlockNumber.Int64()))

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:2cbe7293f435d37312290c52784c3215559a4889dab686c25da677d088676fd3
+FROM --platform=linux/amd64 us-west1-docker.pkg.dev/blockchaintestsglobaltestnet/dev-images/op-geth@sha256:5017dcfaf0390f9f4b114aef55d6c417f89b83015b72535ab4473e700f53415e
 
 RUN apk add --no-cache jq
 

ops/celo/update-geth.sh

@@ -3,15 +3,21 @@ set -eo pipefail
 
 branch="$1"
 if [ -z "$branch" ]; then
-  echo "No argument given. Please supply the ref in 'celo-org/op-geth' to be used "
+  echo "No argument given. Please supply the ref in 'celo-org/op-geth' to be used " >&2
   exit 1
 fi
 
 commit=$(git ls-remote https://github.com/celo-org/op-geth/ "$branch" | awk '{print $1}')
-if [ -z "$commit" ]; then exit 1; fi
+if [ -z "$commit" ]; then
+  echo "Could not find branch '$branch' in 'celo-org/op-geth'" >&2
+  exit 1
+fi
 
 go_version=$(go list -m "github.com/celo-org/op-geth@$commit")
-if [ -z "$go_version" ]; then exit 1; fi
+if [ -z "$go_version" ]; then
+  echo "Failed to generate go version string fork '$commit' in 'celo-org/op-geth'" >&2
+  exit 1
+fi
 
 sha256digest=$(gcloud --format=json artifacts files list \
   --project=blockchaintestsglobaltestnet \
@@ -20,10 +26,31 @@ sha256digest=$(gcloud --format=json artifacts files list \
   --package=op-geth \
   --limit=1 \
   --tag="$commit" | jq ".[0].name" | grep -oE 'sha256:([0-9a-f]{64})' | sed 's/^sha256://')
-if [ -z "$sha256digest" ]; then exit 1; fi
+if [ -z "$sha256digest" ]; then
+  echo "Failed to find sha256digest for op-geth docker image 'celo-org/op-geth'" >&2
+  exit 1
+fi
+
+# We need to escape the '@' otherwise '@sha256' is interpreted as a global
+# Symbol by perl.
+docker_search_string="(.*op-geth\@sha256:)(.*)"
+gomod_search_string="^(replace github.com/ethereum/go-ethereum .*=> )github.com/.*/op-geth v.*"
+
+# Check that the searches are each matching a single line
+if [ "$(perl -ne "m|${docker_search_string}| && print" ops-bedrock/l2-op-geth.Dockerfile | wc -l)" != "1" ]; then
+  echo "Failed to find exactly one match for docker search string in ops-bedrock/l2-op-geth.Dockerfile" >&2
+  exit 1
+fi
+
+if [ "$(perl -ne "m|${gomod_search_string}| && print" go.mod | wc -l)" != "1" ]; then
+  echo "Failed to find exactly one match for go mod search string in go.mod" >&2
+  exit 1
+fi
 
-perl -pi -e "s|(.*op-geth@sha256:)(.*)|\1$sha256digest|" ./ops-bedrock/l2-op-geth.Dockerfile
-perl -pi -e "s|^(replace github.com/ethereum/go-ethereum .* => )github.com/.*/op-geth v.*|\1$go_version|" go.mod
+set -x
+perl -pi -e "s|${docker_search_string}|\${1}${sha256digest}|" ops-bedrock/l2-op-geth.Dockerfile
+set +x
+perl -pi -e "s|${gomod_search_string}|\${1}${go_version}|" go.mod
 
 go_mod_error=$(go mod tidy >/dev/null)
 if [ -n "$go_mod_error" ]; then

ops/check-changed/requirements.txt

@@ -1,5 +1,5 @@
 certifi==2024.7.4
-cffi==1.17.1
+cffi==1.15.1
 charset-normalizer==2.1.1
 Deprecated==1.2.13
 idna==3.7