diff --git a/Makefile b/Makefile index afde54dbc..32f24ad9b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ ################## update dependencies #################### -ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.1.2 -ETHEREUM_TARGET_VERSION := morph-v2.1.2 +ETHEREUM_SUBMODULE_COMMIT_OR_TAG := ref_key +ETHEREUM_TARGET_VERSION := v1.10.14-0.20260227035937-a805e930447c TENDERMINT_TARGET_VERSION := v0.3.3 diff --git a/bindings/go.mod b/bindings/go.mod index a509930b7..75fa88c92 100644 --- a/bindings/go.mod +++ b/bindings/go.mod @@ -4,7 +4,7 @@ go 1.24.0 replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.3 -require github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 +require github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c require ( github.com/VictoriaMetrics/fastcache v1.12.2 // indirect diff --git a/bindings/go.sum b/bindings/go.sum index bb71a7769..f4c5844a9 100644 --- a/bindings/go.sum +++ b/bindings/go.sum @@ -111,8 +111,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.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= 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= diff --git a/contracts/go.mod b/contracts/go.mod index 514d63ee1..1d6922f95 100644 --- a/contracts/go.mod +++ b/contracts/go.mod @@ -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.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/stretchr/testify v1.10.0 ) diff --git a/contracts/go.sum b/contracts/go.sum index d0f44f830..9c723b90d 100644 --- a/contracts/go.sum +++ b/contracts/go.sum @@ -138,8 +138,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.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= 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/go-ethereum b/go-ethereum index 4f0f6e6bd..a805e9304 160000 --- a/go-ethereum +++ b/go-ethereum @@ -1 +1 @@ -Subproject commit 4f0f6e6bd14178a19a6ef6e57bdcb48eb6612bf4 +Subproject commit a805e930447c05cc97ab54390985fd54b3fc5d22 diff --git a/go.work.sum b/go.work.sum index 8c91e41ad..2b04155ed 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1015,6 +1015,7 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P github.com/morph-l2/go-ethereum v1.10.14-0.20251125061742-69718a9dcab9/go.mod h1:tiFPeidxjoCmLj18ne9H3KQdIGTCvRC30qlef06Fd9M= github.com/morph-l2/go-ethereum v1.10.14-0.20260206063816-522b70a5f16f h1:e8gfduHc4AKlR0fD6J3HXveP2Gp4PMvN2UfA9CYEvEc= github.com/morph-l2/go-ethereum v1.10.14-0.20260206063816-522b70a5f16f/go.mod h1:tiFPeidxjoCmLj18ne9H3KQdIGTCvRC30qlef06Fd9M= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae h1:VeRdUYdCw49yizlSbMEn2SZ+gT+3IUKx8BqxyQdz+BY= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= diff --git a/node/core/batch.go b/node/core/batch.go index 9c851956e..167c3c2e5 100644 --- a/node/core/batch.go +++ b/node/core/batch.go @@ -178,14 +178,14 @@ func (e *Executor) CalculateCapWithProposalBlock(currentBlockBytes []byte, curre return false, err } - // MPT fork: force batch points on the 1st and 2nd post-fork blocks, so the 1st post-fork block + // Jade fork: force batch points on the 1st and 2nd post-fork blocks, so the 1st post-fork block // becomes a single-block batch: [H1, H2). - force, err := e.forceBatchPointForMPTFork(height, block.Timestamp, block.StateRoot, block.Hash) + force, err := e.forceBatchPointForJadeFork(height, block.Timestamp, block.StateRoot, block.Hash) if err != nil { return false, err } if force { - e.logger.Info("MPT fork: force batch point", "height", height, "timestamp", block.Timestamp) + e.logger.Info("Jade fork: force batch point", "height", height, "timestamp", block.Timestamp) return true, nil } @@ -198,27 +198,27 @@ func (e *Executor) CalculateCapWithProposalBlock(currentBlockBytes []byte, curre return exceeded, err } -// forceBatchPointForMPTFork forces batch points at the 1st and 2nd block after the MPT fork time. +// forceBatchPointForJadeFork forces batch points at the 1st and 2nd block after the Jade fork time. // // Design goals: // - Minimal change: only affects batch-point decision logic. // - Stability: CalculateCapWithProposalBlock can be called multiple times at the same height; return must be consistent. // - Performance: after handling (or skipping beyond) the fork boundary, no more HeaderByNumber calls are made. -func (e *Executor) forceBatchPointForMPTFork(height uint64, blockTime uint64, stateRoot common.Hash, blockHash common.Hash) (bool, error) { +func (e *Executor) forceBatchPointForJadeFork(height uint64, blockTime uint64, stateRoot common.Hash, blockHash common.Hash) (bool, error) { // If we already decided to force at this height, keep returning true without extra RPCs. - if e.mptForkForceHeight == height && height != 0 { + if e.jadeForkForceHeight == height && height != 0 { return true, nil } // If fork boundary is already handled and this isn't a forced height, fast exit. - if e.mptForkStage >= 2 { + if e.jadeForkStage >= 2 { return false, nil } // Ensure we have fork time cached (0 means disabled). - if e.mptForkTime == 0 { - e.mptForkTime = e.l2Client.MPTForkTime() + if e.jadeForkTime == 0 { + e.jadeForkTime = e.l2Client.JadeForkTime() } - forkTime := e.mptForkTime + forkTime := e.jadeForkTime if forkTime == 0 || blockTime < forkTime { return false, nil } @@ -234,24 +234,24 @@ func (e *Executor) forceBatchPointForMPTFork(height uint64, blockTime uint64, st if parent.Time < forkTime { // Log H1 (the 1st post-fork block) state root // This stateRoot is intended to be used as the Rollup contract "genesis state root" - // when we reset/re-initialize the genesis state root during the MPT upgrade. + // when we reset/re-initialize the genesis state root during the Jade upgrade. e.logger.Info( - "MPT_FORK_H1_GENESIS_STATE_ROOT", + "JADE_FORK_H1_GENESIS_STATE_ROOT", "height", height, "timestamp", blockTime, "forkTime", forkTime, "stateRoot", stateRoot.Hex(), "blockHash", blockHash.Hex(), ) - e.mptForkStage = 1 - e.mptForkForceHeight = height + e.jadeForkStage = 1 + e.jadeForkForceHeight = height return true, nil } // If parent is already post-fork, we may be at the 2nd post-fork block (H2) or later. if height < 2 { // We cannot be H2; mark done to avoid future calls. - e.mptForkStage = 2 + e.jadeForkStage = 2 return false, nil } @@ -261,13 +261,13 @@ func (e *Executor) forceBatchPointForMPTFork(height uint64, blockTime uint64, st } if grandParent.Time < forkTime { // This is H2 (2nd post-fork block). - e.mptForkStage = 2 - e.mptForkForceHeight = height + e.jadeForkStage = 2 + e.jadeForkForceHeight = height return true, nil } // Beyond H2: nothing to do (can't retroactively fix). Mark done for performance. - e.mptForkStage = 2 + e.jadeForkStage = 2 return false, nil } diff --git a/node/core/executor.go b/node/core/executor.go index 52d30125d..9afe0615c 100644 --- a/node/core/executor.go +++ b/node/core/executor.go @@ -56,12 +56,12 @@ type Executor struct { rollupABI *abi.ABI batchingCache *BatchingCache - // MPT fork handling: force batch points at the 1st and 2nd block after fork. + // Jade fork handling: force batch points at the 1st and 2nd block after fork. // This state machine exists to avoid repeated HeaderByNumber calls after the fork is handled, // while keeping results stable if CalculateCapWithProposalBlock is called multiple times at the same height. - mptForkTime uint64 // cached from geth eth_config.morph.mptForkTime (0 means disabled/unknown) - mptForkStage uint8 // 0: not handled, 1: forced H1, 2: done (forced H2 or skipped beyond H2) - mptForkForceHeight uint64 // if equals current height, must return true (stability across multiple calls) + jadeForkTime uint64 // cached from geth eth_config.morph.jadeForkTime (0 means disabled/unknown) + jadeForkStage uint8 // 0: not handled, 1: forced H1, 2: done (forced H2 or skipped beyond H2) + jadeForkForceHeight uint64 // if equals current height, must return true (stability across multiple calls) logger tmlog.Logger metrics *Metrics @@ -155,7 +155,7 @@ func NewExecutor(newSyncFunc NewSyncerFunc, config *Config, tmPubKey crypto.PubK batchingCache: NewBatchingCache(), UpgradeBatchTime: config.UpgradeBatchTime, blsKeyCheckForkHeight: config.BlsKeyCheckForkHeight, - mptForkTime: l2Client.MPTForkTime(), + jadeForkTime: l2Client.JadeForkTime(), logger: logger, metrics: PrometheusMetrics("morphnode"), } diff --git a/node/go.mod b/node/go.mod index d8c7bff2e..518bb06b1 100644 --- a/node/go.mod +++ b/node/go.mod @@ -11,7 +11,7 @@ require ( github.com/hashicorp/golang-lru v1.0.2 github.com/holiman/uint256 v1.2.4 github.com/klauspost/compress v1.17.9 - github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/prometheus/client_golang v1.17.0 github.com/spf13/viper v1.13.0 github.com/stretchr/testify v1.10.0 diff --git a/node/go.sum b/node/go.sum index dda7b959d..f031c4719 100644 --- a/node/go.sum +++ b/node/go.sum @@ -361,8 +361,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.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= github.com/morph-l2/tendermint v0.3.3 h1:zsmzVJfKp+NuCr45ZUUY2ZJjnHAVLzwJLID6GxBR4i4= github.com/morph-l2/tendermint v0.3.3/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= diff --git a/node/types/blob.go b/node/types/blob.go index d4aea96fb..49ac5dc64 100644 --- a/node/types/blob.go +++ b/node/types/blob.go @@ -153,11 +153,11 @@ func DecodeTxsFromBytes(txsBytes []byte) (eth.Transactions, error) { return nil, err } innerTx = new(eth.SetCodeTx) - case eth.AltFeeTxType: + case eth.MorphTxType: if err := binary.Read(reader, binary.BigEndian, &firstByte); err != nil { return nil, err } - innerTx = new(eth.AltFeeTx) + innerTx = new(eth.MorphTx) default: if firstByte <= 0xf7 { // legacy tx first byte must be greater than 0xf7(247) return nil, fmt.Errorf("not supported tx type: %d", firstByte) diff --git a/node/types/retryable_client.go b/node/types/retryable_client.go index 899c3be12..a80fd902a 100644 --- a/node/types/retryable_client.go +++ b/node/types/retryable_client.go @@ -54,8 +54,8 @@ type forkConfig struct { // morphExtension contains Morph-specific configuration fields type morphExtension struct { - UseZktrie bool `json:"useZktrie"` - MPTForkTime *uint64 `json:"mptForkTime,omitempty"` + UseZktrie bool `json:"useZktrie"` + JadeForkTime *uint64 `json:"jadeForkTime,omitempty"` } // GethConfig holds the configuration fetched from geth via eth_config API @@ -105,28 +105,28 @@ func FetchGethConfig(rpcURL string, logger tmlog.Logger) (*GethConfig, error) { logger.Info("Fetched useZktrie from geth", "useZktrie", config.UseZktrie) } - // Try to get mptForkTime from current config - if resp.Current != nil && resp.Current.Morph != nil && resp.Current.Morph.MPTForkTime != nil { - config.SwitchTime = *resp.Current.Morph.MPTForkTime - logger.Info("Fetched MPT fork time from geth", "mptForkTime", config.SwitchTime, "source", "current") + // Try to get jadeForkTime from current config + if resp.Current != nil && resp.Current.Morph != nil && resp.Current.Morph.JadeForkTime != nil { + config.SwitchTime = *resp.Current.Morph.JadeForkTime + logger.Info("Fetched Jade fork time from geth", "jadeForkTime", config.SwitchTime, "source", "current") return config, nil } // Fallback to next config - if resp.Next != nil && resp.Next.Morph != nil && resp.Next.Morph.MPTForkTime != nil { - config.SwitchTime = *resp.Next.Morph.MPTForkTime - logger.Info("Fetched MPT fork time from geth", "mptForkTime", config.SwitchTime, "source", "next") + if resp.Next != nil && resp.Next.Morph != nil && resp.Next.Morph.JadeForkTime != nil { + config.SwitchTime = *resp.Next.Morph.JadeForkTime + logger.Info("Fetched Jade fork time from geth", "jadeForkTime", config.SwitchTime, "source", "next") return config, nil } // Fallback to last config - if resp.Last != nil && resp.Last.Morph != nil && resp.Last.Morph.MPTForkTime != nil { - config.SwitchTime = *resp.Last.Morph.MPTForkTime - logger.Info("Fetched MPT fork time from geth", "mptForkTime", config.SwitchTime, "source", "last") + if resp.Last != nil && resp.Last.Morph != nil && resp.Last.Morph.JadeForkTime != nil { + config.SwitchTime = *resp.Last.Morph.JadeForkTime + logger.Info("Fetched Jade fork time from geth", "jadeForkTime", config.SwitchTime, "source", "last") return config, nil } - logger.Info("MPT fork time not configured in geth, switch disabled") + logger.Info("Jade fork time not configured in geth, switch disabled") return config, nil } @@ -141,9 +141,9 @@ type RetryableClient struct { logger tmlog.Logger } -// MPTForkTime returns the configured MPT fork/switch timestamp fetched from geth (eth_config). +// JadeForkTime returns the configured Jade fork/switch timestamp fetched from geth (eth_config). // Note: this is a local value stored in the client; it does not perform any RPC. -func (rc *RetryableClient) MPTForkTime() uint64 { +func (rc *RetryableClient) JadeForkTime() uint64 { return rc.switchTime } diff --git a/ops/l2-genesis/go.mod b/ops/l2-genesis/go.mod index e464485c4..fde503381 100644 --- a/ops/l2-genesis/go.mod +++ b/ops/l2-genesis/go.mod @@ -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.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/stretchr/testify v1.10.0 github.com/urfave/cli v1.22.17 ) diff --git a/ops/l2-genesis/go.sum b/ops/l2-genesis/go.sum index 6907ac512..aeddc3abe 100644 --- a/ops/l2-genesis/go.sum +++ b/ops/l2-genesis/go.sum @@ -141,8 +141,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.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= 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/ops/tools/go.mod b/ops/tools/go.mod index 78ad604a6..d8d924348 100644 --- a/ops/tools/go.mod +++ b/ops/tools/go.mod @@ -5,7 +5,7 @@ go 1.24.0 replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.3 require ( - github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/tendermint/tendermint v0.35.9 ) diff --git a/ops/tools/go.sum b/ops/tools/go.sum index 6be6c6bf0..3356c66b9 100644 --- a/ops/tools/go.sum +++ b/ops/tools/go.sum @@ -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.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= github.com/morph-l2/tendermint v0.3.3 h1:zsmzVJfKp+NuCr45ZUUY2ZJjnHAVLzwJLID6GxBR4i4= github.com/morph-l2/tendermint v0.3.3/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= diff --git a/oracle/go.mod b/oracle/go.mod index d82290072..55c3f1277 100644 --- a/oracle/go.mod +++ b/oracle/go.mod @@ -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.1 - github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/prometheus/client_golang v1.17.0 github.com/stretchr/testify v1.10.0 github.com/tendermint/tendermint v0.35.9 diff --git a/oracle/go.sum b/oracle/go.sum index da0d78add..320e89d18 100644 --- a/oracle/go.sum +++ b/oracle/go.sum @@ -174,8 +174,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/externalsign v0.3.1 h1:UYFDZFB0L85A4rDvuwLNBiGEi0kSmg9AZ2v8Q5O4dQo= github.com/morph-l2/externalsign v0.3.1/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= github.com/morph-l2/tendermint v0.3.3 h1:zsmzVJfKp+NuCr45ZUUY2ZJjnHAVLzwJLID6GxBR4i4= github.com/morph-l2/tendermint v0.3.3/go.mod h1:TtCzp9l6Z6yDUiwv3TbqKqw8Q8RKp3fSz5+adO1/Y8w= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= diff --git a/token-price-oracle/go.mod b/token-price-oracle/go.mod index 02292b9e8..40fbf2f99 100644 --- a/token-price-oracle/go.mod +++ b/token-price-oracle/go.mod @@ -9,7 +9,7 @@ replace ( require ( github.com/morph-l2/externalsign v0.3.1 - github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/prometheus/client_golang v1.17.0 github.com/sirupsen/logrus v1.9.3 github.com/urfave/cli v1.22.17 diff --git a/token-price-oracle/go.sum b/token-price-oracle/go.sum index a0b161877..9227f1b5d 100644 --- a/token-price-oracle/go.sum +++ b/token-price-oracle/go.sum @@ -147,8 +147,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/externalsign v0.3.1 h1:UYFDZFB0L85A4rDvuwLNBiGEi0kSmg9AZ2v8Q5O4dQo= github.com/morph-l2/externalsign v0.3.1/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= 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 ead642c78..ce37fe8d0 100644 --- a/tx-submitter/go.mod +++ b/tx-submitter/go.mod @@ -9,7 +9,7 @@ require ( github.com/crate-crypto/go-eth-kzg v1.4.0 github.com/holiman/uint256 v1.2.4 github.com/morph-l2/externalsign v0.3.1 - github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 + github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c github.com/prometheus/client_golang v1.17.0 github.com/stretchr/testify v1.10.0 github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a diff --git a/tx-submitter/go.sum b/tx-submitter/go.sum index 725f75a79..94dbc3ca2 100644 --- a/tx-submitter/go.sum +++ b/tx-submitter/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/externalsign v0.3.1 h1:UYFDZFB0L85A4rDvuwLNBiGEi0kSmg9AZ2v8Q5O4dQo= github.com/morph-l2/externalsign v0.3.1/go.mod h1:b6NJ4GUiiG/gcSJsp3p8ExsIs4ZdphlrVALASnVoGJE= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141 h1:A8eygErKU6WKMipGWIemzwLeYkIGLd9yb/Ry3x+J9PQ= -github.com/morph-l2/go-ethereum v1.10.14-0.20260211074551-4f0f6e6bd141/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c h1:gwZ9wzdiQAfnFfYD/FM6AzXIp4AxuoddFBg+aONHRcQ= +github.com/morph-l2/go-ethereum v1.10.14-0.20260227035937-a805e930447c/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs= 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=