Update geth

ethereum-optimism · Aug 7, 2024 · 34d6684 · 34d6684
1 parent 35b2fda
commit 34d6684
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -179,7 +179,7 @@ jobs:
       - checkout
       - run:
           name: "Check L1 geth version"
-          command: ./ops/scripts/geth-version-checker.sh || (echo "geth version is wrong, update ci-builder"; false)
+          command: ./ops/scripts/geth-version-checker.sh && (echo "Geth versions match, not installing geth..."; true) || (echo "Versions do not match, installing geth!"; go install -v github.com/ethereum/go-ethereum/cmd/geth@$(shell jq -r .geth < versions.json); echo "Installed geth!"; true)
       - run:
           name: git submodules
           command: make submodules
@@ -756,7 +756,7 @@ jobs:
       - checkout
       - run:
           name: "Check L1 geth version"
-          command: ./ops/scripts/geth-version-checker.sh || (echo "geth version is wrong, update ci-builder"; false)
+          command: ./ops/scripts/geth-version-checker.sh && (echo "Geth versions match, not installing geth..."; true) || (echo "Versions do not match, installing geth!"; go install -v github.com/ethereum/go-ethereum/cmd/geth@$(shell jq -r .geth < versions.json); echo "Installed geth!"; true)
 
   go-lint:
     docker:

diff --git a/cannon/mipsevm/tests/evm_test.go b/cannon/mipsevm/tests/evm_test.go
@@ -103,7 +103,7 @@ func TestEVM(t *testing.T) {
 
 func TestEVM_CloneFlags(t *testing.T) {
 	//contracts, addrs := testContractsSetup(t)
-	//var tracer vm.EVMLogger
+	//var tracer *tracing.Hooks
 
 	cases := []struct {
 		name  string

diff --git a/cannon/mipsevm/testutil/evm.go b/cannon/mipsevm/testutil/evm.go
@@ -6,6 +6,7 @@ import (
 	"math/big"
 	"os"
 
+	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -122,6 +123,6 @@ func (d *testChain) GetHeader(h common.Hash, n uint64) *types.Header {
 	}
 }
 
-func MarkdownTracer() vm.EVMLogger {
-	return logger.NewMarkdownLogger(&logger.Config{}, os.Stdout)
+func MarkdownTracer() *tracing.Hooks {
+	return logger.NewMarkdownLogger(&logger.Config{}, os.Stdout).Hooks()
 }
diff --git a/cannon/mipsevm/testutil/mips.go b/cannon/mipsevm/testutil/mips.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/tracing"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/stretchr/testify/require"
 
@@ -33,7 +34,7 @@ func NewMIPSEVM(artifacts *Artifacts, addrs *Addresses) *MIPSEVM {
 	return &MIPSEVM{env, evmState, addrs, nil, artifacts, math.MaxUint64, nil}
 }
 
-func (m *MIPSEVM) SetTracer(tracer vm.EVMLogger) {
+func (m *MIPSEVM) SetTracer(tracer *tracing.Hooks) {
 	m.env.Config.Tracer = tracer
 }
 

diff --git a/go.mod b/go.mod
@@ -233,7 +233,7 @@ require (
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/danyalprout/op-geth v0.0.0-20240715021404-d0b4ec1dc999
+replace github.com/ethereum/go-ethereum => github.com/danyalprout/op-geth v0.0.0-20240807015500-a6583532a8ad
 
 //replace github.com/ethereum/go-ethereum => ../op-geth
 // replace github.com/ethereum-optimism/superchain-registry/superchain => ../superchain-registry/superchain

diff --git a/go.sum b/go.sum
@@ -128,8 +128,8 @@ github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDF
 github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
-github.com/danyalprout/op-geth v0.0.0-20240715021404-d0b4ec1dc999 h1:ZWJ74OGUWuLx334L1UhBvXMuzb0buYG1faQo5eHj04I=
-github.com/danyalprout/op-geth v0.0.0-20240715021404-d0b4ec1dc999/go.mod h1:drs67u+xoQGictymV0wE5fuoacXK7gXJCLSVRGPZr5s=
+github.com/danyalprout/op-geth v0.0.0-20240807015500-a6583532a8ad h1:ZxBWbeiFAUdOm6AaVaqr448IkZFPe4GlzdA53VvOC88=
+github.com/danyalprout/op-geth v0.0.0-20240807015500-a6583532a8ad/go.mod h1:Zn0xPY3I/xX3Bm51kjXz9VSd+2ai7bEslVEAFTdVcpM=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/op-batcher/batcher/channel_config_provider_test.go b/op-batcher/batcher/channel_config_provider_test.go
@@ -3,14 +3,14 @@ package batcher
 import (
 	"context"
 	"errors"
+	"log/slog"
 	"math/big"
 	"testing"
 	"time"
 
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slog"
 )
 
 type mockGasPricer struct {

diff --git a/op-e2e/devnet/devnet_test.go b/op-e2e/devnet/devnet_test.go
@@ -2,6 +2,7 @@ package devnet
 
 import (
 	"context"
+	"log/slog"
 	"testing"
 	"time"
 
@@ -10,7 +11,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slog"
 )
 
 func TestDevnet(t *testing.T) {