diff --git a/Makefile b/Makefile index 091352c61..6e19acd8c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ ################## update dependencies #################### -ETHEREUM_SUBMODULE_COMMIT_OR_TAG := 0eda19148ddd2c6d8cf252a242def9f940445a24 -ETHEREUM_TARGET_VERSION := v1.10.14-0.20260702033856-0eda19148ddd -TENDERMINT_TARGET_VERSION := v0.3.8-0.20260625105428-a5de063445a3 +ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.2.4 +ETHEREUM_TARGET_VERSION := morph-v2.2.4 +TENDERMINT_TARGET_VERSION := v0.3.8 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum diff --git a/bindings/go.mod b/bindings/go.mod index 52829f5e4..83e66ffbf 100644 --- a/bindings/go.mod +++ b/bindings/go.mod @@ -2,7 +2,7 @@ module morph-l2/bindings go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd diff --git a/common/go.mod b/common/go.mod index e64e6afb8..90775a695 100644 --- a/common/go.mod +++ b/common/go.mod @@ -2,7 +2,7 @@ module morph-l2/common go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/holiman/uint256 v1.2.4 diff --git a/contracts/go.mod b/contracts/go.mod index b1ac80b26..8213e9650 100644 --- a/contracts/go.mod +++ b/contracts/go.mod @@ -2,7 +2,7 @@ module morph-l2/contract go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/iden3/go-iden3-crypto v0.0.16 diff --git a/go-ethereum b/go-ethereum index efdd4dbee..0eda19148 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit efdd4dbee28b2fb4005267a7793d607111d9490b +Subproject commit 0eda19148ddd2c6d8cf252a242def9f940445a24 diff --git a/node/go.mod b/node/go.mod index 3fc7efb0c..3600eb3cc 100644 --- a/node/go.mod +++ b/node/go.mod @@ -2,7 +2,7 @@ module morph-l2/node go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/cenkalti/backoff/v4 v4.1.3 diff --git a/node/go.sum b/node/go.sum index 61a687e60..d117f488e 100644 --- a/node/go.sum +++ b/node/go.sum @@ -416,8 +416,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd h1:p81r2Jx+iLt3sRNICEFt7K9SN68ardffrWhB15ggeAw= github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= -github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 h1:ZpUi8rHb4KOcW8Eua5VSQksWBI+8F25mxdtzjJl4h/M= -github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3/go.mod h1:qpiwqfcCB89dBYfqVJOc/HjGxDp3OdDlthgttJJYyRs= +github.com/morph-l2/tendermint v0.3.8 h1:lMiHmgANcbM+htEJyAepQn9vZb/9Poa+0LQKETxN8qM= +github.com/morph-l2/tendermint v0.3.8/go.mod h1:qpiwqfcCB89dBYfqVJOc/HjGxDp3OdDlthgttJJYyRs= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/node/types/networks.go b/node/types/networks.go index 39f88159e..c0615b80f 100644 --- a/node/types/networks.go +++ b/node/types/networks.go @@ -10,18 +10,18 @@ var ( // L1 Mainnet Contract Addresses MainnetRollupContractAddress = common.HexToAddress("0x759894ced0e6af42c26668076ffa84d02e3cef60") MainnetSyncDepositContractAddress = common.HexToAddress("0x3931ade842f5bb8763164bdd81e5361dce6cc1ef") - MainnetL1SequencerContractAddress = common.HexToAddress("") + MainnetL1SequencerContractAddress = common.HexToAddress("0xcE11E1a0E9A69323FAd5848bc601f9156eBdD14a") // L1 Hoodi Contract Addresses HoodiRollupContractAddress = common.HexToAddress("0x57e0e6dde89dc52c01fe785774271504b1e04664") HoodiSyncDepositContractAddress = common.HexToAddress("0xd7f39d837f4790b215ba67e0ab63665912648dbe") - HoodiL1SequencerContractAddress = common.HexToAddress("") + HoodiL1SequencerContractAddress = common.HexToAddress("0x3f167e33B42406de0a76e850eCdB3eD41Ad45C1E") ) // Network-specific default block timestamps (Unix milliseconds) at which consensus switches to // centralized sequencer mode. They are used when --mainnet / --hoodi is selected and the generic // sequencerUpgradeTime flag is unset. A value <= 0 disables timestamp-triggered upgrade. var ( - MainnetCentralizedSequencerUpgradeTime int64 = 0 // ms - HoodiCentralizedSequencerUpgradeTime int64 = 0 // ms + MainnetCentralizedSequencerUpgradeTime int64 = 1785218400000 // ms + HoodiCentralizedSequencerUpgradeTime int64 = 1784613600000 // ms ) diff --git a/ops/l2-genesis/go.mod b/ops/l2-genesis/go.mod index 50aa134eb..082333828 100644 --- a/ops/l2-genesis/go.mod +++ b/ops/l2-genesis/go.mod @@ -2,7 +2,7 @@ module morph-l2/morph-deployer go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/holiman/uint256 v1.2.4 diff --git a/ops/tools/go.mod b/ops/tools/go.mod index da2ad8a7f..df5e182fc 100644 --- a/ops/tools/go.mod +++ b/ops/tools/go.mod @@ -2,7 +2,7 @@ module morph-l2/tools go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd diff --git a/ops/tools/go.sum b/ops/tools/go.sum index bcf1cc7f4..6e6295dbd 100644 --- a/ops/tools/go.sum +++ b/ops/tools/go.sum @@ -163,8 +163,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd h1:p81r2Jx+iLt3sRNICEFt7K9SN68ardffrWhB15ggeAw= github.com/morph-l2/go-ethereum v1.10.14-0.20260702033856-0eda19148ddd/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= -github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 h1:ZpUi8rHb4KOcW8Eua5VSQksWBI+8F25mxdtzjJl4h/M= -github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3/go.mod h1:qpiwqfcCB89dBYfqVJOc/HjGxDp3OdDlthgttJJYyRs= +github.com/morph-l2/tendermint v0.3.8 h1:lMiHmgANcbM+htEJyAepQn9vZb/9Poa+0LQKETxN8qM= +github.com/morph-l2/tendermint v0.3.8/go.mod h1:qpiwqfcCB89dBYfqVJOc/HjGxDp3OdDlthgttJJYyRs= 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= diff --git a/tx-submitter/go.mod b/tx-submitter/go.mod index 2ab622de4..db3dfdacc 100644 --- a/tx-submitter/go.mod +++ b/tx-submitter/go.mod @@ -2,7 +2,7 @@ module morph-l2/tx-submitter go 1.24.0 -replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8-0.20260625105428-a5de063445a3 +replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.8 require ( github.com/consensys/gnark-crypto v0.16.0