Merge branch 'vincent/v2' into ron/v2

contracts/foundry.toml

@@ -16,6 +16,7 @@ ignored_error_codes = [
     # tstore
     2394,
 ]
+
 evm_version = 'Cancun'
 
 [profile.production]

contracts/src/AgentExecutor.sol

@@ -29,12 +29,6 @@ contract AgentExecutor {
         _transferToken(token, recipient, amount);
     }
 
-    /// @dev Transfer WETH to `recipient`. Only callable via `execute`.
-    function transferWeth(address weth, address recipient, uint128 amount) external {
-        WETH9(payable(weth)).withdraw(amount);
-        payable(recipient).safeNativeTransfer(amount);
-    }
-
     /// @dev Call contract with Ether value. Only callable via `execute`.
     function callContract(address target, bytes memory data, uint256 value) external {
         bool success = Call.safeCall(target, data, value);
@@ -43,6 +37,12 @@ contract AgentExecutor {
         }
     }
 
+    /// @dev Transfer WETH to `recipient`. Only callable via `execute`.
+    function transferWeth(address weth, address recipient, uint128 amount) external {
+        WETH9(payable(weth)).withdraw(amount);
+        payable(recipient).safeNativeTransfer(amount);
+    }
+
     function deposit() external payable {}
 
     function _transferToken(address token, address recipient, uint128 amount) internal {

contracts/src/Initializer.sol

@@ -47,9 +47,10 @@ library Initializer {
         UD60x18 multiplier;
         /// @dev Optional rescueOperator
         address rescueOperator;
+        /// @dev The WETH address used for wrapping ETH
+        address weth;
         uint8 foreignTokenDecimals;
         uint128 maxDestinationFee;
-        address weth;
     }
 
     function initialize(bytes calldata data) external {

contracts/src/storage/AssetsStorage.sol

@@ -19,14 +19,14 @@ library AssetsStorage {
         uint256 registerTokenFee;
         // Foreign token registry by token ID
         mapping(bytes32 foreignID => address) tokenAddressOf;
+        address weth;
         uint8 foreignTokenDecimals;
         // The maximum fee that can be sent to a destination parachain to pay for execution (DOT).
         // Has two functions:
         // * Reduces the ability of users to perform arbitrage using a favourable exchange rate
         // * Prevents users from mistakenly providing too much fees, which would drain AssetHub's
         //   sovereign account here on Ethereum.
         uint128 maxDestinationFee;
-        address weth;
     }
 
     bytes32 internal constant SLOT = keccak256("org.snowbridge.storage.assets");

contracts/src/v1/Calls.sol

@@ -176,7 +176,7 @@ library CallsV1 {
     * Internal functions
     */
 
-    // Convert foreign currency to native currency (ROC/KSM/DOT -> ETH)
+    // Convert foreign currency to native currency (WND/PAS/KSM/DOT -> ETH)
     function _convertToNative(UD60x18 exchangeRate, UD60x18 multiplier, UD60x18 amount)
         internal
         view

contracts/test/GatewayV2.t.sol

@@ -174,32 +174,29 @@ contract GatewayV2Test is Test {
         return commands;
     }
 
-    function makeCallContractCommand(uint256 value) public view returns (CommandV2[] memory) {
-        bytes memory data = abi.encodeWithSignature("sayHello(string)", "World");
-        CallContractParams memory params = CallContractParams({
-            target: address(helloWorld),
-            data: data,
-            value: value
-        });
+    function makeUnlockWethCommand(uint128 value) public view returns (CommandV2[] memory) {
+        UnlockNativeTokenParams memory params =
+            UnlockNativeTokenParams({token: address(weth), recipient: relayer, amount: value});
         bytes memory payload = abi.encode(params);
 
         CommandV2[] memory commands = new CommandV2[](1);
         commands[0] =
-            CommandV2({kind: CommandKind.CallContract, gas: 500_000, payload: payload});
+            CommandV2({kind: CommandKind.UnlockNativeToken, gas: 500_000, payload: payload});
         return commands;
     }
 
-    function makeUnlockWethCommand(uint128 value) public view returns (CommandV2[] memory) {
-        UnlockNativeTokenParams memory params = UnlockNativeTokenParams({
-            token: address(weth),
-            recipient: relayer,
-            amount: value
+    function makeCallContractCommand(uint256 value) public view returns (CommandV2[] memory) {
+        bytes memory data = abi.encodeWithSignature("sayHello(string)", "World");
+        CallContractParams memory params = CallContractParams({
+            target: address(helloWorld),
+            data: data,
+            value: value
         });
         bytes memory payload = abi.encode(params);
 
         CommandV2[] memory commands = new CommandV2[](1);
         commands[0] =
-            CommandV2({kind: CommandKind.UnlockNativeToken, gas: 500_000, payload: payload});
+            CommandV2({kind: CommandKind.CallContract, gas: 500_000, payload: payload});
         return commands;
     }
 
@@ -345,6 +342,27 @@ contract GatewayV2Test is Test {
         );
     }
 
+    function testUnlockWethSuccess() public {
+        hoax(assetHubAgent);
+        weth.deposit{value: 1 ether}();
+
+        vm.expectEmit(true, false, false, true);
+        emit IGatewayV2.InboundMessageDispatched(1, true, relayerRewardAddress);
+
+        vm.deal(assetHubAgent, 1 ether);
+        hoax(relayer, 1 ether);
+        IGatewayV2(address(gateway)).v2_submit(
+            InboundMessageV2({
+                origin: Constants.ASSET_HUB_AGENT_ID,
+                nonce: 1,
+                commands: makeUnlockWethCommand(0.1 ether)
+            }),
+            proof,
+            makeMockProof(),
+            relayerRewardAddress
+        );
+    }
+
     function testEncodeDecodeMessageV2() public {
         UnlockNativeTokenParams memory params = UnlockNativeTokenParams({
             token: 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2,
@@ -411,25 +429,4 @@ contract GatewayV2Test is Test {
             relayerRewardAddress
         );
     }
-
-    function testUnlockWethSuccess() public {
-        hoax(assetHubAgent);
-        weth.deposit{value: 1 ether}();
-
-        vm.expectEmit(true, false, false, true);
-        emit IGatewayV2.InboundMessageDispatched(1, true, relayerRewardAddress);
-
-        vm.deal(assetHubAgent, 1 ether);
-        hoax(relayer, 1 ether);
-        IGatewayV2(address(gateway)).v2_submit(
-            InboundMessageV2({
-                origin: Constants.ASSET_HUB_AGENT_ID,
-                nonce: 1,
-                commands: makeUnlockWethCommand(0.1 ether)
-            }),
-            proof,
-            makeMockProof(),
-            relayerRewardAddress
-        );
-    }
 }