Fix message (#46)

Author: dvc94ch

src/Gateway.sol

@@ -50,6 +50,7 @@ abstract contract GatewayEIP712 {
 contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
     using PrimitiveUtils for UpdateKeysMessage;
     using PrimitiveUtils for GmpMessage;
+    using PrimitiveUtils for GmpCallback;
     using PrimitiveUtils for address;
     using BranchlessMath for uint256;
     using UFloatMath for UFloat9x56;
@@ -202,7 +203,7 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
         // Convert the `GmpMessage` into `GmpCallback`, which is a more efficient representation.
         // see `src/Primitives.sol` for more details.
         GmpCallback memory callback = gmp.intoCallback();
-        operationHash = callback.eip712hash;
+        operationHash = callback.opHash;
         _execute(callback);
     }
 
@@ -371,7 +372,8 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
 
     function _execute(GmpCallback memory callback) private returns (GmpStatus, bytes32) {
         // Verify if this GMP message was already executed
-        GmpInfo storage gmp = _messages[callback.eip712hash];
+        bytes32 msgId = callback.messageId();
+        GmpInfo storage gmp = _messages[msgId];
         require(gmp.status == GmpStatus.NOT_FOUND, "message already executed");
 
         // Update status to `pending` to prevent reentrancy attacks.
@@ -425,7 +427,7 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
         gmp.status = status;
 
         // Emit event
-        emit GmpExecuted(callback.eip712hash, callback.source, callback.dest, status, result);
+        emit GmpExecuted(msgId, callback.source, callback.dest, status, result);
 
         return (status, result);
     }
@@ -464,7 +466,7 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
         GmpCallback memory callback = message.intoCallback();
 
         // Verify the TSS Schnorr Signature
-        _verifySignature(signature, callback.eip712hash);
+        _verifySignature(signature, callback.opHash);
 
         // Execute GMP message
         (status, result) = _execute(callback);
@@ -521,7 +523,7 @@ contract Gateway is IGateway, IExecutor, IUpgradable, GatewayEIP712 {
 
             // Emit `GmpCreated` event without copy the data, to simplify the gas estimation.
             _emitGmpCreated(
-                message.eip712hash(),
+                message.messageId(),
                 source,
                 destinationAddress,
                 routeId,

src/Primitives.sol

@@ -165,7 +165,7 @@ enum GmpStatus {
  * @param callback encoded callback of `IGmpRecipient` interface, see `IGateway.sol` for more details.
  */
 struct GmpCallback {
-    bytes32 eip712hash;
+    bytes32 opHash;
     GmpSender source;
     uint16 srcNetwork;
     address dest;
@@ -221,26 +221,35 @@ library PrimitiveUtils {
         );
     }
 
-    function eip712hash(GmpMessage memory message) internal pure returns (bytes32 id) {
-        bytes memory data = message.data;
+    function messageId(GmpMessage memory message) internal pure returns (bytes32 id) {
         assembly ("memory-safe") {
-            // keccak256(message.data)
-            id := keccak256(add(data, 32), mload(data))
+            // now compute the GmpMessage Type Hash without memory copying
+            let offset1 := sub(message, 32)
+            let backup1 := mload(offset1)
 
+            mstore(offset1, GMP_VERSION)
+            id := keccak256(offset1, 0xe0)
+            mstore(offset1, backup1)
+        }
+    }
+
+    function opHash(GmpMessage memory message) internal pure returns (bytes32 id) {
+        bytes32 dataHash = keccak256(message.data);
+        assembly ("memory-safe") {
             // now compute the GmpMessage Type Hash without memory copying
-            let offset := sub(message, 32)
-            let backup := mload(offset)
-            {
-                mstore(offset, GMP_VERSION)
-                {
-                    let offset2 := add(offset, 0xe0)
-                    let backup2 := mload(offset2)
-                    mstore(offset2, id)
-                    id := keccak256(offset, 0x100)
-                    mstore(offset2, backup2)
-                }
-            }
-            mstore(offset, backup)
+            let offset1 := sub(message, 32)
+            let backup1 := mload(offset1)
+            let backup2 := mload(message)
+
+            mstore(offset1, GMP_VERSION)
+            id := keccak256(offset1, 0xe0)
+
+            mstore(offset1, id)
+            mstore(message, dataHash)
+            id := keccak256(offset1, 64)
+
+            mstore(offset1, backup1)
+            mstore(message, backup2)
         }
     }
 
@@ -279,26 +288,37 @@ library PrimitiveUtils {
      */
     function _computeMessageID(GmpCallback memory callback) private pure {
         bytes memory onGmpReceived = callback.callback;
-        bytes32 dataHash;
+        callback.opHash = bytes32(GMP_VERSION);
+
+        bytes32 msgId;
         assembly ("memory-safe") {
-            let offset := add(onGmpReceived, 0xc4)
-            dataHash := keccak256(add(offset, 0x20), mload(offset))
+            // Compute `keccak256(abi.encode(GMP_VERSION, message.source, ...))`
+            msgId := keccak256(callback, 0x00e0)
+            // Replace the `id` in `onGmpReceived(uint256 id,...)` in the callback.
+            mstore(add(onGmpReceived, 0x24), msgId)
         }
-        callback.eip712hash = bytes32(GMP_VERSION);
-        assembly ("memory-safe") {
-            // temporarily store the result at `0x00e0..0x0100`, which is the `GmpCallback.callback.offset` field.
-            mstore(add(callback, 0xe0), dataHash)
 
-            // Compute `keccak256(abi.encode(GMP_VERSION, message.source, ..., keccak256(message.data)))`
-            dataHash := keccak256(callback, 0x0100)
+        bytes memory data;
+        assembly ("memory-safe") {
+            data := add(onGmpReceived, 0xc4)
+        }
+        bytes32 dataHash = keccak256(data);
 
-            // Replace the `eip712hash` by the `callback.data.offset`.
-            mstore(add(callback, 0xe0), onGmpReceived)
+        callback.opHash = msgId;
+        GmpSender backup = callback.source;
+        callback.source = GmpSender.wrap(dataHash);
+        assembly ("memory-safe") {
+            dataHash := keccak256(callback, 0x40)
+        }
+        callback.opHash = dataHash;
+        callback.source = backup;
+    }
 
-            // Replace the `id` in `onGmpReceived(uint256 id,...)` in the callback.
-            mstore(add(onGmpReceived, 0x24), dataHash)
+    function messageId(GmpCallback memory callback) internal pure returns (bytes32 msgId) {
+        bytes memory onGmpReceived = callback.callback;
+        assembly ("memory-safe") {
+            msgId := mload(add(onGmpReceived, 0x24))
         }
-        callback.eip712hash = dataHash;
     }
 
     /**
@@ -319,7 +339,7 @@ library PrimitiveUtils {
      */
     function _intoCallback(MessagePtr message, bool isCalldata, GmpCallback memory callback) private pure {
         // |  MEMORY OFFSET  |     RESERVED FIELD     |
-        // | 0x0000..0x0020 <- GmpCallback.eip712hash
+        // | 0x0000..0x0020 <- GmpCallback.opHash
         // | 0x0020..0x0040 <- GmpCallback.source
         // | 0x0040..0x0060 <- GmpCallback.srcNetwork
         // | 0x0060..0x0080 <- GmpCallback.dest
@@ -347,7 +367,7 @@ library PrimitiveUtils {
             bytes calldata data = m.data;
             callback.callback = abi.encodeWithSignature(
                 "onGmpReceived(bytes32,uint128,bytes32,uint64,bytes)",
-                callback.eip712hash,
+                callback.opHash,
                 callback.srcNetwork,
                 callback.source,
                 callback.nonce,
@@ -363,7 +383,7 @@ library PrimitiveUtils {
             callback.nonce = m.nonce;
             callback.callback = abi.encodeWithSignature(
                 "onGmpReceived(bytes32,uint128,bytes32,uint64,bytes)",
-                callback.eip712hash,
+                callback.opHash,
                 callback.srcNetwork,
                 callback.source,
                 callback.nonce,

src/interfaces/IExecutor.sol

@@ -89,18 +89,4 @@ interface IExecutor {
      * @param message GMP message
      */
     function batchExecute(Signature calldata signature, InboundMessage calldata message) external;
-
-    /**
-     * Execute GMP message
-     * @param signature Schnorr signature
-     * @param message GMP message
-     */
-    function execute(Signature calldata signature, GmpMessage calldata message)
-        external
-        returns (GmpStatus status, bytes32 result);
-
-    /**
-     * Deposit funds to the gateway contract
-     */
-    function deposit() external payable;
 }

src/utils/GasUtils.sol

@@ -43,12 +43,12 @@ library GasUtils {
     /**
      * @dev Base cost of the `IExecutor.execute` method.
      */
-    uint256 internal constant EXECUTION_BASE_COST = EXECUTION_SELECTOR_OVERHEAD + 46960 + 38;
+    uint256 internal constant EXECUTION_BASE_COST = EXECUTION_SELECTOR_OVERHEAD + 46960 + 144;
 
     /**
      * @dev Base cost of the `IGateway.submitMessage` method.
      */
-    uint256 internal constant SUBMIT_BASE_COST = 24138;
+    uint256 internal constant SUBMIT_BASE_COST = 24138 - 96;
 
     /**
      * @dev Extra gas cost that any account `Contract or EOA` must pay when calling `IGateway.submitMessage` method.
@@ -136,9 +136,6 @@ library GasUtils {
             // CALLDATACOPY
             gasCost += words * 3;
 
-            // keccak256 (6 gas per word)
-            gasCost += words * 6;
-
             // emit GmpCreated() gas cost (8 gas per byte)
             gasCost += words << 8;
 
@@ -242,112 +239,15 @@ library GasUtils {
         }
     }
 
-    function _debugExecutionGasCost(uint256 messageSize, uint256 gasUsed) internal pure returns (uint256) {
-        unchecked {
-            // Selector overhead
-            // -- First GAS opcode
-            uint256 baseCost = EXECUTION_SELECTOR_OVERHEAD - 9;
-            uint256 memoryExpansion = 0x60;
-            // -- First GAS opcode
-
-            // all opcodes until message.intoCallback()
-            baseCost += 449;
-
-            // -- message.intoCallback() --
-            baseCost += 438;
-            memoryExpansion = 0x80 + 0x01c4;
-            uint256 gas = 0;
-            // CALLDATACOPY 3 + (3 * words) + memory_expansion
-            baseCost += 3;
-            gas = _toWord(messageSize) * 3;
-            memoryExpansion += messageSize;
-            memoryExpansion = memoryExpansion.align32();
-
-            // opcodes until keccak256
-            baseCost += 31;
-
-            // keccak256 30 + 6 gas per word
-            baseCost += 30;
-            gas = gas.saturatingAdd(_toWord(messageSize) * 6);
-            //
-            baseCost += 424;
-            // -- message.intoCallback() --
-
-            baseCost += 34;
-
-            // -- _verifySignature --
-            baseCost += 7933;
-            // -- _verifySignature --
-
-            baseCost += 18;
-
-            // _execute
-            baseCost += 22551;
-            baseCost += 2; // GAS
-
-            baseCost += 97;
-            //  ------  CALL ------
-
-            baseCost += 2600;
-            gas = gas.saturatingAdd(gasUsed);
-            memoryExpansion = (messageSize.align32() + 0x80 + 0x0120 + 164).align32();
-
-            //  ------  CALL ------
-            baseCost += 67;
-            baseCost += 100; // SLOAD
-            baseCost += 69;
-            baseCost += 100; // SSTORE
-
-            // -- emit GmpExecuted --
-            baseCost += 141;
-            memoryExpansion += 0x20; // MSTORE
-            baseCost += 24;
-            memoryExpansion += 0x20; // MSTORE
-            baseCost += 39;
-            baseCost += 2387; // LOG4
-            baseCost += 26;
-            // -- emit GmpExecuted --
-            // end _execute
-
-            baseCost += 34;
-
-            // GasUtils.txBaseCost()
-            {
-                baseCost += 64; // base cost
-
-                // chunk start cost
-                baseCost += 66;
-
-                // Selector + Signature + GmpMessage
-                uint256 words = messageSize.align32().saturatingAdd(388 + 31) >> 5;
-                words = (words * 106) + (((words.saturatingSub(255) + 254) / 255) * 214);
-                gas = gas.saturatingAdd(words);
-
-                baseCost += 171; // End countNonZeros
-                baseCost += 70; // End txBaseCost
-            }
-            // end GasUtils.txBaseCost()
-
-            baseCost += 482;
-            // ----- GAS -------
-
-            baseCost += 168; // GAS
-            baseCost += 6800; // REFUND CALL
-            baseCost += 184; // RETURN
-
-            gas = gas.saturatingAdd(baseCost);
-            gas = gas.saturatingAdd(memoryExpansionGasCost(_toWord(memoryExpansion)));
-            return gas;
-        }
-    }
-
     function _executionGasCost(uint256 messageSize, uint256 gasUsed) internal pure returns (uint256) {
         // Safety: The operations below can't overflow because the message size can't be greater than 2**16
         unchecked {
+            // cost of calldata copy
             uint256 gas = _toWord(messageSize) * 3;
+            // cost of hashing the payload
             gas = gas.saturatingAdd(_toWord(messageSize) * 6);
             gas = gas.saturatingAdd(gasUsed);
-            uint256 memoryExpansion = messageSize.align32() + 0x80 + 0x0120 + 164 + 0x40 + 32;
+            uint256 memoryExpansion = messageSize.align32() + 676;
             {
                 // Selector + Signature + GmpMessage
                 uint256 words = messageSize.align32().saturatingAdd(388 + 31) >> 5;

test/Batching.t.sol

@@ -38,6 +38,7 @@ import {
 contract Batching is BaseTest {
     using PrimitiveUtils for UpdateKeysMessage;
     using PrimitiveUtils for GmpMessage;
+    using PrimitiveUtils for GmpCallback;
     using PrimitiveUtils for GmpSender;
     using PrimitiveUtils for address;
     using BranchlessMath for uint256;
@@ -218,13 +219,13 @@ contract Batching is BaseTest {
 
     function sign(SigningKey memory signer, GmpMessage memory gmp) private pure returns (Signature memory) {
         GmpCallback memory callback = gmp.memToCallback();
-        (uint256 e, uint256 s) = signer.signPrehashed(callback.eip712hash, SIGNING_NONCE);
+        (uint256 e, uint256 s) = signer.signPrehashed(callback.opHash, SIGNING_NONCE);
         return Signature({xCoord: signer.xCoord(), e: e, s: s});
     }
 
     function computeGmpMessageID(GmpMessage calldata message) external pure returns (bytes32) {
         console.logBytes(msg.data);
-        return message.intoCallback().eip712hash;
+        return message.intoCallback().messageId();
     }
 
     function sign(SigningKey memory signer, InboundMessage memory message)
@@ -249,7 +250,7 @@ contract Batching is BaseTest {
                 assembly {
                     gmp := add(params.offset, 0x20)
                 }
-                operationHash = gmp.intoCallback().eip712hash;
+                operationHash = gmp.intoCallback().opHash;
             } else {
                 TssKey calldata tssKey;
                 assembly {