chore(gateway-contracts): use timestamp instead of block number

Author: melanciani

gateway-contracts/contracts/CoprocessorContexts.sol

@@ -7,7 +7,7 @@ import { ECDSA } from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import "./shared/Pausable.sol";
 import { ContextLifecycle } from "./libraries/ContextLifecycle.sol";
-import { CoprocessorContext, CoprocessorContextBlockPeriods } from "./shared/Structs.sol";
+import { CoprocessorContext, CoprocessorContextTimePeriods } from "./shared/Structs.sol";
 import { ContextStatus } from "./shared/Enums.sol";
 import { UUPSUpgradeableEmptyProxy } from "./shared/UUPSUpgradeableEmptyProxy.sol";
 
@@ -49,12 +49,12 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
         mapping(uint256 contextId => mapping(address coprocessorSignerAddress => bool isCoprocessorSigner)) isCoprocessorSigner;
         /// @notice The coprocessors' signer address list per context
         mapping(uint256 contextId => address[] coprocessorSignerAddresses) coprocessorSignerAddresses;
-        /// @notice The block number at which the coprocessor context is activated
-        mapping(uint256 contextId => uint256 activationBlockNumber) coprocessorContextActivationBlockNumber;
-        /// @notice The block number at which the coprocessor context is deactivated
-        mapping(uint256 contextId => uint256 deactivatedBlockNumber) coprocessorContextDeactivatedBlockNumber;
-        /// @notice The suspended block period for the coprocessor context
-        mapping(uint256 contextId => uint256 suspendedBlockPeriod) coprocessorContextSuspendedBlockPeriod;
+        /// @notice The block timestamp at which the coprocessor context is activated
+        mapping(uint256 contextId => uint256 activationBlockTimestamp) coprocessorContextActivationBlockTimestamp;
+        /// @notice The block timestamp at which the coprocessor context is deactivated
+        mapping(uint256 contextId => uint256 deactivatedBlockTimestamp) coprocessorContextDeactivatedBlockTimestamp;
+        /// @notice The suspended time period for the coprocessor context
+        mapping(uint256 contextId => uint256 suspendedTimePeriod) coprocessorContextSuspendedTimePeriod;
     }
 
     // Storage location has been computed using the following command:
@@ -185,7 +185,7 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
     function addCoprocessorContext(
         uint256 featureSet,
         Coprocessor[] calldata coprocessors,
-        CoprocessorContextBlockPeriods calldata blockPeriods
+        CoprocessorContextTimePeriods calldata timePeriods
     ) external virtual onlyOwner {
         CoprocessorContextsStorage storage $ = _getCoprocessorContextsStorage();
         // This will revert if there is no active coprocessor context. Although this should never
@@ -204,7 +204,7 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
         );
 
         // Emit the event that indicates that a valid coprocessor context has been suggested to be added.
-        emit NewCoprocessorContext(activeCoprocessorContext, newCoprocessorContext, blockPeriods);
+        emit NewCoprocessorContext(activeCoprocessorContext, newCoprocessorContext, timePeriods);
 
         // Set the coprocessor context to the generating state
         // This currently has no implications on the coprocessor contexts, except that it will check
@@ -217,18 +217,17 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
         // Directly pre-activate the coprocessor context
         ContextLifecycle.setPreActivation($.coprocessorContextLifecycle, newCoprocessorContext.contextId);
 
-        // Define the activation block number for the new coprocessor context
-        uint256 activationBlockNumber = block.number + blockPeriods.preActivationBlockPeriod;
-        $.coprocessorContextActivationBlockNumber[newCoprocessorContext.contextId] = activationBlockNumber;
+        // Define the activation block timestamp for the new coprocessor context
+        uint256 activationBlockTimestamp = block.timestamp + timePeriods.preActivationTimePeriod;
+        $.coprocessorContextActivationBlockTimestamp[newCoprocessorContext.contextId] = activationBlockTimestamp;
 
-        // Store the suspended block period for the previous coprocessor context
+        // Store the suspended time period for the previous coprocessor context
         // This value will be considered once the new coprocessor context is activated and the old one
         // is suspended
