Gmpv3 (#60)

Author: dvc94ch

src/GasUtils.sol

@@ -12,7 +12,7 @@ library GasUtils {
     using PrimitiveUtils for uint256;
 
     function calldataSize(uint16 messageSize) internal pure returns (uint256) {
-        return uint256(messageSize).align32() + 708; // selector + Signature + Batch
+        return uint256(messageSize).align32() + 676; // selector + Signature + Batch
     }
 
     /**

src/Gateway.sol

@@ -56,18 +56,6 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
         bytes32 indexed id, bytes32 indexed source, address indexed dest, GmpStatus status, bytes32 result
     );
 
-    /**
-     * @dev Emitted when shards are registered.
-     * @param keys registered shard's keys
-     */
-    event ShardsRegistered(TssKey[] keys);
-
-    /**
-     * @dev Emitted when shards are unregistered.
-     * @param keys unregistered shard's keys
-     */
-    event ShardsUnregistered(TssKey[] keys);
-
     // number of signing sessions per batch
     mapping(uint64 => uint16) internal _signingSessions;
 
@@ -112,6 +100,8 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
         transferOwnership(newAdmin);
     }
 
+    function _include_gmp_message(GmpMessage memory) external {}
+
     /**
      * Withdraw funds from the gateway contract
      * @param amount The amount to withdraw
@@ -142,36 +132,34 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
      * @dev List all shards.
      */
     function shards() external view returns (TssKey[] memory) {
-        return ShardStore.getMainStorage().listShards();
+        return ShardStore.getMainStorage().list();
     }
 
     /**
      * @dev Register Shards in batch.
      */
-    function setShards(TssKey[] calldata publicKeys) external onlyOwner {
-        (TssKey[] memory created, TssKey[] memory revoked) = ShardStore.getMainStorage().replaceTssKeys(publicKeys);
-
-        if (created.length > 0) {
-            emit ShardsRegistered(created);
+    function setShards(TssKey[] calldata register, TssKey[] calldata revoke) external onlyOwner {
+        ShardStore.MainStorage storage store = ShardStore.getMainStorage();
+        for (uint256 i = 0; i < register.length; i++) {
+            store.register(register[i]);
         }
-
-        if (revoked.length > 0) {
-            emit ShardsUnregistered(revoked);
+        for (uint256 i = 0; i < revoke.length; i++) {
+            store.revoke(revoke[i]);
         }
     }
 
     /**
      * @dev List all routes.
      */
     function routes() external view returns (Route[] memory) {
-        return RouteStore.getMainStorage().listRoutes();
+        return RouteStore.getMainStorage().list();
     }
 
     /**
      * @dev Create or update a single route
      */
     function setRoute(Route calldata info) external onlyOwner {
-        RouteStore.getMainStorage().createOrUpdateRoute(info);
+        RouteStore.getMainStorage().insert(info);
     }
 
     // IGateway implementation
@@ -344,12 +332,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
             return operationHash;
         }
 
-        bool isSuccess = ShardStore.getMainStorage().register(publicKey);
-        if (isSuccess) {
-            TssKey[] memory keys = new TssKey[](1);
-            keys[0] = publicKey;
-            emit ShardsRegistered(keys);
-        }
+        ShardStore.getMainStorage().register(publicKey);
     }
 
     /**
@@ -367,12 +350,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
             return operationHash;
         }
 
-        bool isSuccess = ShardStore.getMainStorage().revoke(publicKey);
-        if (isSuccess) {
-            TssKey[] memory keys = new TssKey[](1);
-            keys[0] = publicKey;
-            emit ShardsUnregistered(keys);
-        }
+        ShardStore.getMainStorage().revoke(publicKey);
     }
 
     /**
@@ -478,10 +456,14 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
     function execute(Signature calldata signature, Batch calldata batch) external {
         uint256 initialGas = gasleft();
 
+        // Load shard from storage
+        ShardStore.ShardInfo storage signer = ShardStore.getMainStorage().get(signature.xCoord);
+
         uint16 numSigningSessions = _signingSessions[batch.batchId];
         bool dry;
         if (numSigningSessions == 0) {
-            numSigningSessions = batch.numSigningSessions;
+            numSigningSessions = signer.numSessions;
+            emit BatchExecuted(batch.batchId);
         } else if (numSigningSessions == 1) {
             revert("batch already executed");
         } else if (numSigningSessions > 1) {
@@ -492,17 +474,13 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
 
         // Execute the commands and compute the operations root hash
         (, bytes32 rootHash) = _executeCommands(batch.ops, dry);
-        emit BatchExecuted(batch.batchId);
 
         // Compute the Batch signing hash
-        rootHash = PrimitiveUtils.hash(batch.version, batch.batchId, batch.numSigningSessions, uint256(rootHash));
+        rootHash = PrimitiveUtils.hash(batch.version, batch.batchId, uint256(rootHash));
         bytes32 signingHash = keccak256(
             abi.encodePacked("Analog GMP v2", networkId(), bytes32(uint256(uint160(address(this)))), rootHash)
         );
 
-        // Load shard from storage
-        ShardStore.ShardInfo storage signer = ShardStore.getMainStorage().get(signature);
-
         // Verify Signature
         require(
             Schnorr.verify(signer.yParity, signature.xCoord, uint256(signingHash), signature.e, signature.s),
@@ -512,7 +490,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
         // Refund the chronicle gas
         unchecked {
             // Extra gas overhead used to execute the refund logic + selector overhead
-            uint256 gasUsed = 2890;
+            uint256 gasUsed = 2968;
 
             // Compute the gas used + base cost + proxy overhead
             gasUsed += GasUtils.txBaseGas();

src/Primitives.sol

@@ -3,7 +3,7 @@
 
 pragma solidity >=0.8.0;
 
-uint8 constant GMP_VERSION = 1;
+uint8 constant GMP_VERSION = 0;
 
 /**
  * @dev Maximum size of the GMP payload
@@ -16,8 +16,9 @@ uint256 constant MAX_PAYLOAD_SIZE = 0x6000;
  * @param xCoord affine x-coordinate
  */
 struct TssKey {
-    uint8 yParity;
     uint256 xCoord;
+    uint8 yParity;
+    uint16 numSessions;
 }
 
 /**
@@ -88,8 +89,6 @@ struct Batch {
     uint8 version;
     /// @dev The batch identifier
     uint64 batchId;
-    /// @dev The number of signing sessions
-    uint16 numSigningSessions;
     /// @dev The ops to execute
     GatewayOp[] ops;
 }
@@ -109,8 +108,8 @@ struct Route {
     bytes32 gateway;
     uint256 relativeGasPriceNumerator;
     uint256 relativeGasPriceDenominator;
-    uint256 gasCoef0;
-    uint256 gasCoef1;
+    uint64 gasCoef0;
+    uint64 gasCoef1;
 }
 
 /**
@@ -156,12 +155,6 @@ library PrimitiveUtils {
      */
     uint256 internal constant ALLOCATED_MEMORY = 0x40;
 
-    /**
-     * @dev Solidity's reserved location for the scratch memory.
-     * Reference: https://docs.soliditylang.org/en/v0.8.28/internals/layout_in_memory.html
-     */
-    uint256 internal constant SCRATCH_MEMORY = 0x60;
-
     /**
      * @dev Read the current allocated size (a.k.a free memory pointer).
      */
@@ -216,36 +209,6 @@ library PrimitiveUtils {
         }
     }
 
-    /**
-     * @dev Hashes four 256-bit words without memory allocation, uses the memory between 0x00~0x80.
-     *
-     * The reserverd memory region `0x40~0x80` is restored to its previous state after execution.
-     * See https://docs.soliditylang.org/en/v0.8.28/internals/layout_in_memory.html for more details.
-     */
-    function hash(uint256 a, uint256 b, uint256 c, uint256 d) internal pure returns (bytes32 h) {
-        assembly ("memory-safe") {
-            mstore(0x00, a)
-            mstore(0x20, b)
-
-            // Backup the free memory pointer
-            let freeMemBackup := mload(ALLOCATED_MEMORY)
-            mstore(ALLOCATED_MEMORY, c)
-            {
-                // Backup the scratch space 0x60
-                let backup := mload(0x60)
-
-                // Compute the hash
-                mstore(SCRATCH_MEMORY, d)
-                h := keccak256(0x00, 0x80)
-
-                // Restore the scratch space 0x60
-                mstore(SCRATCH_MEMORY, backup)
-            }
-            // Restore the free memory pointer
-            mstore(ALLOCATED_MEMORY, freeMemBackup)
-        }
-    }
-
     /**
      * @dev Returns the smallest of two numbers.
      */