Skip to content

Commit ca85dc4

Browse files
mdehoogdanyalproutprotolambdasebastianst
authored
Update to Geth 1.14.7 (ethereum-optimism#11382)
* chore: update to support geth v1.14.7 * Update geth * Fix "private key curve is not secp256k1" error * Temporarily quiet noisy logs * signature test * Add comments about S256 curve override fix * Update geth * go.mod: update to op-geth v1.101407.0-rc.1 * op-e2e: fix L1/L2 miner settings * Also update devnet L1 base image * ci: bump ci-builder in circleci --------- Co-authored-by: Danyal Prout <me@dany.al> Co-authored-by: protolambda <proto@protolambda.com> Co-authored-by: Sebastian Stammler <seb@oplabs.co>
1 parent e157ed7 commit ca85dc4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+286
-190
lines changed

‎.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
parameters:
44
ci_builder_image:
55
type: string
6-
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.50.0
6+
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.51.0
77
ci_builder_rust_image:
88
type: string
99
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest

‎cannon/cmd/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package cmd
22

33
import (
44
"io"
5+
"log/slog"
56
"os"
67

7-
"golang.org/x/exp/slog"
88
"golang.org/x/term"
99

1010
"github.com/ethereum/go-ethereum/log"

‎cannon/mipsevm/tests/evm_test.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"github.com/ethereum/go-ethereum/common"
1212
"github.com/ethereum/go-ethereum/common/hexutil"
13+
"github.com/ethereum/go-ethereum/core/tracing"
1314
"github.com/ethereum/go-ethereum/core/vm"
1415
"github.com/stretchr/testify/require"
1516

@@ -40,7 +41,7 @@ func TestEVM(t *testing.T) {
4041
require.NoError(t, err)
4142

4243
contracts, addrs := testContractsSetup(t)
43-
var tracer vm.EVMLogger // no-tracer by default, but test_util.MarkdownTracer
44+
var tracer *tracing.Hooks // no-tracer by default, but test_util.MarkdownTracer
4445

4546
for _, f := range testFiles {
4647
t.Run(f.Name(), func(t *testing.T) {
@@ -102,7 +103,7 @@ func TestEVM(t *testing.T) {
102103

103104
func TestEVM_CloneFlags(t *testing.T) {
104105
//contracts, addrs := testContractsSetup(t)
105-
//var tracer vm.EVMLogger
106+
//var tracer *tracing.Hooks
106107

107108
cases := []struct {
108109
name string
@@ -156,7 +157,7 @@ func TestEVM_CloneFlags(t *testing.T) {
156157

157158
func TestEVMSingleStep(t *testing.T) {
158159
contracts, addrs := testContractsSetup(t)
159-
var tracer vm.EVMLogger
160+
var tracer *tracing.Hooks
160161

161162
cases := []struct {
162163
name string
@@ -194,7 +195,7 @@ func TestEVMSingleStep(t *testing.T) {
194195

195196
func TestEVMSysWriteHint(t *testing.T) {
196197
contracts, addrs := testContractsSetup(t)
197-
var tracer vm.EVMLogger
198+
var tracer *tracing.Hooks
198199

199200
cases := []struct {
200201
name string
@@ -375,7 +376,7 @@ func TestEVMSysWriteHint(t *testing.T) {
375376

376377
func TestEVMFault(t *testing.T) {
377378
contracts, addrs := testContractsSetup(t)
378-
var tracer vm.EVMLogger // no-tracer by default, but see test_util.MarkdownTracer
379+
var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
379380
sender := common.Address{0x13, 0x37}
380381

381382
env, evmState := testutil.NewEVMEnv(contracts, addrs)
@@ -422,7 +423,7 @@ func TestEVMFault(t *testing.T) {
422423

423424
func TestHelloEVM(t *testing.T) {
424425
contracts, addrs := testContractsSetup(t)
425-
var tracer vm.EVMLogger // no-tracer by default, but see test_util.MarkdownTracer
426+
var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
426427
evm := testutil.NewMIPSEVM(contracts, addrs)
427428
evm.SetTracer(tracer)
428429
testutil.LogStepFailureAtCleanup(t, evm)
@@ -464,7 +465,7 @@ func TestHelloEVM(t *testing.T) {
464465

465466
func TestClaimEVM(t *testing.T) {
466467
contracts, addrs := testContractsSetup(t)
467-
var tracer vm.EVMLogger // no-tracer by default, but see test_util.MarkdownTracer
468+
var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
468469
evm := testutil.NewMIPSEVM(contracts, addrs)
469470
evm.SetTracer(tracer)
470471
testutil.LogStepFailureAtCleanup(t, evm)

‎cannon/mipsevm/testutil/evm.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"math/big"
77
"os"
88

9+
"github.com/ethereum/go-ethereum/core/tracing"
910
"github.com/ethereum/go-ethereum/eth/tracers/logger"
1011

1112
"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -122,6 +123,6 @@ func (d *testChain) GetHeader(h common.Hash, n uint64) *types.Header {
122123
}
123124
}
124125

125-
func MarkdownTracer() vm.EVMLogger {
126-
return logger.NewMarkdownLogger(&logger.Config{}, os.Stdout)
126+
func MarkdownTracer() *tracing.Hooks {
127+
return logger.NewMarkdownLogger(&logger.Config{}, os.Stdout).Hooks()
127128
}

‎cannon/mipsevm/testutil/mips.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99

1010
"github.com/ethereum/go-ethereum/common"
1111
"github.com/ethereum/go-ethereum/core/state"
12+
"github.com/ethereum/go-ethereum/core/tracing"
1213
"github.com/ethereum/go-ethereum/core/vm"
1314
"github.com/stretchr/testify/require"
1415

@@ -33,7 +34,7 @@ func NewMIPSEVM(artifacts *Artifacts, addrs *Addresses) *MIPSEVM {
3334
return &MIPSEVM{env, evmState, addrs, nil, artifacts, math.MaxUint64, nil}
3435
}
3536

36-
func (m *MIPSEVM) SetTracer(tracer vm.EVMLogger) {
37+
func (m *MIPSEVM) SetTracer(tracer *tracing.Hooks) {
3738
m.env.Config.Tracer = tracer
3839
}
3940

‎go.mod

+22-17
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
99
github.com/cockroachdb/pebble v0.0.0-20231018212520-f6cde3fc2fa4
1010
github.com/consensys/gnark-crypto v0.12.1
11-
github.com/crate-crypto/go-kzg-4844 v0.7.0
11+
github.com/crate-crypto/go-kzg-4844 v1.0.0
1212
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
1313
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
1414
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240803025447-c92ef420eec2
15-
github.com/ethereum/go-ethereum v1.13.15
15+
github.com/ethereum/go-ethereum v1.14.7
1616
github.com/fsnotify/fsnotify v1.7.0
1717
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
1818
github.com/google/go-cmp v0.6.0
@@ -51,9 +51,9 @@ require (
5151

5252
require (
5353
github.com/BurntSushi/toml v1.4.0 // indirect
54-
github.com/DataDog/zstd v1.5.5 // indirect
55-
github.com/Microsoft/go-winio v0.6.1 // indirect
56-
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
54+
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
55+
github.com/Microsoft/go-winio v0.6.2 // indirect
56+
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
5757
github.com/allegro/bigcache v1.2.1 // indirect
5858
github.com/armon/go-metrics v0.4.1 // indirect
5959
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -63,37 +63,38 @@ require (
6363
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
6464
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
6565
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
66-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
67-
github.com/cockroachdb/errors v1.11.1 // indirect
66+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
67+
github.com/cockroachdb/errors v1.11.3 // indirect
6868
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
6969
github.com/cockroachdb/redact v1.1.5 // indirect
7070
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
7171
github.com/consensys/bavard v0.1.13 // indirect
7272
github.com/containerd/cgroups v1.1.0 // indirect
7373
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7474
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
75-
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
75+
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
7676
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7777
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
78-
github.com/deckarep/golang-set/v2 v2.3.0 // indirect
78+
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
7979
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
8080
github.com/deepmap/oapi-codegen v1.8.2 // indirect
8181
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de // indirect
8282
github.com/dlclark/regexp2 v1.7.0 // indirect
8383
github.com/docker/go-units v0.5.0 // indirect
84+
github.com/donovanhide/eventsource v0.0.0-20210830082556-c59027999da0 // indirect
8485
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
8586
github.com/dustin/go-humanize v1.0.1 // indirect
8687
github.com/elastic/gosigar v0.14.2 // indirect
87-
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
88-
github.com/fatih/color v1.15.0 // indirect
88+
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
89+
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
90+
github.com/fatih/color v1.16.0 // indirect
8991
github.com/felixge/fgprof v0.9.3 // indirect
9092
github.com/ferranbt/fastssz v0.1.2 // indirect
9193
github.com/fjl/memsize v0.0.2 // indirect
9294
github.com/flynn/noise v1.1.0 // indirect
9395
github.com/francoispqt/gojay v1.2.13 // indirect
9496
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
95-
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
96-
github.com/getsentry/sentry-go v0.20.0 // indirect
97+
github.com/getsentry/sentry-go v0.27.0 // indirect
9798
github.com/go-ini/ini v1.67.0 // indirect
9899
github.com/go-ole/go-ole v1.3.0 // indirect
99100
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
@@ -103,7 +104,7 @@ require (
103104
github.com/gofrs/flock v0.8.1 // indirect
104105
github.com/gogo/protobuf v1.3.2 // indirect
105106
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
106-
github.com/golang/protobuf v1.5.3 // indirect
107+
github.com/golang/protobuf v1.5.4 // indirect
107108
github.com/google/gopacket v1.1.19 // indirect
108109
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
109110
github.com/google/uuid v1.6.0 // indirect
@@ -129,7 +130,8 @@ require (
129130
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
130131
github.com/jbenet/goprocess v0.1.4 // indirect
131132
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
132-
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c // indirect
133+
github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 // indirect
134+
github.com/kilic/bls12-381 v0.1.0 // indirect
133135
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
134136
github.com/koron/go-ssdp v0.0.4 // indirect
135137
github.com/kr/pretty v0.3.1 // indirect
@@ -189,6 +191,9 @@ require (
189191
github.com/prometheus/client_model v0.6.1 // indirect
190192
github.com/prometheus/common v0.48.0 // indirect
191193
github.com/prometheus/procfs v0.12.0 // indirect
194+
github.com/protolambda/bls12-381-util v0.1.0 // indirect
195+
github.com/protolambda/zrnt v0.32.2 // indirect
196+
github.com/protolambda/ztyp v0.2.2 // indirect
192197
github.com/quic-go/qpack v0.4.0 // indirect
193198
github.com/quic-go/quic-go v0.44.0 // indirect
194199
github.com/quic-go/webtransport-go v0.8.0 // indirect
@@ -221,14 +226,14 @@ require (
221226
golang.org/x/text v0.16.0 // indirect
222227
golang.org/x/tools v0.23.0 // indirect
223228
google.golang.org/protobuf v1.34.1 // indirect
224-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
229+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
225230
gopkg.in/yaml.v2 v2.4.0 // indirect
226231
gopkg.in/yaml.v3 v3.0.1 // indirect
227232
lukechampine.com/blake3 v1.2.1 // indirect
228233
rsc.io/tmplfunc v0.0.3 // indirect
229234
)
230235

231-
replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101315.3-rc.2
236+
replace github.com/ethereum/go-ethereum v1.14.7 => github.com/ethereum-optimism/op-geth v1.101407.0-rc.1
232237

233238
//replace github.com/ethereum/go-ethereum v1.13.9 => ../op-geth
234239

0 commit comments

Comments
 (0)