-        $.coprocessorContextSuspendedBlockPeriod[activeCoprocessorContext.contextId] = blockPeriods
-            .suspendedBlockPeriod;
+        $.coprocessorContextSuspendedTimePeriod[activeCoprocessorContext.contextId] = timePeriods.suspendedTimePeriod;
 
         // Emit the event that indicates that the new coprocessor context has been pre-activated
-        emit PreActivateCoprocessorContext(newCoprocessorContext, activationBlockNumber);
+        emit PreActivateCoprocessorContext(newCoprocessorContext, activationBlockTimestamp);
     }
 
     /**
@@ -242,17 +241,18 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
         uint256 preActivationContextId = $.coprocessorContextLifecycle.preActivationContextId;
         if (
             preActivationContextId != 0 &&
-            block.number >= $.coprocessorContextActivationBlockNumber[preActivationContextId]
+            block.timestamp >= $.coprocessorContextActivationBlockTimestamp[preActivationContextId]
         ) {
             uint256 activeContextId = getActiveCoprocessorContextId();
 
-            // Define the deactivation block number for the current active coprocessor context
-            uint256 deactivatedBlockNumber = block.number + $.coprocessorContextSuspendedBlockPeriod[activeContextId];
-            $.coprocessorContextDeactivatedBlockNumber[activeContextId] = deactivatedBlockNumber;
+            // Define the deactivation block timestamp for the current active coprocessor context
+            uint256 deactivatedBlockTimestamp = block.timestamp +
+                $.coprocessorContextSuspendedTimePeriod[activeContextId];
+            $.coprocessorContextDeactivatedBlockTimestamp[activeContextId] = deactivatedBlockTimestamp;
 
             // Set the current active coprocessor context to the suspended state
             ContextLifecycle.setSuspended($.coprocessorContextLifecycle, activeContextId);
-            emit SuspendCoprocessorContext(activeContextId, deactivatedBlockNumber);
+            emit SuspendCoprocessorContext(activeContextId, deactivatedBlockTimestamp);
 
             // Set the new active coprocessor context
             ContextLifecycle.setActive($.coprocessorContextLifecycle, preActivationContextId);
@@ -261,7 +261,10 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
 
         // Check if there is a suspended coprocessor context and if it is time to deactivate it
         uint256 suspendedContextId = _getSuspendedCoprocessorContextId();
-        if (suspendedContextId != 0 && block.number >= $.coprocessorContextDeactivatedBlockNumber[suspendedContextId]) {
+        if (
+            suspendedContextId != 0 &&
+            block.timestamp >= $.coprocessorContextDeactivatedBlockTimestamp[suspendedContextId]
+        ) {
             ContextLifecycle.setDeactivated($.coprocessorContextLifecycle, suspendedContextId);
             emit DeactivateCoprocessorContext(suspendedContextId);
         }
@@ -354,23 +357,23 @@ contract CoprocessorContexts is ICoprocessorContexts, Ownable2StepUpgradeable, U
     }
 
     /**
-     * @dev See {ICoprocessorContexts-getCoprocessorContextActivationBlockNumber}.
+     * @dev See {ICoprocessorContexts-getCoprocessorContextActivationBlockTimestamp}.
      */
