Skip to content

Commit

Permalink
Bump ethereum to morph-v2.0.0 (#585)
Browse files Browse the repository at this point in the history 
Co-authored-by: chengwenxi <22697326+chengwenxi@users.noreply.github.com>
  • Loading branch information
@chengwenxi
chengwenxi and chengwenxi authored Oct 18, 2024
1 parent a9f3e8e commit 2707c9d
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################## update dependencies ####################

ETHEREUM_TARGET_VERSION := v1.10.14-0.20240928131248-d5897cc977af
ETHEREUM_TARGET_VERSION := morph-v2.0.0
TENDERMINT_TARGET_VERSION := v0.3.1

ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
Expand Down
2 changes: 1 addition & 1 deletion bindings/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.22

replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.1

require github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
require github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911

require (
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions bindings/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
Expand Down
2 changes: 1 addition & 1 deletion contracts/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.

require (
github.com/iden3/go-iden3-crypto v0.0.16
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/stretchr/testify v1.9.0
)

Expand Down
4 changes: 2 additions & 2 deletions contracts/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
Expand Down
2 changes: 1 addition & 1 deletion go-ethereum
Submodule go-ethereum updated 920 files
2 changes: 1 addition & 1 deletion node/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/golang-lru v1.0.2
github.com/klauspost/compress v1.17.9
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/prometheus/client_golang v1.17.0
github.com/spf13/viper v1.13.0
github.com/stretchr/testify v1.9.0
Expand Down
4 changes: 2 additions & 2 deletions node/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/tendermint v0.3.1 h1:yqyM3/p9sCNmFSsIFeIxS5RBgXHWqbtyNHx16I9cIZ0=
github.com/morph-l2/tendermint v0.3.1/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down
2 changes: 1 addition & 1 deletion ops/l2-genesis/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.

require (
github.com/holiman/uint256 v1.2.4
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/stretchr/testify v1.9.0
github.com/urfave/cli v1.22.14
)
Expand Down
4 changes: 2 additions & 2 deletions ops/l2-genesis/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
Expand Down
2 changes: 1 addition & 1 deletion ops/tools/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22
replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.1

require (
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/tendermint/tendermint v0.35.9
)

Expand Down
4 changes: 2 additions & 2 deletions ops/tools/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/tendermint v0.3.1 h1:yqyM3/p9sCNmFSsIFeIxS5RBgXHWqbtyNHx16I9cIZ0=
github.com/morph-l2/tendermint v0.3.1/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down
2 changes: 1 addition & 1 deletion oracle/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.
require (
github.com/go-kit/kit v0.12.0
github.com/morph-l2/externalsign v0.3.0
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/prometheus/client_golang v1.17.0
github.com/stretchr/testify v1.9.0
github.com/tendermint/tendermint v0.35.9
Expand Down
6 changes: 2 additions & 4 deletions oracle/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,10 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/externalsign v0.1.0-beta h1:wRah1DQXwQZvgh6sCkUL6i9knAUYHj5dZ1OEkUM9GQc=
github.com/morph-l2/externalsign v0.1.0-beta/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE=
github.com/morph-l2/externalsign v0.3.0 h1:eVGON//ofO5eJSZvJQW+8HUeaGlg4seaS99SzS8GQc4=
github.com/morph-l2/externalsign v0.3.0/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/tendermint v0.3.1 h1:yqyM3/p9sCNmFSsIFeIxS5RBgXHWqbtyNHx16I9cIZ0=
github.com/morph-l2/tendermint v0.3.1/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down
2 changes: 1 addition & 1 deletion tx-submitter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.
require (
github.com/holiman/uint256 v1.2.4
github.com/morph-l2/externalsign v0.3.0
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911
github.com/prometheus/client_golang v1.17.0
github.com/stretchr/testify v1.9.0
github.com/tendermint/tendermint v0.35.9
Expand Down
6 changes: 2 additions & 4 deletions tx-submitter/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,10 @@ github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqky
github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/morph-l2/externalsign v0.1.0-beta h1:wRah1DQXwQZvgh6sCkUL6i9knAUYHj5dZ1OEkUM9GQc=
github.com/morph-l2/externalsign v0.1.0-beta/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE=
github.com/morph-l2/externalsign v0.3.0 h1:eVGON//ofO5eJSZvJQW+8HUeaGlg4seaS99SzS8GQc4=
github.com/morph-l2/externalsign v0.3.0/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af h1:i4oF4NXEoJuaDSPT5PadQQF4FVG/YdMzYwm0C8DH7Nw=
github.com/morph-l2/go-ethereum v1.10.14-0.20240928131248-d5897cc977af/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911 h1:tqeVcWshnm06HGZQVd8e9pO1oqsVBuAH6ES8hBSxz+c=
github.com/morph-l2/go-ethereum v1.10.14-0.20241017085938-2f006c41c911/go.mod h1:sMJCfHOBzVRDkM2yF/Hy+oUk2rgC0CQZHTLs0cyzhhk=
github.com/morph-l2/tendermint v0.3.1 h1:yqyM3/p9sCNmFSsIFeIxS5RBgXHWqbtyNHx16I9cIZ0=
github.com/morph-l2/tendermint v0.3.1/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Expand Down

0 comments on commit 2707c9d

Please sign in to comment.