Gmpv3 p2 (#63)

dvc94ch · web-flow · commit e8315c4bb663 · 2025-06-03T17:38:55.000+02:00
diff --git a/foundry.toml b/foundry.toml
@@ -80,4 +80,4 @@ forge-std = "1.9.7"
 "@openzeppelin-contracts-upgradeable" = "5.3.0"
 "@openzeppelin-contracts" = "5.3.0"
 frost-evm = { version = "0.1.0", git = "https://github.com/Analog-Labs/frost-evm.git", rev = "63a217a8d0a6f186dab69f070ea45c28099885df" }
-gmp = "0.0.1"
+gmp = { version = "0.0.1", path = "../gmp" }
diff --git a/gmp/.soldeerignore b/gmp/.soldeerignore
diff --git a/gmp/README.md b/gmp/README.md
diff --git a/gmp/foundry.toml b/gmp/foundry.toml
diff --git a/gmp/src/IGateway.sol b/gmp/src/IGateway.sol
@@ -14,7 +14,6 @@ interface IGateway {
      * @param destinationAddress the target address on the destination chain.
      * @param destinationNetwork the target chain where the contract call will be made.
      * @param gasLimit the gas limit available for the contract call
-     * @param gasCost the gas limit available for the contract call
      * @param nonce Sequence number per sender, used to guarantee each message is unique.
      * @param data message data with no specified format
      */
@@ -24,7 +23,6 @@ interface IGateway {
         address indexed destinationAddress,
         uint16 destinationNetwork,
         uint64 gasLimit,
-        uint64 gasCost,
         uint64 nonce,
         bytes data
     );
diff --git a/gmp/src/IGmpReceiver.sol b/gmp/src/IGmpReceiver.sol
diff --git a/remappings.txt b/remappings.txt
@@ -1,6 +1,6 @@
 @openzeppelin/contracts-upgradeable/=dependencies/@openzeppelin-contracts-upgradeable-5.3.0/
 @openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.3.0/
-forge-std/=dependencies/forge-std-1.9.7/src
-frost-evm/=dependencies/frost-evm-0.1.0/
-gmp/=dependencies/gmp-0.0.1/
+forge-std/=dependencies/forge-std-1.9.7/src/
+frost-evm/=dependencies/frost-evm-0.1.0/sol/
+gmp/=gmp/src/
 src/=src/
diff --git a/src/Gateway.sol b/src/Gateway.sol
@@ -3,12 +3,12 @@
 
 pragma solidity >=0.8.0;
 
-import {Schnorr} from "frost-evm/sol/Schnorr.sol";
+import {Schnorr} from "frost-evm/Schnorr.sol";
 import {GasUtils} from "./GasUtils.sol";
 import {RouteStore} from "./storage/Routes.sol";
 import {ShardStore} from "./storage/Shards.sol";
-import {IGateway} from "gmp/src/IGateway.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGateway} from "gmp/IGateway.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 import {
     Command,
     Batch,
@@ -218,7 +218,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
 
             bytes32 messageId = message.messageId();
             emit GmpCreated(
-                messageId, source, destinationAddress, network, gasLimit, uint64(gas), nextNonce, message.data
+                messageId, source, destinationAddress, network, gasLimit, nextNonce, message.data
             );
             return messageId;
         }
@@ -326,7 +326,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
         assembly {
             publicKey := params.offset
         }
-        operationHash = PrimitiveUtils.hash(publicKey.yParity, publicKey.xCoord);
+        operationHash = PrimitiveUtils.hash(publicKey.yParity, publicKey.xCoord, publicKey.numSessions);
 
         if (dry) {
             return operationHash;
@@ -344,7 +344,7 @@ contract Gateway is IGateway, UUPSUpgradeable, OwnableUpgradeable {
         assembly {
             publicKey := params.offset
         }
-        operationHash = PrimitiveUtils.hash(publicKey.yParity, publicKey.xCoord);
+        operationHash = PrimitiveUtils.hash(publicKey.yParity, publicKey.xCoord, publicKey.numSessions);
 
         if (dry) {
             return operationHash;
diff --git a/src/GmpProxy.sol b/src/GmpProxy.sol
@@ -3,8 +3,8 @@
 
 pragma solidity >=0.8.0;
 
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
-import {IGateway} from "gmp/src/IGateway.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
+import {IGateway} from "gmp/IGateway.sol";
 import {console} from "forge-std/console.sol";
 
 contract GmpProxy is IGmpReceiver {
diff --git a/src/Primitives.sol b/src/Primitives.sol
@@ -176,17 +176,6 @@ library PrimitiveUtils {
         }
     }
 
-    /**
-     * @dev Hashes two 256-bit words without memory allocation, uses the memory between 0x00~0x40.
-     */
-    function hash(uint256 a, uint256 b) internal pure returns (bytes32 h) {
-        assembly ("memory-safe") {
-            mstore(0x00, a)
-            mstore(0x20, b)
-            h := keccak256(0x00, 0x40)
-        }
-    }
-
     /**
      * @dev Hashes three 256-bit words without memory allocation, uses the memory between 0x00~0x60.
      *
@@ -297,12 +286,6 @@ library PrimitiveUtils {
         }
     }
 
-    function opHash(GmpMessage memory message) internal pure returns (bytes32) {
-        bytes32 msgId = PrimitiveUtils.messageId(message);
-        bytes32 dataHash = keccak256(message.data);
-        return keccak256(abi.encode(msgId, dataHash));
-    }
-
     /**
      * @dev Converts the `GmpMessage` into a `GmpCallback` struct, which contains all fields from
      * `GmpMessage`, plus the EIP-712 hash and `IGmpReceiver.onGmpReceived` callback.
diff --git a/test/Batching.t.sol b/test/Batching.t.sol
@@ -5,12 +5,12 @@ pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
-import {Signer} from "frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/Signer.sol";
 import {TestUtils} from "./TestUtils.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 import {
     Batch,
     GatewayOp,
diff --git a/test/GasSpender.sol b/test/GasSpender.sol
@@ -3,7 +3,7 @@
 
 pragma solidity >=0.8.0;
 
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 
 contract GasSpender is IGmpReceiver {
     // Following a contract implements the IGmpReceiver interface and wastes the exact amount of gas you send to it in the payload field.
diff --git a/test/GasSpender.t.sol b/test/GasSpender.t.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.8.0;
 
 import {Test} from "forge-std/Test.sol";
 import {GasSpender} from "./GasSpender.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 
 contract GasSpenderTest is Test {
     IGmpReceiver internal receiver;
diff --git a/test/GasUtils.t.sol b/test/GasUtils.t.sol
@@ -3,15 +3,14 @@
 
 pragma solidity >=0.8.0;
 
-import {Signer} from "frost-evm/sol/Signer.sol";
 import {Test, console} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {Gas, TestUtils} from "./TestUtils.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 import {
     Command,
     GatewayOp,
diff --git a/test/Gateway.t.sol b/test/Gateway.t.sol
@@ -5,14 +5,14 @@ pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
+import {Signer} from "frost-evm/Signer.sol";
 import {TestUtils} from "./TestUtils.sol";
-import {Signer} from "frost-evm/sol/Signer.sol";
 import {GasSpender} from "./GasSpender.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
 import {ShardStore} from "../src/storage/Shards.sol";
-import {IGateway} from "gmp/src/IGateway.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGateway} from "gmp/IGateway.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 import {
     Batch,
     GmpMessage,
@@ -285,7 +285,7 @@ contract GatewayTest is Test {
         // Submit message with sufficient funds
         vm.expectEmit(true, true, true, true);
         emit IGateway.GmpCreated(
-            id, gmp.source, gmp.dest, gmp.destNetwork, uint64(gmp.gasLimit), uint64(value), gmp.nonce, gmp.data
+            id, gmp.source, gmp.dest, gmp.destNetwork, gmp.gasLimit, gmp.nonce, gmp.data
         );
         vm.startPrank(sender);
         bytes32 rid = gateway.submitMessage{value: value}(gmp.dest, gmp.destNetwork, gmp.gasLimit, gmp.data);
@@ -299,7 +299,7 @@ contract GatewayTest is Test {
         // Expect event
         vm.expectEmit(true, true, true, true);
         emit IGateway.GmpCreated(
-            id, gmp.source, gmp.dest, gmp.destNetwork, uint64(gmp.gasLimit), uint64(value), gmp.nonce, gmp.data
+            id, gmp.source, gmp.dest, gmp.destNetwork, gmp.gasLimit, gmp.nonce, gmp.data
         );
         vm.startPrank(sender);
         rid = gateway.submitMessage{value: value}(gmp.dest, gmp.destNetwork, gmp.gasLimit, gmp.data);
diff --git a/test/GmpProxy.t.sol b/test/GmpProxy.t.sol
@@ -3,8 +3,8 @@
 pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
-import {IGateway} from "gmp/src/IGateway.sol";
-import {IGmpReceiver} from "gmp/src/IGmpReceiver.sol";
+import {IGateway} from "gmp/IGateway.sol";
+import {IGmpReceiver} from "gmp/IGmpReceiver.sol";
 import {GmpProxy} from "src/GmpProxy.sol";
 
 contract MockGateway is IGateway {
diff --git a/test/Shards.t.sol b/test/Shards.t.sol
@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 import {Test, console} from "forge-std/Test.sol";
 import {ShardStore} from "../src/storage/Shards.sol";
 import {TssKey} from "../src/Primitives.sol";
-import {Signer} from "frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/Signer.sol";
 
 contract ShardStoreTest is Test {
     using ShardStore for ShardStore.MainStorage;
diff --git a/test/TestUtils.sol b/test/TestUtils.sol
@@ -5,7 +5,7 @@ pragma solidity >=0.8.0;
 
 import {VmSafe, Vm} from "forge-std/Vm.sol";
 import {console} from "forge-std/console.sol";
-import {Signer} from "frost-evm/sol/Signer.sol";
+import {Signer} from "frost-evm/Signer.sol";
 import {Gateway} from "../src/Gateway.sol";
 import {GasUtils} from "../src/GasUtils.sol";
 import {GasSpender} from "./GasSpender.sol";
@@ -47,13 +47,15 @@ contract SigningHash {
                 assembly {
                     gmp := add(params.offset, 0x20)
                 }
-                operationHash = gmp.opHash();
+                bytes32 msgId = PrimitiveUtils.messageId(gmp);
+                bytes32 dataHash = keccak256(gmp.data);
+                operationHash = keccak256(abi.encode(msgId, dataHash));
             } else {
                 TssKey calldata tssKey;
                 assembly {
                     tssKey := params.offset
                 }
-                operationHash = PrimitiveUtils.hash(tssKey.yParity, tssKey.xCoord);
+                operationHash = PrimitiveUtils.hash(tssKey.yParity, tssKey.xCoord, tssKey.numSessions);
             }
             rootHash = PrimitiveUtils.hash(uint256(rootHash), uint256(op.command), uint256(operationHash));
         }

Original file line number	Diff line number	Diff line change
`@@ -176,17 +176,6 @@ library PrimitiveUtils {`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`- /**`
`180`		`- * @dev Hashes two 256-bit words without memory allocation, uses the memory between 0x00~0x40.`
`181`		`- */`
`182`		`- function hash(uint256 a, uint256 b) internal pure returns (bytes32 h) {`
`183`		`- assembly ("memory-safe") {`
`184`		`- mstore(0x00, a)`
`185`		`- mstore(0x20, b)`
`186`		`- h := keccak256(0x00, 0x40)`
`187`		`- }`
`188`		`- }`
`189`		`-`
`190`	`179`	`/**`
`191`	`180`	`* @dev Hashes three 256-bit words without memory allocation, uses the memory between 0x00~0x60.`
`192`	`181`	`*`
`@@ -297,12 +286,6 @@ library PrimitiveUtils {`
`297`	`286`	`}`
`298`	`287`	`}`
`299`	`288`
`300`		`- function opHash(GmpMessage memory message) internal pure returns (bytes32) {`
`301`		`- bytes32 msgId = PrimitiveUtils.messageId(message);`
`302`		`- bytes32 dataHash = keccak256(message.data);`
`303`		`- return keccak256(abi.encode(msgId, dataHash));`
`304`		`- }`
`305`		`-`
`306`	`289`	`/**`
`307`	`290`	* @dev Converts the `GmpMessage` into a `GmpCallback` struct, which contains all fields from
`308`	`291`	* `GmpMessage`, plus the EIP-712 hash and `IGmpReceiver.onGmpReceived` callback.