-    function getCoprocessorContextActivationBlockNumber(
+    function getCoprocessorContextActivationBlockTimestamp(
         uint256 contextId
     ) external view virtual ensureContextInitialized(contextId) returns (uint256) {
         CoprocessorContextsStorage storage $ = _getCoprocessorContextsStorage();
-        return $.coprocessorContextActivationBlockNumber[contextId];
+        return $.coprocessorContextActivationBlockTimestamp[contextId];
     }
 
     /**
-     * @dev See {ICoprocessorContexts-getCoprocessorContextDeactivatedBlockNumber}.
+     * @dev See {ICoprocessorContexts-getCoprocessorContextDeactivatedBlockTimestamp}.
      */
-    function getCoprocessorContextDeactivatedBlockNumber(
+    function getCoprocessorContextDeactivatedBlockTimestamp(
         uint256 contextId
     ) external view virtual ensureContextInitialized(contextId) returns (uint256) {
         CoprocessorContextsStorage storage $ = _getCoprocessorContextsStorage();
-        return $.coprocessorContextDeactivatedBlockNumber[contextId];
+        return $.coprocessorContextDeactivatedBlockTimestamp[contextId];
     }
 
     /**

gateway-contracts/contracts/interfaces/ICoprocessorContexts.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BSD-3-Clause-Clear
 pragma solidity ^0.8.24;
 
-import { Coprocessor, CoprocessorContextBlockPeriods, CoprocessorContext } from "../shared/Structs.sol";
+import { Coprocessor, CoprocessorContextTimePeriods, CoprocessorContext } from "../shared/Structs.sol";
 import { ContextStatus } from "../shared/Enums.sol";
 
 /**
@@ -27,27 +27,27 @@ interface ICoprocessorContexts {
      * track coprocessor context updates.
      * @param activeCoprocessorContext The current active coprocessor context.
      * @param newCoprocessorContext The new coprocessor context.
-     * @param blockPeriods The block periods for the new coprocessor context.
+     * @param timePeriods The time periods for the new coprocessor context.
      */
     event NewCoprocessorContext(
         CoprocessorContext activeCoprocessorContext,
         CoprocessorContext newCoprocessorContext,
-        CoprocessorContextBlockPeriods blockPeriods
+        CoprocessorContextTimePeriods timePeriods
     );
 
     /**
      * @notice Emitted when a new coprocessor context gets pre-activated.
      * @param newCoprocessorContext The new coprocessor context.
-     * @param activationBlockNumber The block number at which the coprocessor context will be activated.
+     * @param activationBlockTimestamp The block timestamp at which the coprocessor context will be activated.
      */
-    event PreActivateCoprocessorContext(CoprocessorContext newCoprocessorContext, uint256 activationBlockNumber);
+    event PreActivateCoprocessorContext(CoprocessorContext newCoprocessorContext, uint256 activationBlockTimestamp);
 
     /**
      * @notice Emitted when a coprocessor context gets suspended.
      * @param contextId The ID of the coprocessor context.
-     * @param deactivatedBlockNumber The block number at which the coprocessor context will be deactivated.
+     * @param deactivatedBlockTimestamp The block timestamp at which the coprocessor context will be deactivated.
      */
-    event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockNumber);
+    event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockTimestamp);
 
     /**
      * @notice Emitted when a coprocessor context gets activated.
@@ -191,12 +191,12 @@ interface ICoprocessorContexts {
      * @notice Add a new coprocessor context.
      * @param featureSet The feature set.
      * @param coprocessors The set of coprocessors representing the coprocessor context.
-     * @param blockPeriods The block periods.
+     * @param timePeriods The time periods.
      */
     function addCoprocessorContext(
         uint256 featureSet,
         Coprocessor[] calldata coprocessors,
-        CoprocessorContextBlockPeriods calldata blockPeriods
+        CoprocessorContextTimePeriods calldata timePeriods
     ) external;
 
     /**
@@ -249,18 +249,18 @@ interface ICoprocessorContexts {
     function isCoprocessorContextActiveOrSuspended(uint256 contextId) external view returns (bool);
 
     /**
-     * @notice Get the block number at which the coprocessor context is activated.
+     * @notice Get the block timestamp at which the coprocessor context is activated.
      * @param contextId The coprocessor context ID.
-     * @return The activation block number.
+     * @return The activation block timestamp.
      */
-    function getCoprocessorContextActivationBlockNumber(uint256 contextId) external view returns (uint256);
+    function getCoprocessorContextActivationBlockTimestamp(uint256 contextId) external view returns (uint256);
 
     /**
-     * @notice Get the block number at which the coprocessor context is deactivated.
+     * @notice Get the block timestamp at which the coprocessor context is deactivated.
      * @param contextId The coprocessor context ID.
-     * @return The deactivation block number.
+     * @return The deactivation block timestamp.
      */
