[env] dev to use anvil instead of geth for evm chains

analog-gmp/foundry.toml

@@ -21,7 +21,7 @@ solc = '0.8.28'
 # - https://ethereumclassic.org/knowledge/history
 evm_version = 'shanghai'
 optimizer = true
-optimizer_runs = 200000
+optimizer_runs = 500000
 
 ###############
 # EVM options #

analog-gmp/src/GatewayProxy.sol

@@ -4,7 +4,7 @@
 pragma solidity >=0.8.0;
 
 import {ERC1967} from "./utils/ERC1967.sol";
-import {Context, CreateKind, IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
+import {Context, CreateKind, IUniversalFactory} from "../lib/universal-factory/src/IUniversalFactory.sol";
 
 contract GatewayProxy {
     /**

analog-gmp/src/Primitives.sol

@@ -281,7 +281,7 @@ library PrimitiveUtils {
         bytes memory onGmpReceived = callback.callback;
         bytes32 dataHash;
         assembly ("memory-safe") {
-            let offset := add(onGmpReceived, 0xa4)
+            let offset := add(onGmpReceived, 0xc4)
             dataHash := keccak256(add(offset, 0x20), mload(offset))
         }
         callback.eip712hash = bytes32(GMP_VERSION);
@@ -332,9 +332,10 @@ library PrimitiveUtils {
         // | 0x0124..0x0144 <- onGmpReceived.id
         // | 0x0144..0x0164 <- onGmpReceived.network
         // | 0x0164..0x0184 <- onGmpReceived.source
-        // | 0x0184..0x01a4 <- onGmpReceived.data.offset
-        // | 0x01a4..0x01c4 <- onGmpReceived.data.length
-        // | 0x01c4........ <- onGmpReceived.data
+        // | 0x0184..0x01a4 <- onGmpReceived.nonce
+        // | 0x01a4..0x01c4 <- onGmpReceived.data.offset
+        // | 0x01c4..0x01e4 <- onGmpReceived.data.length
+        // | 0x01e4........ <- onGmpReceived.data
         if (isCalldata) {
             GmpMessage calldata m = _intoCalldataPointer(message);
             callback.source = m.source;
@@ -345,10 +346,11 @@ library PrimitiveUtils {
             callback.nonce = m.nonce;
             bytes calldata data = m.data;
             callback.callback = abi.encodeWithSignature(
-                "onGmpReceived(bytes32,uint128,bytes32,bytes)",
+                "onGmpReceived(bytes32,uint128,bytes32,uint64,bytes)",
                 callback.eip712hash,
                 callback.srcNetwork,
                 callback.source,
+                callback.nonce,
                 data
             );
         } else {
@@ -360,10 +362,11 @@ library PrimitiveUtils {
             callback.gasLimit = m.gasLimit;
             callback.nonce = m.nonce;
             callback.callback = abi.encodeWithSignature(
-                "onGmpReceived(bytes32,uint128,bytes32,bytes)",
+                "onGmpReceived(bytes32,uint128,bytes32,uint64,bytes)",
                 callback.eip712hash,
                 callback.srcNetwork,
                 callback.source,
+                callback.nonce,
                 m.data
             );
         }

analog-gmp/src/interfaces/IGmpReceiver.sol

@@ -17,7 +17,7 @@ interface IGmpReceiver {
      * @param payload The message payload with no specified format
      * @return 32 byte result which will be stored together with GMP message
      */
-    function onGmpReceived(bytes32 id, uint128 network, bytes32 source, bytes calldata payload)
+    function onGmpReceived(bytes32 id, uint128 network, bytes32 source, uint64 nonce, bytes calldata payload)
         external
         payable
         returns (bytes32);

analog-gmp/test/Batching.t.sol

@@ -5,8 +5,8 @@ pragma solidity >=0.8.0;
 
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
-import {FactoryUtils} from "@universal-factory/FactoryUtils.sol";
-import {IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
+import {FactoryUtils} from "../lib/universal-factory/src/FactoryUtils.sol";
+import {IUniversalFactory} from "../lib/universal-factory/src/IUniversalFactory.sol";
 import {TestUtils, SigningKey, SigningUtils} from "./TestUtils.sol";
 import {GasSpender} from "./utils/GasSpender.sol";
 import {BaseTest} from "./utils/BaseTest.sol";
@@ -161,6 +161,7 @@ contract Batching is BaseTest {
                     0x0000000000000000000000000000000000000000000000000000000000000000,
                     1,
                     0x0000000000000000000000000000000000000000000000000000000000000000,
+                    0,
                     abi.encode(gasToWaste)
                 )
             );

analog-gmp/test/Gateway.t.sol

@@ -328,6 +328,7 @@ contract GatewayTest is BaseTest {
                 0x0000000000000000000000000000000000000000000000000000000000000000,
                 1,
                 0x0000000000000000000000000000000000000000000000000000000000000000,
+                0,
                 abi.encode(uint256(1234))
             )
         );

analog-gmp/test/GatewayProxy.t.sol

@@ -3,8 +3,8 @@
 
 pragma solidity >=0.8.0;
 
-import {IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
-import {FactoryUtils} from "@universal-factory/FactoryUtils.sol";
+import {IUniversalFactory} from "../lib/universal-factory/src/IUniversalFactory.sol";
+import {FactoryUtils} from "../lib/universal-factory/src/FactoryUtils.sol";
 import {Test, console} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
 import {TestUtils, SigningKey, SigningUtils} from "./TestUtils.sol";

analog-gmp/test/GmpTestTools.sol

@@ -11,7 +11,7 @@ import {GatewayProxy} from "../src/GatewayProxy.sol";
 import {IGateway} from "../src/interfaces/IGateway.sol";
 import {BranchlessMath} from "../src/utils/BranchlessMath.sol";
 import {GmpMessage, TssKey, Network, Signature, GmpSender, PrimitiveUtils} from "../src/Primitives.sol";
-import {IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
+import {IUniversalFactory} from "../lib/universal-factory/src/IUniversalFactory.sol";
 
 library GmpTestTools {
     /**

analog-gmp/test/MockERC20.sol

@@ -3,7 +3,7 @@
 
 pragma solidity >=0.8.0;
 
-import {ERC20} from "@solmate/tokens/ERC20.sol";
+import {ERC20} from "../lib/solmate/src/tokens/ERC20.sol";
 import {IGmpReceiver} from "../src/interfaces/IGmpReceiver.sol";
 import {IGateway} from "../src/interfaces/IGateway.sol";
 
@@ -73,7 +73,7 @@ contract MockERC20 is ERC20, IGmpReceiver {
         );
     }
 
-    function onGmpReceived(bytes32 id, uint128 network, bytes32 sender, bytes calldata data)
+    function onGmpReceived(bytes32 id, uint128 network, bytes32 sender, uint64, bytes calldata data)
         external
         payable
         returns (bytes32)

analog-gmp/test/TestUtils.sol

@@ -5,11 +5,11 @@ pragma solidity >=0.8.0;
 
 import {VmSafe, Vm} from "forge-std/Vm.sol";
 import {console} from "forge-std/console.sol";
-import {Schnorr} from "@frost-evm/Schnorr.sol";
-import {SECP256K1} from "@frost-evm/SECP256K1.sol";
+import {Schnorr} from "../lib/frost-evm/sol/Schnorr.sol";
+import {SECP256K1} from "../lib/frost-evm/sol/SECP256K1.sol";
 import {BranchlessMath} from "../src/utils/BranchlessMath.sol";
-import {IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
-import {FactoryUtils} from "@universal-factory/FactoryUtils.sol";
+import {IUniversalFactory} from "../lib/universal-factory/src/IUniversalFactory.sol";
+import {FactoryUtils} from "../lib/universal-factory/src/FactoryUtils.sol";
 import {IGateway} from "../src/interfaces/IGateway.sol";
 import {Gateway, GatewayEIP712} from "../src/Gateway.sol";
 import {GatewayProxy} from "../src/GatewayProxy.sol";

analog-gmp/test/utils/BaseTest.sol

@@ -3,9 +3,9 @@
 
 pragma solidity >=0.8.0;
 
-import {IUniversalFactory} from "@universal-factory/IUniversalFactory.sol";
-import {FactoryUtils} from "@universal-factory/FactoryUtils.sol";
-import {Interpreter} from "@evm-interpreter/Interpreter.sol";
+import {IUniversalFactory} from "../../lib/universal-factory/src/IUniversalFactory.sol";
+import {FactoryUtils} from "../../lib/universal-factory/src/FactoryUtils.sol";
+import {Interpreter} from "../../lib/evm-interpreter/src/Interpreter.sol";
 import {Test, console, Vm} from "forge-std/Test.sol";
 import {VmSafe} from "forge-std/Vm.sol";
 

analog-gmp/test/utils/GasSpender.sol

@@ -17,7 +17,7 @@ contract GasSpender is IGmpReceiver {
     //    0x07  0x3d      RETURNDATASIZE
     //    0x08  0x6020    PUSH1 0x20
     //    0x0a  0x91      SWAP2
-    //    0x0b  0x6064    PUSH1 0x64
+    //    0x0b  0x6084    PUSH1 0x84
     //    0x0d  0x35      CALLDATALOAD -- Load the payload offset from the calldata
     //    0x0e  0x6024    PUSH1 0x24
     //    0x10  0x01      ADD
@@ -61,7 +61,7 @@ contract GasSpender is IGmpReceiver {
     // `=>0x3a  0x5b      JUMPDEST
     //    0x3b  0xf3      RETURN
     bytes private constant BYTECODE =
-        hex"5a600201803d523d60209160643560240135146018575bfd5b60365a116018575a604903565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5bf3";
+        hex"5a600201803d523d60209160843560240135146018575bfd5b60365a116018575a604903565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5bf3";
 
     constructor() payable {
         bytes memory bytecode = BYTECODE;
@@ -70,7 +70,7 @@ contract GasSpender is IGmpReceiver {
         }
     }
 
-    function onGmpReceived(bytes32, uint128, bytes32, bytes calldata payload) external payable returns (bytes32) {
+    function onGmpReceived(bytes32, uint128, bytes32, uint64, bytes calldata payload) external payable returns (bytes32) {
         unchecked {
             // OBS: This is just an example on how this contract works, the actual code is implemented directly in
             // low level EVM, as defined in the `BYTECODE` constant.

analog-gmp/test/utils/GasSpender.t.sol

@@ -20,6 +20,7 @@ contract GasSpenderTest is BaseTest {
                 0x0000000000000000000000000000000000000000000000000000000000000000,
                 1,
                 0x0000000000000000000000000000000000000000000000000000000000000000,
+                0,
                 abi.encode(gasToWaste)
             )
         );