WIP:ZK to MPT #827

coderabbitai · 2026-02-04T02:40:15Z

⚠️ Potential issue | 🟡 Minor

Close aNextClient when eNextClient dial fails.

Line 100 returns on error but leaves the auth client open.

🧹 Proposed fix

eNextClient, err = ethclient.Dial(config.L2Next.EthAddr) if err != nil { + aNextClient.Close() return nil, err }

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

// L2Next endpoint (optional - for upgrade switch)

var aNextClient *authclient.Client

var eNextClient *ethclient.Client

if config.L2Next != nil && config.L2Next.EngineAddr != "" && config.L2Next.EthAddr != "" {

aNextClient, err = authclient.DialContext(context.Background(), config.L2Next.EngineAddr, config.L2Next.JwtSecret)

if err != nil {

return nil, err

}

eNextClient, err = ethclient.Dial(config.L2Next.EthAddr)

if err != nil {

return nil, err

}

// L2Next endpoint (optional - for upgrade switch)

var aNextClient *authclient.Client

var eNextClient *ethclient.Client

if config.L2Next != nil && config.L2Next.EngineAddr != "" && config.L2Next.EthAddr != "" {

aNextClient, err = authclient.DialContext(context.Background(), config.L2Next.EngineAddr, config.L2Next.JwtSecret)

if err != nil {

return nil, err

}

eNextClient, err = ethclient.Dial(config.L2Next.EthAddr)

if err != nil {

aNextClient.Close()

return nil, err

}

🤖 Prompt for AI Agents

In `@node/core/executor.go` around lines 91 - 102, When dialing the L2Next clients, if authclient.DialContext succeeds (aNextClient is non-nil) but ethclient.Dial (eNextClient) fails, ensure you close the opened aNextClient before returning the error; update the block that calls authclient.DialContext and ethclient.Dial in executor.go to call aNextClient.Close() (or the appropriate Close/Disconnect method on authclient.Client) just prior to returning the error from ethclient.Dial so the auth client is not leaked.

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,4 +31,7 @@ contracts/mainnet.json @@
     .env
     # logs
-    *.log
+    *.log
+    # mpt-switch-test (local testing only)
+    ops/mpt-switch-test

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     ################## update dependencies ####################
     ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.1.0
-    ETHEREUM_TARGET_VERSION := v1.10.14-0.20251219060125-03910bc750a2
+    ETHEREUM_TARGET_VERSION := v1.10.14-0.20260113015804-82683159dfd0
     TENDERMINT_TARGET_VERSION := v0.3.2
     ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ go 1.24.0 @@
     replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.2
-    require github.com/morph-l2/go-ethereum v1.10.14-0.20251219060125-03910bc750a2
+    require github.com/morph-l2/go-ethereum v1.10.14-0.20260113015804-82683159dfd0
     require (
     	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     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.20251219060125-03910bc750a2 h1:FUv9gtnvF+1AVrkoNGYbVOesi7E+STjdfD2mcqVaEY0=
-    github.com/morph-l2/go-ethereum v1.10.14-0.20251219060125-03910bc750a2/go.mod h1:tiFPeidxjoCmLj18ne9H3KQdIGTCvRC30qlef06Fd9M=
+    github.com/morph-l2/go-ethereum v1.10.14-0.20260113015804-82683159dfd0 h1:tu77ClhPcySgkweTINJBoLkIdpKKjrDF+4JPMOBCBLk=
+    github.com/morph-l2/go-ethereum v1.10.14-0.20260113015804-82683159dfd0/go.mod h1:tiFPeidxjoCmLj18ne9H3KQdIGTCvRC30qlef06Fd9M=
     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 @@

-Original file line number
+Diff line change
@@ Expand Up @@
     require (
     	github.com/iden3/go-iden3-crypto v0.0.16
-    	github.com/morph-l2/go-ethereum v1.10.14-0.20251219060125-03910bc750a2
+    	github.com/morph-l2/go-ethereum v1.10.14-0.20260113015804-82683159dfd0
     	github.com/stretchr/testify v1.10.0
     )
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP:ZK to MPT #827

Uh oh!

Diff view

Diff view

There are no files selected for viewing

coderabbitai bot Feb 4, 2026

Uh oh!

Uh oh!

Uh oh!

-Original file line number
+Diff line change
@@ Expand Up @@
     		return false, err
     	}
+    	// MPT 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)
+    	if err != nil {
+    		return false, err
+    	}
+    	if force {
+    		e.logger.Info("MPT fork: force batch point", "height", height, "timestamp", block.Timestamp)
+    		return true, nil
+    	}
     	var exceeded bool
     	if e.isBatchUpgraded(block.Timestamp) {
     		exceeded, err = e.batchingCache.batchData.WillExceedCompressedSizeLimit(e.batchingCache.currentBlockContext, e.batchingCache.currentTxsPayload)
@@ Expand All @@
     	return exceeded, err
     }
+    // forceBatchPointForMPTFork forces batch points at the 1st and 2nd block after the MPT 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) {
+    	// If we already decided to force at this height, keep returning true without extra RPCs.
+    	if e.mptForkForceHeight == 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 {
+    		return false, nil
+    	}
+    	// Ensure we have fork time cached (0 means disabled).
+    	if e.mptForkTime == 0 {
+    		e.mptForkTime = e.l2Client.MPTForkTime()
+    	}
+    	forkTime := e.mptForkTime
+    	if forkTime == 0 || blockTime < forkTime {
+    		return false, nil
+    	}
+    	if height == 0 {
+    		return false, nil
+    	}
+    	// Check parent block time to detect the 1st post-fork block (H1).
+    	parent, err := e.l2Client.HeaderByNumber(context.Background(), big.NewInt(int64(height-1)))
+    	if err != nil {
+    		return false, err
+    	}
+    	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.
+    		e.logger.Info(
+    			"MPT_FORK_H1_GENESIS_STATE_ROOT",
+    			"height", height,
+    			"timestamp", blockTime,
+    			"forkTime", forkTime,
+    			"stateRoot", stateRoot.Hex(),
+    			"blockHash", blockHash.Hex(),
+    		)
+    		e.mptForkStage = 1
+    		e.mptForkForceHeight = 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
+    		return false, nil
+    	}
+    	grandParent, err := e.l2Client.HeaderByNumber(context.Background(), big.NewInt(int64(height-2)))
+    	if err != nil {
+    		return false, err
+    	}
+    	if grandParent.Time < forkTime {
+    		// This is H2 (2nd post-fork block).
+    		e.mptForkStage = 2
+    		e.mptForkForceHeight = height
+    		return true, nil
+    	}
+    	// Beyond H2: nothing to do (can't retroactively fix). Mark done for performance.
+    	e.mptForkStage = 2
+    	return false, nil
+    }
     func (e *Executor) AppendBlsData(height int64, batchHash []byte, data l2node.BlsData) error {
     	if len(batchHash) != 32 {
     		return fmt.Errorf("wrong batchHash length. expected: 32, actual: %d", len(batchHash))
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ var ( @@
     type Config struct {
     	L2                            *types.L2Config `json:"l2"`
+    	L2Next                        *types.L2Config `json:"l2_next,omitempty"` // optional, for geth upgrade switch
     	L2CrossDomainMessengerAddress common.Address  `json:"cross_domain_messenger_address"`
     	SequencerAddress              common.Address  `json:"sequencer_address"`
     	GovAddress                    common.Address  `json:"gov_address"`
@@ Expand All / @@ -43,6 +44,7 @@ type Config struct { @@
     func DefaultConfig() *Config {
     	return &Config{
     		L2:                            new(types.L2Config),
+    		L2Next:                        nil, // optional, only for upgrade switch
     		Logger:                        tmlog.NewTMLogger(tmlog.NewSyncWriter(os.Stdout)),
     		MaxL1MessageNumPerBlock:       100,
     		L2CrossDomainMessengerAddress: predeploys.L2CrossDomainMessengerAddr,
@@ Expand Down Expand Up / @@ -123,6 +125,16 @@ func (c *Config) SetCliContext(ctx *cli.Context) error { @@
     	c.L2.EngineAddr = l2EngineAddr
     	c.L2.JwtSecret = secret
+    	// L2Next is optional - only for upgrade switch (e.g., ZK to MPT)
+    	l2NextEthAddr := ctx.GlobalString(flags.L2NextEthAddr.Name)
+    	l2NextEngineAddr := ctx.GlobalString(flags.L2NextEngineAddr.Name)
+    	if l2NextEthAddr != "" && l2NextEngineAddr != "" {
+    		c.L2Next = &types.L2Config{
+    			EthAddr:    l2NextEthAddr,
+    			EngineAddr: l2NextEngineAddr,
+    			JwtSecret:  secret, // same secret
+    		}
+    	}
     	if ctx.GlobalIsSet(flags.MaxL1MessageNumPerBlock.Name) {
     		c.MaxL1MessageNumPerBlock = ctx.GlobalUint64(flags.MaxL1MessageNumPerBlock.Name)
     		if c.MaxL1MessageNumPerBlock == 0 {
@@ Expand Down Expand Up / @@ -158,6 +170,10 @@ func (c *Config) SetCliContext(ctx *cli.Context) error { @@
     		c.DevSequencer = ctx.GlobalBool(flags.DevSequencer.Name)
     	}
+    	if ctx.GlobalIsSet(flags.BlsKeyCheckForkHeight.Name) {
+    		c.BlsKeyCheckForkHeight = ctx.GlobalUint64(flags.BlsKeyCheckForkHeight.Name)
+    	}
     	// setup batch upgrade index and fork heights
     	switch {
     	case ctx.GlobalIsSet(flags.MainnetFlag.Name):
@@ Expand Down @@

WIP:ZK to MPT #827

Are you sure you want to change the base?

Uh oh!

WIP:ZK to MPT #827

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

coderabbitai bot Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!