Sitelet https://github.com/ethereum-optimism/optimism/commit/82cb8ff671daa50f493f63f0a10fcad256cfbd54
Skip to content

Commit 82cb8ff

Browse files
0x001010100x00101010
authored
Update op-geth depdency to 1.14.11 base (#12262)
* Update op-geth depdency to 1.14.10 base * Update op-geth to v1.14.11 merge base * Update to ethereum-optimism/op-geth commit
1 parent daff281 commit 82cb8ff

25 files changed

Lines changed: 95 additions & 76 deletions

File tree

‎cannon/Dockerfile.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ COPY --from=cannon-v2 /usr/local/bin/cannon /usr/local/bin/cannon-v2
3030
# verify the latest singlethreaded VM behavior against cannon-v2
3131
RUN cd cannon && make diff-singlethreaded-2-cannon -e OTHER_CANNON=/usr/local/bin/cannon-v2
3232
RUN --mount=type=cache,target=/root/.cache/go-build cd cannon && \
33-
make diff-singlethreaded-2-cannon -e OTHER_CANNON=/usr/local/bin/cannon-v2 \
34-
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE
33+
make diff-singlethreaded-2-cannon -e OTHER_CANNON=/usr/local/bin/cannon-v2 \
34+
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE

‎cannon/mipsevm/testutil/evm.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/ethereum-optimism/optimism/op-chain-ops/srcmap"
1111
"github.com/ethereum/go-ethereum/core/tracing"
1212
"github.com/ethereum/go-ethereum/eth/tracers/logger"
13+
"github.com/ethereum/go-ethereum/triedb"
1314
"github.com/stretchr/testify/require"
1415

1516
"github.com/ethereum-optimism/optimism/op-chain-ops/foundry"
@@ -95,8 +96,8 @@ func NewEVMEnv(contracts *ContractMetadata) (*vm.EVM, *state.StateDB) {
9596
bc := &testChain{startTime: *chainCfg.CancunTime + offsetBlocks*12}
9697
header := bc.GetHeader(common.Hash{}, 17034870+offsetBlocks)
9798
db := rawdb.NewMemoryDatabase()
98-
statedb := state.NewDatabase(db)
99-
state, err := state.New(types.EmptyRootHash, statedb, nil)
99+
statedb := state.NewDatabase(triedb.NewDatabase(db, nil), nil)
100+
state, err := state.New(types.EmptyRootHash, statedb)
100101
if err != nil {
101102
panic(fmt.Errorf("failed to create memory state db: %w", err))
102103
}

‎cannon/testdata/example/alloc/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module alloc
22

33
go 1.22
44

5-
toolchain go1.22.0
5+
toolchain go1.22.7
66

77
require github.com/ethereum-optimism/optimism v0.0.0
88

‎cannon/testdata/example/claim/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module claim
22

33
go 1.22
44

5-
toolchain go1.22.0
5+
toolchain go1.22.7
66

77
require github.com/ethereum-optimism/optimism v0.0.0
88

‎go.mod‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/ethereum-optimism/optimism
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.7
46

57
require (
68
github.com/BurntSushi/toml v1.4.0
@@ -13,7 +15,7 @@ require (
1315
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0
1416
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
1517
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac
16-
github.com/ethereum/go-ethereum v1.14.8
18+
github.com/ethereum/go-ethereum v1.14.11
1719
github.com/fsnotify/fsnotify v1.7.0
1820
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
1921
github.com/google/go-cmp v0.6.0
@@ -62,7 +64,7 @@ require (
6264
github.com/armon/go-metrics v0.4.1 // indirect
6365
github.com/benbjohnson/clock v1.3.5 // indirect
6466
github.com/beorn7/perks v1.0.1 // indirect
65-
github.com/bits-and-blooms/bitset v1.10.0 // indirect
67+
github.com/bits-and-blooms/bitset v1.13.0 // indirect
6668
github.com/boltdb/bolt v1.3.1 // indirect
6769
github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
6870
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
@@ -91,7 +93,7 @@ require (
9193
github.com/dustin/go-humanize v1.0.1 // indirect
9294
github.com/elastic/gosigar v0.14.3 // indirect
9395
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
94-
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 // indirect
96+
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
9597
github.com/fatih/color v1.16.0 // indirect
9698
github.com/felixge/fgprof v0.9.3 // indirect
9799
github.com/ferranbt/fastssz v0.1.2 // indirect
@@ -216,7 +218,7 @@ require (
216218
github.com/spaolacci/murmur3 v1.1.0 // indirect
217219
github.com/status-im/keycard-go v0.2.0 // indirect
218220
github.com/stretchr/objx v0.5.2 // indirect
219-
github.com/supranational/blst v0.3.11 // indirect
221+
github.com/supranational/blst v0.3.13 // indirect
220222
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
221223
github.com/tklauser/go-sysconf v0.3.12 // indirect
222224
github.com/tklauser/numcpus v0.6.1 // indirect
@@ -249,7 +251,7 @@ require (
249251
rsc.io/tmplfunc v0.0.3 // indirect
250252
)
251253

252-
replace github.com/ethereum/go-ethereum v1.14.8 => github.com/ethereum-optimism/op-geth v1.101408.0-rc.4.0.20240827042333-110c433a2469
254+
replace github.com/ethereum/go-ethereum v1.14.11 => github.com/ethereum-optimism/op-geth v1.101408.1-0.20241002211323-d5a96613c22b
253255

254256
// replace github.com/ethereum/go-ethereum => ../op-geth
255257

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
4848
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
4949
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
5050
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
51-
github.com/bits-and-blooms/bitset v1.10.0 h1:ePXTeiPEazB5+opbv5fr8umg2R/1NlzgDsyepwsSr88=
52-
github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
51+
github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
52+
github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
5353
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
5454
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
5555
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
@@ -181,14 +181,14 @@ github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/u
181181
github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
182182
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3 h1:RWHKLhCrQThMfch+QJ1Z8veEq5ZO3DfIhZ7xgRP9WTc=
183183
github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3/go.mod h1:QziizLAiF0KqyLdNJYD7O5cpDlaFMNZzlxYNcWsJUxs=
184-
github.com/ethereum-optimism/op-geth v1.101408.0-rc.4.0.20240827042333-110c433a2469 h1:sGqlBjx0+z/ExU6VNo5OHSXS/5nc6BfkEQJvSdVbWp0=
185-
github.com/ethereum-optimism/op-geth v1.101408.0-rc.4.0.20240827042333-110c433a2469/go.mod h1:Mk8AhvlqFbjI9oW2ymThSSoqc6kiEH0/tCmHGMEu6ac=
184+
github.com/ethereum-optimism/op-geth v1.101408.1-0.20241002211323-d5a96613c22b h1:9C6WytqAcqWKXQTMw2Da/S/aIJJmMvT+2MUpFnMdGrg=
185+
github.com/ethereum-optimism/op-geth v1.101408.1-0.20241002211323-d5a96613c22b/go.mod h1:7S4pp8KHBmEmKkRjL1BPOc6jY9hW+64YeMUjR3RVLw4=
186186
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac h1:hCIrLuOPV3FJfMDvXeOhCC3uQNvFoMIIlkT2mN2cfeg=
187187
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240910145426-b3905c89e8ac/go.mod h1:XaVXL9jg8BcyOeugECgIUGa9Y3DjYJj71RHmb5qon6M=
188188
github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
189189
github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
190-
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0 h1:KrE8I4reeVvf7C1tm8elRjj4BdscTYzz/WAbYyf/JI4=
191-
github.com/ethereum/go-verkle v0.1.1-0.20240306133620-7d920df305f0/go.mod h1:D9AJLVXSyZQXJQVk8oh1EwjISE+sJTn2duYIZC0dy3w=
190+
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
191+
github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
192192
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
193193
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
194194
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
@@ -767,8 +767,8 @@ github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
767767
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
768768
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
769769
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
770-
github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
771-
github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
770+
github.com/supranational/blst v0.3.13 h1:AYeSxdOMacwu7FBmpfloBz5pbFXDmJL33RuwnKtmTjk=
771+
github.com/supranational/blst v0.3.13/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
772772
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
773773
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
774774
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI=

‎op-alt-da/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ ARG OP_STACK_GO_BUILDER=us-docker.pkg.dev/oplabs-tools-artifacts/images/op-stack
22
FROM $OP_STACK_GO_BUILDER as builder
33
# See "make golang-docker" and /ops/docker/op-stack-go
44

5-
FROM alpine:3.18
5+
FROM alpine:3.20
66

77
COPY --from=builder /usr/local/bin/da-server /usr/local/bin/da-server
88

‎op-chain-ops/cmd/op-simulate/main.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/ethereum/go-ethereum/core/tracing"
15+
"github.com/ethereum/go-ethereum/triedb"
1516
"github.com/holiman/uint256"
1617
"github.com/pkg/profile"
1718
"github.com/urfave/cli/v2"
@@ -248,8 +249,8 @@ func (d *simChainContext) GetHeader(h common.Hash, n uint64) *types.Header {
248249
func simulate(ctx context.Context, logger log.Logger, conf *params.ChainConfig,
249250
prestatePath string, tx *types.Transaction, header *types.Header, doProfile bool) error {
250251
memDB := rawdb.NewMemoryDatabase()
251-
stateDB := gstate.NewDatabase(memDB)
252-
state, err := gstate.New(types.EmptyRootHash, stateDB, nil)
252+
stateDB := gstate.NewDatabase(triedb.NewDatabase(memDB, nil), nil)
253+
state, err := gstate.New(types.EmptyRootHash, stateDB)
253254
if err != nil {
254255
return fmt.Errorf("failed to create in-memory state: %w", err)
255256
}

‎op-chain-ops/foundry/allocs_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ func TestForgeAllocs_FromState(t *testing.T) {
2828
oplog.SetGlobalLogHandler(oplog.NewLogHandler(os.Stdout, cfg))
2929

3030
rawDB := rawdb.NewMemoryDatabase()
31-
stateDB := state.NewDatabaseWithConfig(rawDB, &triedb.Config{
31+
stateDB := state.NewDatabase(triedb.NewDatabase(rawDB, &triedb.Config{
3232
Preimages: true,
3333
IsVerkle: false,
3434
HashDB: hashdb.Defaults,
3535
PathDB: nil,
36-
})
37-
st, err := state.New(types.EmptyRootHash, stateDB, nil)
36+
}), nil)
37+
st, err := state.New(types.EmptyRootHash, stateDB)
3838
require.NoError(t, err)
3939

4040
alice := common.HexToAddress("0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266")
@@ -60,15 +60,15 @@ func TestForgeAllocs_FromState(t *testing.T) {
6060
// (see doc-comment in Commit, absolute footgun)
6161
root, err := st.Commit(0, false)
6262
require.NoError(t, err)
63-
st, err = state.New(root, stateDB, nil)
63+
st, err = state.New(root, stateDB)
6464
require.NoError(t, err)
6565

6666
st.SetState(contract, common.Hash{0: 0xa}, common.Hash{0: 1})
6767
st.SetState(contract, crypto.Keccak256Hash([]byte("hello")), crypto.Keccak256Hash([]byte("world")))
6868

6969
root, err = st.Commit(0, false)
7070
require.NoError(t, err)
71-
st, err = state.New(root, stateDB, nil)
71+
st, err = state.New(root, stateDB)
7272
require.NoError(t, err)
7373

7474
var allocs ForgeAllocs

‎op-chain-ops/script/script.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,14 +212,14 @@ func NewHost(
212212

213213
// Create an in-memory database, to host our temporary script state changes
214214
h.rawDB = rawdb.NewMemoryDatabase()
215-
h.stateDB = state.NewDatabaseWithConfig(h.rawDB, &triedb.Config{
215+
h.stateDB = state.NewDatabase(triedb.NewDatabase(h.rawDB, &triedb.Config{
216216
Preimages: true, // To be able to iterate the state we need the Preimages
217217
IsVerkle: false,
218218
HashDB: hashdb.Defaults,
219219
PathDB: nil,
220-
})
220+
}), nil)
221221
var err error
222-
h.state, err = state.New(types.EmptyRootHash, h.stateDB, nil)
222+
h.state, err = state.New(types.EmptyRootHash, h.stateDB)
223223
if err != nil {
224224
panic(fmt.Errorf("failed to create memory state db: %w", err))
225225
}
@@ -653,7 +653,7 @@ func (h *Host) StateDump() (*foundry.ForgeAllocs, error) {
653653
return nil, fmt.Errorf("failed to commit state: %w", err)
654654
}
655655
// We need a state object around the state DB
656-
st, err := state.New(root, h.stateDB, nil)
656+
st, err := state.New(root, h.stateDB)
657657
if err != nil {
658658
return nil, fmt.Errorf("failed to create state object for state-dumping: %w", err)
659659
}

0 commit comments

Comments
 (0)