Combined seq contracts

synd-contracts/src/SyndicateCombinedSequencingChain.sol

@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import {SyndicateSequencingChainBase} from "./SyndicateSequencingChainBase.sol";
+
+/// @title SyndicateCombinedSequencingChain
+/// @notice Sequencing chain with an accumulator for trustless TEE module state proving
+/// @dev Extends SyndicateSequencingChainBase by maintaining a hash chain accumulator
+/// of all processed transactions. This enables the TEE module to trustlessly prove
+/// the appchain state by verifying against the on-chain accumulator.
+contract SyndicateCombinedSequencingChain is SyndicateSequencingChainBase {
+    /// @notice The accumulator for sequencing data - a hash chain of all transactions
+    bytes32[] public sequencingAccumulator;
+
+    /// @notice Constructs the SyndicateCombinedSequencingChain contract.
+    /// @param _appchainId The ID of the App chain that this contract is sequencing transactions for.
+    constructor(uint256 _appchainId) SyndicateSequencingChainBase(_appchainId) {}
+
+    /// @notice Updates the sequencingAccumulator and emits the TransactionProcessed event
+    /// @dev Overrides base implementation to add accumulator tracking before emitting event
+    /// @param transaction The encoded transaction data
+    function _transactionProcessed(bytes memory transaction) internal override {
+        uint256 count = sequencingAccumulator.length;
+        bytes32 prevAcc = count > 0 ? sequencingAccumulator[count - 1] : bytes32(0);
+        sequencingAccumulator.push(keccak256(abi.encodePacked(prevAcc, transaction)));
+        emit TransactionProcessed(msg.sender, transaction);
+    }
+}

synd-contracts/src/SyndicateSequencingChain.sol

@@ -1,160 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.28;
 
-import {SequencingModuleChecker} from "./SequencingModuleChecker.sol";
-import {GasCounter} from "./staking/GasCounter.sol";
-import {ISyndicateSequencingChain} from "./interfaces/ISyndicateSequencingChain.sol";
-
-uint8 constant L2MessageType_SignedTx = 4; // a regular signed transaction
+import {SyndicateSequencingChainBase} from "./SyndicateSequencingChainBase.sol";
 
 /// @title SyndicateSequencingChain
