feat: add Jade fork check to AssembleL2BlockV2

allen.wu · claude · allen.wu · commit 280bfb9cfd1d · 2026-03-12T20:53:09.000+08:00
Add the same Jade fork safety check that V1 has, preventing block
production with wrong storage format (MPT vs zkTrie) at fork boundary.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/eth/catalyst/l2_api.go b/eth/catalyst/l2_api.go
@@ -427,6 +427,11 @@ func (api *l2ConsensusAPI) AssembleL2BlockV2(parentHash common.Hash, timestamp *
 		ts = time.Unix(int64(*timestamp), 0)
 	}
 
+	// Jade fork check: prevent building blocks with wrong storage format (MPT vs zkTrie)
+	if api.eth.BlockChain().Config().IsJadeFork(uint64(ts.Unix())) == api.eth.BlockChain().Config().Morph.UseZktrie {
+		return nil, fmt.Errorf("cannot assemble block for fork, useZKtrie: %v, please switch geth", api.eth.BlockChain().Config().Morph.UseZktrie)
+	}
+
 	newBlockResult, err := api.eth.Miner().BuildBlock(parentHash, ts, transactions)
 	if err != nil {
 		return nil, err
