Skip to content

Commit 2223d98

Browse files
FletcherManFletcherMan
authored
Merge pull request #789 from morph-l2/main
pump go-ethereum version & support parsing setCodeTx (#782)
2 parents 70158ca + a985264 commit 2223d98

55 files changed

Lines changed: 22278 additions & 945 deletions

File tree

Some content is hidden

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

‎.github/workflows/prover.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: dtolnay/rust-toolchain@stable
27-
with:
28-
components: rustfmt
27+
- run: rustup component add rustfmt --toolchain nightly-2024-07-07
2928
- run: cargo fmt --all --check
3029

3130
build:

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################## update dependencies ####################
22

3-
ETHEREUM_TARGET_VERSION := morph-v2.0.5
3+
ETHEREUM_TARGET_VERSION := morph-v2.0.7
44
TENDERMINT_TARGET_VERSION := v0.3.2
55

66
ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum

‎bindings/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.22
44

55
replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.2
66

7-
require github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1
7+
require github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49
88

99
require (
1010
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect

‎bindings/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
109109
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
110110
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
111111
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
112-
github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1 h1:Mtl4361Zdc8w3SgCI7L/NuPeLaVdX1L/uP/D4ur/9Yw=
113-
github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
112+
github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49 h1:u6AqFnji0UtaBXQts0OYhG0++/AXjyXbWs514vMI8ko=
113+
github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
114114
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
115115
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
116116
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=

‎contracts/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.
66

77
require (
88
github.com/iden3/go-iden3-crypto v0.0.16
9-
github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1
9+
github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49
1010
github.com/stretchr/testify v1.9.0
1111
)
1212

‎contracts/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
2525
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2626
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
2727
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
28-
github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1 h1:Mtl4361Zdc8w3SgCI7L/NuPeLaVdX1L/uP/D4ur/9Yw=
29-
github.com/morph-l2/go-ethereum v1.10.14-0.20250424011308-f42440d1ace1/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
28+
github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49 h1:u6AqFnji0UtaBXQts0OYhG0++/AXjyXbWs514vMI8ko=
29+
github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
3030
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
3131
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
3232
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

‎contracts/src/deploy-config/holesky.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const config = {
1414
l2BaseFee: 0.1, // Gwei
1515

1616
// verify contract config
17-
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
17+
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
1818
// rollup contract config
1919
// initialize config
2020
finalizationPeriodSeconds: 600,

‎contracts/src/deploy-config/l1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const config = {
1717
l2BaseFee: 0.1, // Gwei
1818

1919
// verify contract config
20-
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
20+
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
2121
// rollup contract config
2222
// initialize config
2323
finalizationPeriodSeconds: 10,

‎contracts/src/deploy-config/qanetl1.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const config = {
1414
l2BaseFee: 0.1, // Gwei
1515

1616
// verify contract config
17-
programVkey: '0x006c835a4c049b699a3675fefa51b182c7efe404a656151c0410245966724bc3',
17+
programVkey: '0x0059b74a8fd03c44462de3916b45ebeedb9f1158e3037e8c40b8941cbe438d7e',
1818
// rollup contract config
1919
// initialize config
2020
finalizationPeriodSeconds: 600,

‎go-ethereum‎

Submodule go-ethereum updated 248 files

0 commit comments

Comments
 (0)