-/// @notice Core contract for transaction sequencing using Syndicate's "secure by module design" architecture
-///
-/// @dev ARCHITECTURAL DESIGN - tx.origin USAGE BY DESIGN:
-/// This contract intentionally uses tx.origin alongside msg.sender to enable sophisticated middleware patterns:
-///
-/// USE CASES ENABLED:
-/// • ATOMIC CROSS-CHAIN SEQUENCING: AtomicSequencer coordinating multiple chains
-/// • TRUSTED MIDDLEWARE: Third-party contracts adding logic layers
-/// • BATCH PROCESSING: Routing contracts that aggregate transactions
-/// • COMPLEX AUTHORIZATION: Modules that consider both caller and originator
-///
-/// SECURITY MODEL - "SECURE BY MODULE DESIGN":
-/// Security is NOT enforced by this contract, but by developer-implemented permission modules:
-///
-/// ┌─────────────────────────────────────────────────────────────────────────┐
-/// │ RESPONSIBILITY DISTRIBUTION:                                            │
-/// ├─────────────────────────────────────────────────────────────────────────┤
-/// │ SyndicateSequencingChain: Routes to permission modules                 │
-/// │ PermissionModule (Dev): Implements authorization logic                  │
-/// │ Module Developer: MUST validate both msg.sender and tx.origin properly │
-/// └─────────────────────────────────────────────────────────────────────────┘
-///
-/// @dev Transaction Lifecycle:
-/// 1. Transaction is submitted via processTransaction or processTransactionsBulk
-/// 2. onlyWhenAllowed modifier passes both msg.sender AND tx.origin to SequencingModuleChecker
-/// 3. SequencingModuleChecker delegates to the configured permissionRequirementModule
-/// 4. Permission module evaluates BOTH addresses using custom logic (developer responsibility)
-/// 5. If allowed, TransactionProcessed event is emitted for off-chain processing
-/// 6. External systems observe events to execute transactions on the application chain
-///
-/// This event-based design provides scalability and gas efficiency while maintaining security
-/// through modular, developer-controlled permission systems.
-contract SyndicateSequencingChain is SequencingModuleChecker, ISyndicateSequencingChain, GasCounter {
-    error NoTxData();
-    error TransactionOrSenderNotAllowed();
-    error GasTrackingAlreadyEnabled();
-    error GasTrackingAlreadyDisabled();
-
-    /// @notice Emitted when a new transaction is processed
-    /// @param sender The address that submitted the transaction
-    /// @param data The transaction data that was processed
-    event TransactionProcessed(address indexed sender, bytes data);
-
-    /// @notice Emitted when the emissions receiver is updated
-    /// @param oldReceiver The previous emissions receiver address
-    /// @param newReceiver The new emissions receiver address
-    event EmissionsReceiverUpdated(address indexed oldReceiver, address indexed newReceiver);
-
-    uint256 public immutable appchainId;
-
-    /// @notice The address that receives emissions for this sequencing chain
-    address public emissionsReceiver;
-
+/// @notice Standard sequencing chain contract that emits events for off-chain processing
+/// @dev Inherits all functionality from SyndicateSequencingChainBase.
+/// Uses the default _transactionProcessed implementation which simply emits TransactionProcessed events.
+contract SyndicateSequencingChain is SyndicateSequencingChainBase {
     /// @notice Constructs the SyndicateSequencingChain contract.
     /// @param _appchainId The ID of the App chain that this contract is sequencing transactions for.
-    //#olympix-ignore-missing-revert-reason-tests
-    constructor(uint256 _appchainId) SequencingModuleChecker() {
-        // chain id zero has no replay protection: https://eips.ethereum.org/EIPS/eip-3788
-        require(_appchainId != 0, "App chain ID cannot be 0");
-        appchainId = _appchainId;
-    }
-
-    function encodeTransaction(bytes calldata data) public pure returns (bytes memory) {
-        return abi.encodePacked(L2MessageType_SignedTx, data);
-    }
-
-    /// @notice Process a signed transaction.
-    /// @param data Transaction data
-    //#olympix-ignore-required-tx-origin
-    function processTransaction(bytes calldata data) external trackGasUsage {
-        require(data.length > 0, NoTxData());
-
-        bytes memory transaction = encodeTransaction(data);
-        require(isAllowed(msg.sender, tx.origin, transaction), TransactionOrSenderNotAllowed());
-        emit TransactionProcessed(msg.sender, transaction);
-    }
-
-    /// @notice Processes multiple signed transactions in bulk.
-    /// @param data An array of transaction data.
-    //#olympix-ignore
-    function processTransactionsBulk(bytes[] calldata data) external trackGasUsage {
-        uint256 dataCount = data.length;
-        require(dataCount > 0, NoTxData());
-
-        // Process all transactions
-        uint256 i;
-        for (i = 0; i < dataCount; i++) {
-            require(data[i].length > 0, NoTxData());
-            bytes memory transaction = encodeTransaction(data[i]);
-            bool isAllowed = isAllowed(msg.sender, tx.origin, transaction); //#olympix-ignore-any-tx-origin
-            if (isAllowed) {
-                // only emit the event if the transaction is allowed
-                emit TransactionProcessed(msg.sender, transaction);
-            }
-        }
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                         EMISSIONS RECEIVER ADMIN FUNCTIONS
-    //////////////////////////////////////////////////////////////*/
-
-    /// @notice Set the emissions receiver address
-    /// @dev Only callable by the contract owner
-    /// @param _emissionsReceiver The address to receive emissions
-    function setEmissionsReceiver(address _emissionsReceiver) external onlyOwner {
-        address oldReceiver = emissionsReceiver;
-        emissionsReceiver = _emissionsReceiver;
-        if (emissionsReceiver != address(0)) {
-            emit EmissionsReceiverUpdated(oldReceiver, _emissionsReceiver);
-        } else {
-            emit EmissionsReceiverUpdated(oldReceiver, owner());
-        }
-    }
-
-    /// @notice Get the effective emissions receiver address
-    /// @dev Returns emissionsReceiver if set, otherwise returns the contract owner
-    /// @return The address that should receive emissions
-    function getEmissionsReceiver() external view returns (address) {
-        return emissionsReceiver == address(0) ? owner() : emissionsReceiver;
-    }
-
-    /// @notice Override transferOwnership to emit EmissionsReceiverUpdated event when appropriate
-    /// @dev When emissionsReceiver is not explicitly set (address(0)), transferring ownership
-    /// effectively changes the emissions receiver, so we emit the event for transparency
-    /// @param newOwner The address of the new owner
-    function transferOwnership(address newOwner) public override onlyOwner {
-        if (emissionsReceiver == address(0)) {
-            emit EmissionsReceiverUpdated(owner(), newOwner);
-        }
-        super.transferOwnership(newOwner);
-    }
-
-    /*//////////////////////////////////////////////////////////////
-                         GAS TRACKING ADMIN FUNCTIONS
-    //////////////////////////////////////////////////////////////*/
-
-    /// @notice Disable gas tracking if needed
-    /// @dev Only callable by the contract owner
-    function disableGasTracking() external onlyOwner {
-        require(!gasTrackingDisabled, GasTrackingAlreadyDisabled());
-        gasTrackingDisabled = true;
-    }
-
-    /// @notice Enable gas tracking
-    /// @dev Only callable by the contract owner
-    function enableGasTracking() external onlyOwner {
-        require(gasTrackingDisabled, GasTrackingAlreadyEnabled());
-        gasTrackingDisabled = false;
-    }
+    constructor(uint256 _appchainId) SyndicateSequencingChainBase(_appchainId) {}
 }

synd-contracts/src/SyndicateSequencingChainBase.sol

@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.28;
+
+import {SequencingModuleChecker} from "./SequencingModuleChecker.sol";
+import {GasCounter} from "./staking/GasCounter.sol";
+import {ISyndicateSequencingChain} from "./interfaces/ISyndicateSequencingChain.sol";
+
+uint8 constant L2MessageType_SignedTx = 4; // a regular signed transaction
+
+/// @title SyndicateSequencingChainBase
+/// @notice Abstract base contract for transaction sequencing using Syndicate's "secure by module design" architecture
+///
+/// @dev ARCHITECTURAL DESIGN - tx.origin USAGE BY DESIGN:
+/// This contract intentionally uses tx.origin alongside msg.sender to enable sophisticated middleware patterns:
+///
+/// USE CASES ENABLED:
+/// * ATOMIC CROSS-CHAIN SEQUENCING: AtomicSequencer coordinating multiple chains
+/// * TRUSTED MIDDLEWARE: Third-party contracts adding logic layers
+/// * BATCH PROCESSING: Routing contracts that aggregate transactions
+/// * COMPLEX AUTHORIZATION: Modules that consider both caller and originator
+///
+/// SECURITY MODEL - "SECURE BY MODULE DESIGN":
+/// Security is NOT enforced by this contract, but by developer-implemented permission modules:
+///
+/// +-----------------------------------------------------------------------------+
+/// | RESPONSIBILITY DISTRIBUTION:                                                |
+/// +-----------------------------------------------------------------------------+
+/// | SyndicateSequencingChain: Routes to permission modules                      |
+/// | PermissionModule (Dev): Implements authorization logic                      |
+/// | Module Developer: MUST validate both msg.sender and tx.origin properly      |
+/// +-----------------------------------------------------------------------------+
+///
+/// @dev Transaction Lifecycle:
+/// 1. Transaction is submitted via processTransaction or processTransactionsBulk
+/// 2. onlyWhenAllowed modifier passes both msg.sender AND tx.origin to SequencingModuleChecker
+/// 3. SequencingModuleChecker delegates to the configured permissionRequirementModule
+/// 4. Permission module evaluates BOTH addresses using custom logic (developer responsibility)
+/// 5. If allowed, _transactionProcessed is called (can be overridden by derived contracts)
+/// 6. External systems observe events to execute transactions on the application chain
+///
+/// This event-based design provides scalability and gas efficiency while maintaining security
+/// through modular, developer-controlled permission systems.
+abstract contract SyndicateSequencingChainBase is SequencingModuleChecker, ISyndicateSequencingChain, GasCounter {
+    error NoTxData();
+    error TransactionOrSenderNotAllowed();
+    error GasTrackingAlreadyEnabled();
+    error GasTrackingAlreadyDisabled();
+
+    /// @notice Emitted when a new transaction is processed
+    /// @param sender The address that submitted the transaction
+    /// @param data The transaction data that was processed
+    event TransactionProcessed(address indexed sender, bytes data);
+
+    /// @notice Emitted when the emissions receiver is updated
+    /// @param oldReceiver The previous emissions receiver address
+    /// @param newReceiver The new emissions receiver address
+    event EmissionsReceiverUpdated(address indexed oldReceiver, address indexed newReceiver);
+
+    uint256 public immutable appchainId;
+
+    /// @notice The address that receives emissions for this sequencing chain
+    address public emissionsReceiver;
+
+    /// @notice Constructs the SyndicateSequencingChainBase contract.
+    /// @param _appchainId The ID of the App chain that this contract is sequencing transactions for.
+    //#olympix-ignore-missing-revert-reason-tests
+    constructor(uint256 _appchainId) SequencingModuleChecker() {
+        // chain id zero has no replay protection: https://eips.ethereum.org/EIPS/eip-3788
+        require(_appchainId != 0, "App chain ID cannot be 0");
+        appchainId = _appchainId;
+    }
+
+    function encodeTransaction(bytes calldata data) public pure returns (bytes memory) {
+        return abi.encodePacked(L2MessageType_SignedTx, data);
+    }
+
+    /// @notice Process a signed transaction.
+    /// @param data Transaction data
+    //#olympix-ignore-required-tx-origin
+    function processTransaction(bytes calldata data) external trackGasUsage {
+        require(data.length > 0, NoTxData());
+
+        bytes memory transaction = encodeTransaction(data);
+        require(isAllowed(msg.sender, tx.origin, transaction), TransactionOrSenderNotAllowed());
+        _transactionProcessed(transaction);
+    }
+
+    /// @notice Processes multiple signed transactions in bulk.
+    /// @param data An array of transaction data.
+    //#olympix-ignore
+    function processTransactionsBulk(bytes[] calldata data) external trackGasUsage {
+        uint256 dataCount = data.length;
+        require(dataCount > 0, NoTxData());
+
+        // Process all transactions
+        uint256 i;
+        for (i = 0; i < dataCount; i++) {
+            require(data[i].length > 0, NoTxData());
+            bytes memory transaction = encodeTransaction(data[i]);
+            bool allowed = isAllowed(msg.sender, tx.origin, transaction); //#olympix-ignore-any-tx-origin
+            if (allowed) {
+                _transactionProcessed(transaction);
+            }
+        }
+    }
+
+    /// @notice Hook called when a transaction is processed
+    /// @dev Override this in derived contracts to add custom behavior (e.g., accumulator updates)
+    /// @param transaction The encoded transaction data
+    function _transactionProcessed(bytes memory transaction) internal virtual {
+        emit TransactionProcessed(msg.sender, transaction);
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                         EMISSIONS RECEIVER ADMIN FUNCTIONS
+    //////////////////////////////////////////////////////////////*/
+
+    /// @notice Set the emissions receiver address
+    /// @dev Only callable by the contract owner
+    /// @param _emissionsReceiver The address to receive emissions
+    function setEmissionsReceiver(address _emissionsReceiver) external onlyOwner {
+        address oldReceiver = emissionsReceiver;
+        emissionsReceiver = _emissionsReceiver;
+        if (emissionsReceiver != address(0)) {
+            emit EmissionsReceiverUpdated(oldReceiver, _emissionsReceiver);
+        } else {
+            emit EmissionsReceiverUpdated(oldReceiver, owner());
+        }
+    }
+
+    /// @notice Get the effective emissions receiver address
+    /// @dev Returns emissionsReceiver if set, otherwise returns the contract owner
+    /// @return The address that should receive emissions
+    function getEmissionsReceiver() external view returns (address) {
+        return emissionsReceiver == address(0) ? owner() : emissionsReceiver;
+    }
+
+    /// @notice Override transferOwnership to emit EmissionsReceiverUpdated event when appropriate
+    /// @dev When emissionsReceiver is not explicitly set (address(0)), transferring ownership
+    /// effectively changes the emissions receiver, so we emit the event for transparency
+    /// @param newOwner The address of the new owner
+    function transferOwnership(address newOwner) public override onlyOwner {
+        if (emissionsReceiver == address(0)) {
+            emit EmissionsReceiverUpdated(owner(), newOwner);
+        }
+        super.transferOwnership(newOwner);
+    }
+
+    /*//////////////////////////////////////////////////////////////
+                         GAS TRACKING ADMIN FUNCTIONS
+    //////////////////////////////////////////////////////////////*/
+
+    /// @notice Disable gas tracking if needed
+    /// @dev Only callable by the contract owner
+    function disableGasTracking() external onlyOwner {
+        require(!gasTrackingDisabled, GasTrackingAlreadyDisabled());
+        gasTrackingDisabled = true;
+    }
+
+    /// @notice Enable gas tracking
+    /// @dev Only callable by the contract owner
+    function enableGasTracking() external onlyOwner {
+        require(gasTrackingDisabled, GasTrackingAlreadyEnabled());
+        gasTrackingDisabled = false;
+    }
+}