WIP:ZK to MPT

.gitignore

@@ -31,4 +31,7 @@ contracts/mainnet.json
 .env
 
 # logs
-*.log
+*.log
+
+# mpt-switch-test (local testing only)
+ops/mpt-switch-test

Makefile

@@ -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

bindings/go.mod

@@ -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

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.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=

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.20251219060125-03910bc750a2
+	github.com/morph-l2/go-ethereum v1.10.14-0.20260113015804-82683159dfd0
 	github.com/stretchr/testify v1.10.0
 )
 

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.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 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=

node/core/config.go

@@ -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"`
@@ -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,
@@ -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 {

node/core/executor.go

@@ -71,6 +71,7 @@ func getNextL1MsgIndex(client *types.RetryableClient) (uint64, error) {
 func NewExecutor(newSyncFunc NewSyncerFunc, config *Config, tmPubKey crypto.PubKey) (*Executor, error) {
 	logger := config.Logger
 	logger = logger.With("module", "executor")
+	// L2 geth endpoint (required - current geth)
 	aClient, err := authclient.DialContext(context.Background(), config.L2.EngineAddr, config.L2.JwtSecret)
 	if err != nil {
 		return nil, err
@@ -80,7 +81,31 @@ func NewExecutor(newSyncFunc NewSyncerFunc, config *Config, tmPubKey crypto.PubK
 		return nil, err
 	}
 
-	l2Client := types.NewRetryableClient(aClient, eClient, config.Logger)
+	// 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
+		}
+		logger.Info("L2Next geth configured (upgrade switch enabled)", "engineAddr", config.L2Next.EngineAddr, "ethAddr", config.L2Next.EthAddr)
+	} else {
+		logger.Info("L2Next geth not configured (no upgrade switch)")
+	}
+
+	// Fetch geth config at startup
+	gethCfg, err := types.FetchGethConfig(config.L2.EthAddr, logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch geth config: %w", err)
+	}
+	logger.Info("Geth config fetched", "switchTime", gethCfg.SwitchTime, "useZktrie", gethCfg.UseZktrie)
+
+	l2Client := types.NewRetryableClient(aClient, eClient, aNextClient, eNextClient, gethCfg.SwitchTime, logger)
 	index, err := getNextL1MsgIndex(l2Client)
 	if err != nil {
 		return nil, err
@@ -283,16 +308,39 @@ func (e *Executor) DeliverBlock(txs [][]byte, metaData []byte, consensusData l2n
 	}
 
 	if wrappedBlock.Number <= height {
-		e.logger.Info("ignore it, the block was delivered", "block number", wrappedBlock.Number)
-		if e.devSequencer {
-			return nil, consensusData.ValidatorSet, nil
+		e.logger.Info("block already delivered by geth (via P2P sync)", "block_number", wrappedBlock.Number)
+		// Even if block was already delivered (e.g., synced via P2P), we still need to check
+		// if MPT switch should happen, otherwise sentry nodes won't switch to the correct geth.
+		e.l2Client.EnsureSwitched(context.Background(), wrappedBlock.Timestamp, wrappedBlock.Number)
+
+		// After switch, re-check height from the new geth client
+		// The block might exist in legacy geth but not in target geth after switch
+		newHeight, err := e.l2Client.BlockNumber(context.Background())
+		if err != nil {
+			return nil, nil, err
+		}
+		if wrappedBlock.Number > newHeight {
+			e.logger.Info("block not in target geth after switch, need to deliver",
+				"block_number", wrappedBlock.Number,
+				"old_height", height,
+				"new_height", newHeight)
+			// Update height and continue to deliver the block
+			height = newHeight
+		} else {
+			if e.devSequencer {
+				return nil, consensusData.ValidatorSet, nil
+			}
+			return e.getParamsAndValsAtHeight(int64(wrappedBlock.Number))
 		}
-		return e.getParamsAndValsAtHeight(int64(wrappedBlock.Number))
 	}
 
 	// We only accept the continuous blocks for now.
 	// It acts like full sync. Snap sync is not enabled until the Geth enables snapshot with zkTrie
 	if wrappedBlock.Number > height+1 {
+		e.logger.Error("!!! CRITICAL: Geth is behind - node BLOCKED !!!",
+			"consensus_block", wrappedBlock.Number,
+			"geth_height", height,
+			"action", "Switch to MPT-compatible geth IMMEDIATELY")
 		return nil, nil, types.ErrWrongBlockNumber
 	}
 
@@ -324,7 +372,15 @@ func (e *Executor) DeliverBlock(txs [][]byte, metaData []byte, consensusData l2n
 	}
 	err = e.l2Client.NewL2Block(context.Background(), l2Block, batchHash)
 	if err != nil {
-		e.logger.Error("failed to NewL2Block", "error", err)
+		e.logger.Error("========================================")
+		e.logger.Error("CRITICAL: Failed to deliver block to geth!")
+		e.logger.Error("========================================")
+		e.logger.Error("failed to NewL2Block",
+			"error", err,
+			"block_number", l2Block.Number,
+			"block_timestamp", l2Block.Timestamp)
+		e.logger.Error("HINT: If this occurs after MPT upgrade, your geth node may not support MPT blocks. " +
+			"Please ensure you are running an MPT-compatible geth node.")
 		return nil, nil, err
 	}
 

node/derivation/config.go

@@ -34,6 +34,7 @@ const (
 type Config struct {
 	L1                    *types.L1Config `json:"l1"`
 	L2                    *types.L2Config `json:"l2"`
+	L2Next                *types.L2Config `json:"l2_next,omitempty"` // optional, for geth upgrade switch
 	BeaconRpc             string          `json:"beacon_rpc"`
 	RollupContractAddress common.Address  `json:"rollup_contract_address"`
 	StartHeight           uint64          `json:"start_height"`
@@ -55,6 +56,7 @@ func DefaultConfig() *Config {
 		LogProgressInterval: DefaultLogProgressInterval,
 		FetchBlockRange:     DefaultFetchBlockRange,
 		L2:                  new(types.L2Config),
+		L2Next:              nil, // optional, only for upgrade switch
 	}
 }
 
@@ -135,6 +137,17 @@ func (c *Config) SetCliContext(ctx *cli.Context) error {
 	c.L2.EthAddr = l2EthAddr
 	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
+		}
+	}
 	c.MetricsServerEnable = ctx.GlobalBool(flags.MetricsServerEnable.Name)
 	c.MetricsHostname = ctx.GlobalString(flags.MetricsHostname.Name)
 	c.MetricsPort = ctx.GlobalUint64(flags.MetricsPort.Name)

node/derivation/derivation.go

@@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"math/big"
-	"os"
 	"time"
 
 	"github.com/morph-l2/go-ethereum"
@@ -64,6 +63,10 @@ type Derivation struct {
 	pollInterval        time.Duration
 	logProgressInterval time.Duration
 	stop                chan struct{}
+
+	// geth upgrade config (fetched once at startup)
+	switchTime uint64
+	useZktrie  bool
 }
 
 type DeployContractBackend interface {
@@ -78,6 +81,7 @@ func NewDerivationClient(ctx context.Context, cfg *Config, syncer *sync.Syncer,
 	if err != nil {
 		return nil, err
 	}
+	// L2 geth endpoint (required - current geth)
 	aClient, err := authclient.DialContext(context.Background(), cfg.L2.EngineAddr, cfg.L2.JwtSecret)
 	if err != nil {
 		return nil, err
@@ -86,6 +90,24 @@ func NewDerivationClient(ctx context.Context, cfg *Config, syncer *sync.Syncer,
 	if err != nil {
 		return nil, err
 	}
+
+	// L2Next endpoint (optional - for upgrade switch)
+	var aNextClient *authclient.Client
+	var eNextClient *ethclient.Client
+	if cfg.L2Next != nil && cfg.L2Next.EngineAddr != "" && cfg.L2Next.EthAddr != "" {
+		aNextClient, err = authclient.DialContext(context.Background(), cfg.L2Next.EngineAddr, cfg.L2Next.JwtSecret)
+		if err != nil {
+			return nil, err
+		}
+		eNextClient, err = ethclient.Dial(cfg.L2Next.EthAddr)
+		if err != nil {
+			return nil, err
+		}
+		logger.Info("L2Next geth configured (upgrade switch enabled)", "engineAddr", cfg.L2Next.EngineAddr, "ethAddr", cfg.L2Next.EthAddr)
+	} else {
+		logger.Info("L2Next geth not configured (no upgrade switch)")
+	}
+
 	msgPasser, err := bindings.NewL2ToL1MessagePasser(predeploys.L2ToL1MessagePasserAddr, eClient)
 	if err != nil {
 		return nil, err
@@ -116,6 +138,14 @@ func NewDerivationClient(ctx context.Context, cfg *Config, syncer *sync.Syncer,
 	}
 	baseHttp := NewBasicHTTPClient(cfg.BeaconRpc, logger)
 	l1BeaconClient := NewL1BeaconClient(baseHttp)
+
+	// Fetch geth config once at startup for root validation skip logic
+	gethCfg, err := types.FetchGethConfig(cfg.L2.EthAddr, logger)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch geth config: %w", err)
+	}
+	logger.Info("Geth config fetched", "switchTime", gethCfg.SwitchTime, "useZktrie", gethCfg.UseZktrie)
+
 	return &Derivation{
 		ctx:                   ctx,
 		db:                    db,
@@ -129,7 +159,7 @@ func NewDerivationClient(ctx context.Context, cfg *Config, syncer *sync.Syncer,
 		logger:                logger,
 		RollupContractAddress: cfg.RollupContractAddress,
 		confirmations:         cfg.L1.Confirmations,
-		l2Client:              types.NewRetryableClient(aClient, eClient, tmlog.NewTMLogger(tmlog.NewSyncWriter(os.Stdout))),
+		l2Client:              types.NewRetryableClient(aClient, eClient, aNextClient, eNextClient, gethCfg.SwitchTime, logger),
 		cancel:                cancel,
 		stop:                  make(chan struct{}),
 		startHeight:           cfg.StartHeight,
@@ -140,6 +170,8 @@ func NewDerivationClient(ctx context.Context, cfg *Config, syncer *sync.Syncer,
 		metrics:               metrics,
 		l1BeaconClient:        l1BeaconClient,
 		L2ToL1MessagePasser:   msgPasser,
+		switchTime:            gethCfg.SwitchTime,
+		useZktrie:             gethCfg.UseZktrie,
 	}, nil
 }
 
@@ -246,25 +278,47 @@ func (d *Derivation) derivationBlock(ctx context.Context) {
 			d.logger.Error("get withdrawal root failed", "error", err)
 			return
 		}
-		if !bytes.Equal(lastHeader.Root.Bytes(), batchInfo.root.Bytes()) || !bytes.Equal(withdrawalRoot[:], batchInfo.withdrawalRoot.Bytes()) {
-			d.metrics.SetBatchStatus(stateException)
-			// TODO The challenge switch is currently on and will be turned on in the future
-			if d.validator != nil && d.validator.ChallengeEnable() {
-				if err := d.validator.ChallengeState(batchInfo.batchIndex); err != nil {
-					d.logger.Error("challenge state failed")
-					return
+
+		rootMismatch := !bytes.Equal(lastHeader.Root.Bytes(), batchInfo.root.Bytes())
+		withdrawalMismatch := !bytes.Equal(withdrawalRoot[:], batchInfo.withdrawalRoot.Bytes())
+
+		if rootMismatch || withdrawalMismatch {
+			// Check if should skip validation during upgrade transition
+			// Skip if: (before switch && MPT geth) or (after switch && ZK geth)
+			skipValidation := false
+			if d.switchTime > 0 {
+				beforeSwitch := lastHeader.Time < d.switchTime
+				if (beforeSwitch && !d.useZktrie) || (!beforeSwitch && d.useZktrie) {
+					skipValidation = true
+					d.logger.Error("Root validation skipped during upgrade transition",
+						"originStateRootHash", batchInfo.root,
+						"deriveStateRootHash", lastHeader.Root.Hex(),
+						"blockTimestamp", lastHeader.Time,
+						"switchTime", d.switchTime,
+						"useZktrie", d.useZktrie,
+					)
 				}
 			}
-			d.logger.Info("root hash or withdrawal hash is not equal",
-				"originStateRootHash", batchInfo.root,
-				"deriveStateRootHash", lastHeader.Root.Hex(),
-				"batchWithdrawalRoot", batchInfo.withdrawalRoot.Hex(),
-				"deriveWithdrawalRoot", common.BytesToHash(withdrawalRoot[:]).Hex(),
-			)
-			return
-		} else {
-			d.metrics.SetBatchStatus(stateNormal)
+
+			if !skipValidation {
+				d.metrics.SetBatchStatus(stateException)
+				// TODO The challenge switch is currently on and will be turned on in the future
+				if d.validator != nil && d.validator.ChallengeEnable() {
+					if err := d.validator.ChallengeState(batchInfo.batchIndex); err != nil {
+						d.logger.Error("challenge state failed")
+						return
+					}
+				}
+				d.logger.Info("root hash or withdrawal hash is not equal",
+					"originStateRootHash", batchInfo.root,
+					"deriveStateRootHash", lastHeader.Root.Hex(),
+					"batchWithdrawalRoot", batchInfo.withdrawalRoot.Hex(),
+					"deriveWithdrawalRoot", common.BytesToHash(withdrawalRoot[:]).Hex(),
+				)
+				return
+			}
 		}
+		d.metrics.SetBatchStatus(stateNormal)
 		d.metrics.SetL1SyncHeight(lg.BlockNumber)
 	}