Feat: Sequencer Final PR

Makefile

@@ -1,7 +1,7 @@
 ################## update dependencies ####################
-ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.2.3
-ETHEREUM_TARGET_VERSION := morph-v2.2.3
-TENDERMINT_TARGET_VERSION := v0.3.7
+ETHEREUM_SUBMODULE_COMMIT_OR_TAG := 56deb7072ae467a12a850815c7a5c09b7c2782ba
+ETHEREUM_TARGET_VERSION := v0.0.0-20260508105911-56deb7072ae4
+TENDERMINT_TARGET_VERSION := v0.0.0-20260515043308-c6f7e21e4b14
 
 
 ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum

bindings/go.mod

@@ -2,9 +2,11 @@ module morph-l2/bindings
 
 go 1.24.0
 
-replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.7
+replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.0.0-20260529095305-b1b3a3a1d806
 
-require github.com/morph-l2/go-ethereum v1.10.14-0.20260526091422-01e8a4291b88
+replace github.com/morph-l2/go-ethereum => github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748
+
+require github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect

bindings/go.sum

@@ -109,8 +109,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.20260526091422-01e8a4291b88 h1:SSJRj6BFZ9uJm29WuVonClXeUE+lPD43i19J0uTuAFw=
-github.com/morph-l2/go-ethereum v1.10.14-0.20260526091422-01e8a4291b88/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs=
+github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748 h1:xxYv3ZbhCsdtgwC81wU3eRm0xNrc2oTx7PGYLPY92xU=
+github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748/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=

common/batch/batch_cache.go

@@ -521,7 +521,7 @@ func (bc *BatchCache) CalculateCapWithProposalBlock(blockNumber uint64, withdraw
 	}
 
 	// Parse transactions, distinguish L1 and L2 transactions
-	txsPayload, l1TxHashes, newTotalL1MessagePopped, l2TxNum, err := parsingTxs(block.Transactions(), bc.totalL1MessagePopped)
+	txsPayload, l1TxHashes, newTotalL1MessagePopped, l2TxNum, err := ParsingTxs(block.Transactions(), bc.totalL1MessagePopped)
 	if err != nil {
 		return false, fmt.Errorf("failed to parse transactions: %w", err)
 	}
