feat: optimistic roots smart contracts

packages/deployments/contracts/contracts/messaging/connectors/SpokeConnector.sol

@@ -54,6 +54,8 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
 
   event DelayBlocksUpdated(uint256 indexed updated, address caller);
 
+  event SnapshotRootSaved(uint256 snapshotId, bytes32 root, uint256 count);
+
   /**
    * @notice Emitted when funds are withdrawn by the admin
    * @dev See comments in `withdrawFunds`
@@ -90,6 +92,11 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
 
   // ============ Public Storage ============
 
+  /**
+   * @notice Duration of the snapshot
+   */
+  uint256 public constant SNAPSHOT_DURATION = 30 minutes;
+
   /**
    * @notice Number of blocks to delay the processing of a message to allow for watchers to verify
    * the validity and pause if necessary.
@@ -161,6 +168,11 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
    */
   mapping(bytes32 => MessageStatus) public messages;
 
+  /**
+   * @notice Mapping of the snapshot roots for a specific index. Used for data availability for off-chain scripts
+   */
+  mapping(uint256 => bytes32) public snapshotRoots;
+
   // ============ Modifiers ============
 
   modifier onlyAllowlistedSender() {
@@ -323,6 +335,9 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
    * @dev The root of this tree will eventually be dispatched to mainnet via `send`. On mainnet (the "hub"),
    * it will be combined into a single aggregate root by RootManager (along with outbound roots from other
    * chains). This aggregate root will be redistributed to all destination chains.
+   * @dev This function is also in charge of saving the snapshot root when needed. If the message being added to the
+   * tree is the first of the current period this means the last snapshot finished and its root must be saved. The saving
+   * happens before adding the new message to the tree.
    *
    * NOTE: okay to leave dispatch operational when paused as pause is designed for crosschain interactions
    */
@@ -331,6 +346,15 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
     bytes32 _recipientAddress,
     bytes memory _messageBody
   ) external onlyAllowlistedSender returns (bytes32, bytes memory) {
+    // Before inserting the new message to the tree we need to check if the last snapshot root must be calculated and set.
+    uint256 _lastCompletedSnapshotId = _getLastCompletedSnapshotId();
+    if (snapshotRoots[_lastCompletedSnapshotId] == 0) {
+      // Saves current tree root as last snapshot root before adding the new message.
+      bytes32 _currentRoot = MERKLE.root();
+      snapshotRoots[_lastCompletedSnapshotId] = _currentRoot;
+      emit SnapshotRootSaved(_lastCompletedSnapshotId, _currentRoot, MERKLE.count());
+    }
+
     // Get the next nonce for the destination domain, then increment it.
     uint32 _nonce = nonces[_destinationDomain]++;
 
@@ -432,6 +456,15 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
     }
   }
 
+  /**
+   * @notice This function gets the last completed snapshot id
+   * @dev The value is calculated through an internal function to reuse code and save gas
+   * @return _lastCompletedSnapshotId The last completed snapshot id
+   */
+  function getLastCompletedSnapshotId() external view returns (uint256 _lastCompletedSnapshotId) {
+    _lastCompletedSnapshotId = _getLastCompletedSnapshotId();
+  }
+
   // ============ Private Functions ============
 
   /**
@@ -591,4 +624,14 @@ abstract contract SpokeConnector is Connector, ConnectorManager, WatcherClient,
     // emit process results
     emit Process(_messageHash, _success, _returnData);
   }
+
+  /**
+   * @notice This function calculates the last completed snapshot id
+   * @return _lastCompletedSnapshotId The last completed snapshot id
+   */
+  function _getLastCompletedSnapshotId() internal view returns (uint256 _lastCompletedSnapshotId) {
+    unchecked {
+      _lastCompletedSnapshotId = block.timestamp / SNAPSHOT_DURATION;
+    }
+  }
 }

packages/deployments/contracts/contracts_forge/messaging/PingPong.t.sol

@@ -157,10 +157,18 @@ contract PingPong is ConnectorHelper {
 
     MockSpokeConnector(payable(_destinationConnectors.spoke)).setUpdatesAggregate(true);
 
+    // enroll this as approved watcher to activate slowmode
+    WatcherManager(_watcherManager).addWatcher(address(this));
+    // check setup
+    assertTrue(WatcherManager(_watcherManager).isWatcher(address(this)));
+
     // configure root manager with connectors
     RootManager(_rootManager).addConnector(_originDomain, _originConnectors.hub);
     RootManager(_rootManager).addConnector(_destinationDomain, _destinationConnectors.hub);
+    // set root manager to slow mode
+    RootManager(_rootManager).activateSlowMode();
     // check setup
+    assertFalse(RootManager(_rootManager).optimisticMode());
     assertEq(RootManager(_rootManager).connectors(0), _originConnectors.hub);
     assertEq(RootManager(_rootManager).connectors(1), _destinationConnectors.hub);
     assertEq(RootManager(_rootManager).domains(0), _originDomain);
@@ -317,11 +325,7 @@ contract PingPong is ConnectorHelper {
   }
 
   // Process a given aggregateRoot on a given spoke.
-  function utils_processAggregateRootAndAssert(
-    address connector,
-    address amb,
-    bytes32 aggregateRoot
-  ) public {
+  function utils_processAggregateRootAndAssert(address connector, address amb, bytes32 aggregateRoot) public {
     // Expect MessageProcessed on the target spoke.
     vm.expectEmit(true, true, true, true);
     emit MessageProcessed(abi.encode(aggregateRoot), amb);