-    function getCoprocessorContextDeactivatedBlockNumber(uint256 contextId) external view returns (uint256);
+    function getCoprocessorContextDeactivatedBlockTimestamp(uint256 contextId) external view returns (uint256);
 
     /**
      * @notice Get the coprocessor majority threshold for a coprocessor context.

gateway-contracts/contracts/mocks/CoprocessorContextsMock.sol

@@ -9,12 +9,12 @@ contract CoprocessorContextsMock {
     event NewCoprocessorContext(
         CoprocessorContext activeCoprocessorContext,
         CoprocessorContext newCoprocessorContext,
-        CoprocessorContextBlockPeriods blockPeriods
+        CoprocessorContextTimePeriods timePeriods
     );
 
-    event PreActivateCoprocessorContext(CoprocessorContext newCoprocessorContext, uint256 activationBlockNumber);
+    event PreActivateCoprocessorContext(CoprocessorContext newCoprocessorContext, uint256 activationBlockTimestamp);
 
-    event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockNumber);
+    event SuspendCoprocessorContext(uint256 contextId, uint256 deactivatedBlockTimestamp);
 
     event ActivateCoprocessorContext(uint256 contextId);
 
@@ -36,22 +36,22 @@ contract CoprocessorContextsMock {
     function addCoprocessorContext(
         uint256 featureSet,
         Coprocessor[] calldata coprocessors,
-        CoprocessorContextBlockPeriods calldata blockPeriods
+        CoprocessorContextTimePeriods calldata timePeriods
     ) external {
         CoprocessorContext memory activeCoprocessorContext;
         CoprocessorContext memory newCoprocessorContext;
-        uint256 activationBlockNumber;
+        uint256 activationBlockTimestamp;
 
-        emit NewCoprocessorContext(activeCoprocessorContext, newCoprocessorContext, blockPeriods);
+        emit NewCoprocessorContext(activeCoprocessorContext, newCoprocessorContext, timePeriods);
 
-        emit PreActivateCoprocessorContext(newCoprocessorContext, activationBlockNumber);
+        emit PreActivateCoprocessorContext(newCoprocessorContext, activationBlockTimestamp);
     }
 
     function refreshCoprocessorContextStatuses() external {
         uint256 contextId;
-        uint256 deactivatedBlockNumber;
+        uint256 deactivatedBlockTimestamp;
 
-        emit SuspendCoprocessorContext(contextId, deactivatedBlockNumber);
+        emit SuspendCoprocessorContext(contextId, deactivatedBlockTimestamp);
 
         emit ActivateCoprocessorContext(contextId);
 

gateway-contracts/contracts/shared/Structs.sol

@@ -43,12 +43,12 @@ struct CoprocessorContext {
     Coprocessor[] coprocessors;
 }
 
-/// @notice Struct that represents the block periods for a coprocessor context
-struct CoprocessorContextBlockPeriods {
-    /// @notice The block period for the pre-activation period (before activating the coprocessor context)
-    uint256 preActivationBlockPeriod;
-    /// @notice The block period for the suspended period (before deactivating the previous coprocessor context)
-    uint256 suspendedBlockPeriod;
+/// @notice Struct that represents the time periods for a coprocessor context
+struct CoprocessorContextTimePeriods {
+    /// @notice The time period for the pre-activation period (before activating the coprocessor context)
+    uint256 preActivationTimePeriod;
+    /// @notice The time period for the suspended period (before deactivating the previous coprocessor context)
+    uint256 suspendedTimePeriod;
 }
 
 /// @notice Struct that represents a custodian

gateway-contracts/docs/getting-started/contracts/coprocessor_contexts.md

@@ -94,7 +94,7 @@ The complete lifecycle of a coprocessor context is represented in the following
 
 ### Automatic status refresh
 
-Coprocessor context statuses that need to be updated based on the current block number are refreshed using the `refreshCoprocessorContextStatuses` function. This function can be called by anyone, but most importantly, it is called by any of the following functions as a pre-hook modifier:
+Coprocessor context statuses that need to be updated based on the current block timestamp are refreshed using the `refreshCoprocessorContextStatuses` function. This function can be called by anyone, but most importantly, it is called by any of the following functions as a pre-hook modifier:
 
 - in `CiphertextCommits` contract:
   - `addCiphertextMaterial`