@@ -530,7 +530,7 @@ func (bc *BatchCache) CalculateCapWithProposalBlock(blockNumber uint64, withdraw
 	txsNum := l2TxNum + l1TxNum
 
 	// Build BlockContext (60 bytes)
-	blockContext := buildBlockContext(header, txsNum, l1TxNum)
+	blockContext := BuildBlockContext(header, txsNum, l1TxNum)
 
 	// Store to current, do not immediately append to batch
 	bc.currentBlockContext = blockContext
@@ -934,8 +934,14 @@ func (bc *BatchCache) createBatchHeader(dataHash common.Hash, sidecar *ethtypes.
 	return batchHeaderV0.Bytes()
 }
 
-// parsingTxs parses transactions, distinguishes L1 and L2 transactions
-func parsingTxs(transactions []*ethtypes.Transaction, totalL1MessagePoppedBefore uint64) (
+// ParsingTxs encodes a block's transactions into the on-chain payload format
+// used by the batch builder: L2 transactions are RLP-marshalled and concatenated
+// in order; L1 message transactions are excluded from the payload but their
+// hashes and queue indices are tracked separately.
+//
+// Exported for derivation local verify (SPEC-005), which must rebuild blob bytes from
+// local L2 blocks using the same encoding the sequencer applied at seal time.
+func ParsingTxs(transactions []*ethtypes.Transaction, totalL1MessagePoppedBefore uint64) (
 	txsPayload []byte,
 	l1TxHashes []common.Hash,
 	totalL1MessagePopped uint64,
@@ -1010,9 +1016,12 @@ func (bc *BatchCache) sealEffectiveBlobCount(blockTimestamp uint64, replayCommit
 	return replayProtocolMaxBlobs
 }
 
-// buildBlockContext builds BlockContext from block header (60 bytes)
+// BuildBlockContext serialises a block header + tx counts into the 60-byte
+// BlockContext blob the batch builder writes for each block.
 // Format: Number(8) || Timestamp(8) || BaseFee(32) || GasLimit(8) || numTxs(2) || numL1Messages(2)
-func buildBlockContext(header *ethtypes.Header, txsNum, l1MsgNum int) []byte {
+//
+// Exported for derivation local verify (SPEC-005); see ParsingTxs.
+func BuildBlockContext(header *ethtypes.Header, txsNum, l1MsgNum int) []byte {
 	blsBytes := make([]byte, 60)
 
 	// Number (8 bytes)

common/go.mod

@@ -2,11 +2,11 @@ module morph-l2/common
 
 go 1.24.0
 
-replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.7
+replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.0.0-20260529095305-b1b3a3a1d806
 
 require (
 	github.com/holiman/uint256 v1.2.4
-	github.com/morph-l2/go-ethereum v1.10.14-0.20260506071313-045be0fdc7ca
+	github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748
 	github.com/stretchr/testify v1.10.0
 	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a
 )
@@ -25,8 +25,8 @@ require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/edsrzf/mmap-go v1.1.0 // indirect
 	github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
-	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
+	github.com/go-logfmt/logfmt v0.4.0 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect

common/go.sum

@@ -51,8 +51,6 @@ github.com/edsrzf/mmap-go v1.1.0 h1:6EUwBLQ/Mcr1EYLE4Tn1VdW1A4ckqCQWZBw8Hr0kjpQ=
 github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q=
 github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=
 github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
-github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
-github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
@@ -148,8 +146,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.20260506071313-045be0fdc7ca h1:ogHsgxvm1wzyNKYDSAsIi0PJZeu9VhQECSL91X/KTWI=
-github.com/morph-l2/go-ethereum v1.10.14-0.20260506071313-045be0fdc7ca/go.mod h1:nkVzHjQWCOjvukQW8ittlwX+Xz9gmVHrP7mUi7zoHTs=
+github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748 h1:xxYv3ZbhCsdtgwC81wU3eRm0xNrc2oTx7PGYLPY92xU=
+github.com/morph-l2/go-ethereum v0.0.0-20260529141627-eb5fbf8f9748/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=

contracts/contracts/l1/L1Sequencer.sol

@@ -4,55 +4,134 @@ pragma solidity =0.8.24;
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /// @title L1Sequencer
-/// @notice L1 contract for managing the sequencer address.
-///         The sequencer address can be updated by the owner (multisig recommended).
+/// @notice L1 contract for managing sequencer address with history tracking.
+///         Supports querying which sequencer was active at any given L2 block height.
 contract L1Sequencer is OwnableUpgradeable {
+    // ============ Types ============
+
+    struct HistoryRecord {
+        uint64 startL2Block;
+        address sequencerAddr;
+    }
+
     // ============ Storage ============
 
-    /// @notice Current sequencer address
-    address public sequencer;
+    /// @notice Ordered array of sequencer records (by startL2Block ascending).
+    ///         sequencerHistory[0] is the first sequencer after PBFT → single-sequencer upgrade.
+    HistoryRecord[] public sequencerHistory;
+
+    /// @notice The L2 block height at which single-sequencer mode activates.
+    ///         Set by initializeHistory(). Nodes read this to know when to switch consensus.
+    uint64 public activeHeight;
 
     // ============ Events ============
 
-    /// @notice Emitted when sequencer is updated
-    event SequencerUpdated(address indexed oldSequencer, address indexed newSequencer);
+    event SequencerUpdated(
+        address indexed oldSequencer,
+        address indexed newSequencer,
+        uint64 startL2Block
+    );
 
     // ============ Initializer ============
 
     /// @notice Initialize the contract
     /// @param _owner Contract owner (multisig recommended)
-    /// @param _initialSequencer Initial sequencer address (can be address(0) to set later)
-    function initialize(address _owner, address _initialSequencer) external initializer {
+    function initialize(address _owner) external initializer {
         require(_owner != address(0), "invalid owner");
-
         __Ownable_init();
         _transferOwnership(_owner);
-
-        // Set initial sequencer if provided
-        if (_initialSequencer != address(0)) {
-            sequencer = _initialSequencer;
-            emit SequencerUpdated(address(0), _initialSequencer);
-        }
     }
 
     // ============ Admin Functions ============
 
-    /// @notice Update sequencer address (takes effect immediately)
-    /// @param newSequencer New sequencer address
-    function updateSequencer(address newSequencer) external onlyOwner {
-        require(newSequencer != address(0), "invalid sequencer");
-        require(newSequencer != sequencer, "same sequencer");
+    /// @notice Initialize sequencer history (called once before the L2 upgrade).
+    /// @param firstSequencer  The first sequencer address after the upgrade.
+    /// @param upgradeL2Block  The L2 block height where single-sequencer mode activates.
+    function initializeHistory(
+        address firstSequencer,
+        uint64 upgradeL2Block
+    ) external onlyOwner {
+        require(sequencerHistory.length == 0, "already initialized");
+        require(firstSequencer != address(0), "invalid address");
+
+        sequencerHistory.push(HistoryRecord({
+            startL2Block: upgradeL2Block,
+            sequencerAddr: firstSequencer
+        }));
+        activeHeight = upgradeL2Block;
+
+        emit SequencerUpdated(address(0), firstSequencer, upgradeL2Block);
+    }
+
+    /// @notice Register a sequencer change at a future L2 block height.
+    ///         The new sequencer is NOT active until startL2Block is reached.
+    /// @param newSequencer   New sequencer address.
+    /// @param startL2Block   L2 block height when the new sequencer takes over.
+    ///                       Must be strictly greater than the last record.
+    function updateSequencer(
+        address newSequencer,
+        uint64 startL2Block
+    ) external onlyOwner {
+        require(newSequencer != address(0), "invalid address");
+        require(sequencerHistory.length > 0, "not initialized");
+        require(
+            startL2Block > sequencerHistory[sequencerHistory.length - 1].startL2Block,
+            "startL2Block must be greater than last record"
+        );
 
-        address oldSequencer = sequencer;
-        sequencer = newSequencer;
+        address oldSequencer = sequencerHistory[sequencerHistory.length - 1].sequencerAddr;
 
-        emit SequencerUpdated(oldSequencer, newSequencer);
+        sequencerHistory.push(HistoryRecord({
+            startL2Block: startL2Block,
+            sequencerAddr: newSequencer
+        }));
+
+        emit SequencerUpdated(oldSequencer, newSequencer, startL2Block);
     }
 
     // ============ View Functions ============
 
-    /// @notice Get current sequencer address
+    /// @notice Get the sequencer that was active at a given L2 block height.
+    /// @dev    Binary search: O(log n).
+    function getSequencerAt(uint64 l2Height) external view returns (address) {
+        uint256 len = sequencerHistory.length;
+        require(len > 0, "no sequencer configured");
+
+        uint256 low = 0;
+        uint256 high = len - 1;
+        uint256 result = 0;
+
+        while (low <= high) {
+            uint256 mid = (low + high) / 2;
+            if (sequencerHistory[mid].startL2Block <= l2Height) {
+                result = mid;
+                if (mid == high) break;
+                low = mid + 1;
+            } else {
+                if (mid == 0) break;
+                high = mid - 1;
+            }
+        }
+
+        require(sequencerHistory[result].startL2Block <= l2Height, "no sequencer at height");
+        return sequencerHistory[result].sequencerAddr;
+    }
+
+    /// @notice Get the latest registered sequencer address (backward compat).
+    /// @dev    If the latest record's startL2Block hasn't been reached yet,
+    ///         this address is scheduled but not yet active.
     function getSequencer() external view returns (address) {
-        return sequencer;
+        require(sequencerHistory.length > 0, "no sequencer configured");
+        return sequencerHistory[sequencerHistory.length - 1].sequencerAddr;
+    }
+
+    /// @notice Get the full sequencer history (for L2 node bulk sync at startup).
+    function getSequencerHistory() external view returns (HistoryRecord[] memory) {
+        return sequencerHistory;
+    }
+
+    /// @notice Get the number of sequencer history records.
+    function getSequencerHistoryLength() external view returns (uint256) {
+        return sequencerHistory.length;
     }
 }