Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependabot(docker): bump ethereum/client-go from v1.13.15 to v1.14.8 in /ops-bedrock #104

Closed
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8741423
op-e2e: Fix GraniteSystemConfig (#11361)
sebastianst Aug 6, 2024
e6dd1ee
update sepolia-devnet-0 deploy-config (#11371)
Inphi Aug 6, 2024
79c8fe8
cannon: move example test programs into testdata directory to prevent…
protolambda Aug 7, 2024
ec45f66
op-node: abort block publishing if conductor commit fails (#11380)
protolambda Aug 7, 2024
2491a37
Fix devnet-up when op-program/bin is missing prestate-proof.json (#11…
anacrolix Aug 7, 2024
96b9e70
contracts-bedrock: migrate to just (#11276)
tynes Aug 7, 2024
cc67d34
op-proposer, op-batcher: Wait for sync in Start rather than loop. (#1…
ajsutton Aug 7, 2024
051db54
contracts-bedrock: improve `CrossL2Inbox` devex (#11322)
tynes Aug 7, 2024
b047e1f
Revert "Fix devnet-up when op-program/bin is missing prestate-proof.j…
ajsutton Aug 7, 2024
2f295d0
devnet/e2e: run L1 Deneb and L2 Fjord by default (#11359)
protolambda Aug 8, 2024
7343468
feat(predeploys): add L2toL2CDM to predeploy addresses.go (#11403)
tremarkley Aug 8, 2024
0c8d7c8
contracts-bedrock: debug tests (#11397)
tynes Aug 8, 2024
bf4693e
ci: better solc warnings check (#11231)
tynes Aug 8, 2024
770cbc6
repo: migrate away from pnpm (#11395)
tynes Aug 9, 2024
8b636e0
Run cannon-prestate if devnet cannon prestate files are missing (#11399)
anacrolix Aug 9, 2024
dae091f
ci: update geth tool to v1.14.7 (#11410)
protolambda Aug 9, 2024
e157ed7
Add RV reviews (#11422)
maurelian Aug 9, 2024
ca85dc4
Update to Geth 1.14.7 (#11382)
mdehoog Aug 9, 2024
94b7e03
cannon: Undo changes to memprofile patching (#11420)
mbaxter Aug 9, 2024
cdfe8a8
fix: update contracts README diagram (#11406)
smartcontracts Aug 9, 2024
b1dfa22
fix(ctb): remove linked libraries from scripts and tests (#11426)
mds1 Aug 9, 2024
586e662
add rationale to comment (#11429)
mds1 Aug 9, 2024
261938e
ci: manage versions in versions.json (#11415)
sebastianst Aug 9, 2024
acd23f2
cannon: Add support for --type mt to enable multithreaded cannon (#11…
ajsutton Aug 9, 2024
d098cf8
dependabot(gomod): bump golang.org/x/crypto from 0.25.0 to 0.26.0 (#1…
dependabot[bot] Aug 9, 2024
773e476
op-supervisor: Include executing message info when storing logs. (#11…
axelKingsley Aug 9, 2024
5a4fbce
fix: minor error in contracts readme (#11432)
smartcontracts Aug 10, 2024
5c8ebef
Don't recheck terminal type for color (#11412)
anacrolix Aug 12, 2024
995ddcf
maint: further clean up contract scripts organization (#11434)
smartcontracts Aug 12, 2024
a0b95aa
Merge branch 'develop' of https://github.com/ethereum-optimism/optimi…
zobront Aug 12, 2024
402627f
dependabot(docker): bump ethereum/client-go in /ops-bedrock
dependabot[bot] Aug 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to Geth 1.14.7 (#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>
  • Loading branch information
4 people authored Aug 9, 2024
commit ca85dc42870395de88f8ea61afe6355a432621c1
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ version: 2.1
parameters:
ci_builder_image:
type: string
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.50.0
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.51.0
ci_builder_rust_image:
type: string
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder-rust:latest
2 changes: 1 addition & 1 deletion cannon/cmd/log.go
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ package cmd

import (
"io"
"log/slog"
"os"

"golang.org/x/exp/slog"
"golang.org/x/term"

"github.com/ethereum/go-ethereum/log"
15 changes: 8 additions & 7 deletions cannon/mipsevm/tests/evm_test.go
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ import (

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/tracing"
"github.com/ethereum/go-ethereum/core/vm"
"github.com/stretchr/testify/require"

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

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

for _, f := range testFiles {
t.Run(f.Name(), func(t *testing.T) {
@@ -102,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
@@ -156,7 +157,7 @@ func TestEVM_CloneFlags(t *testing.T) {

func TestEVMSingleStep(t *testing.T) {
contracts, addrs := testContractsSetup(t)
var tracer vm.EVMLogger
var tracer *tracing.Hooks

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

func TestEVMSysWriteHint(t *testing.T) {
contracts, addrs := testContractsSetup(t)
var tracer vm.EVMLogger
var tracer *tracing.Hooks

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

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

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

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

func TestClaimEVM(t *testing.T) {
contracts, addrs := testContractsSetup(t)
var tracer vm.EVMLogger // no-tracer by default, but see test_util.MarkdownTracer
var tracer *tracing.Hooks // no-tracer by default, but see test_util.MarkdownTracer
evm := testutil.NewMIPSEVM(contracts, addrs)
evm.SetTracer(tracer)
testutil.LogStepFailureAtCleanup(t, evm)
5 changes: 3 additions & 2 deletions cannon/mipsevm/testutil/evm.go
Original file line number Diff line number Diff line change
@@ -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()
}
3 changes: 2 additions & 1 deletion cannon/mipsevm/testutil/mips.go
Original file line number Diff line number Diff line change
@@ -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
}

39 changes: 22 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
@@ -8,11 +8,11 @@ require (
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
github.com/cockroachdb/pebble v0.0.0-20231018212520-f6cde3fc2fa4
github.com/consensys/gnark-crypto v0.12.1
github.com/crate-crypto/go-kzg-4844 v0.7.0
github.com/crate-crypto/go-kzg-4844 v1.0.0
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240803025447-c92ef420eec2
github.com/ethereum/go-ethereum v1.13.15
github.com/ethereum/go-ethereum v1.14.7
github.com/fsnotify/fsnotify v1.7.0
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
github.com/google/go-cmp v0.6.0
@@ -51,9 +51,9 @@ require (

require (
github.com/BurntSushi/toml v1.4.0 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
@@ -63,37 +63,38 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/containerd/cgroups v1.1.0 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20231025140028-3c0104f4b233 // indirect
github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
github.com/deckarep/golang-set/v2 v2.3.0 // indirect
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
github.com/deepmap/oapi-codegen v1.8.2 // indirect
github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de // indirect
github.com/dlclark/regexp2 v1.7.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/donovanhide/eventsource v0.0.0-20210830082556-c59027999da0 // indirect
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/elastic/gosigar v0.14.2 // indirect
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/felixge/fgprof v0.9.3 // indirect
github.com/ferranbt/fastssz v0.1.2 // indirect
github.com/fjl/memsize v0.0.2 // indirect
github.com/flynn/noise v1.1.0 // indirect
github.com/francoispqt/gojay v1.2.13 // indirect
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 // indirect
github.com/getsentry/sentry-go v0.20.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/go-ini/ini v1.67.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
@@ -103,7 +104,7 @@ require (
github.com/gofrs/flock v0.8.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
github.com/google/uuid v1.6.0 // indirect
@@ -129,7 +130,8 @@ require (
github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
github.com/jbenet/goprocess v0.1.4 // indirect
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 // indirect
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c // indirect
github.com/karalabe/hid v1.0.1-0.20240306101548-573246063e52 // indirect
github.com/kilic/bls12-381 v0.1.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
github.com/koron/go-ssdp v0.0.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
@@ -189,6 +191,9 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/protolambda/bls12-381-util v0.1.0 // indirect
github.com/protolambda/zrnt v0.32.2 // indirect
github.com/protolambda/ztyp v0.2.2 // indirect
github.com/quic-go/qpack v0.4.0 // indirect
github.com/quic-go/quic-go v0.44.0 // indirect
github.com/quic-go/webtransport-go v0.8.0 // indirect
@@ -221,14 +226,14 @@ require (
golang.org/x/text v0.16.0 // indirect
golang.org/x/tools v0.23.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.2.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
)

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

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

Loading