Support Native ETH in v1

contracts/scripts/upgrades/polkadot/DeployGateway202502.sol

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pragma solidity 0.8.28;
+
+import {WETH9} from "canonical-weth/WETH9.sol";
+import {Script} from "forge-std/Script.sol";
+import {BeefyClient} from "../../../src/BeefyClient.sol";
+import {AgentExecutor} from "../../../src/AgentExecutor.sol";
+import {ParaID} from "../../../src/Types.sol";
+import {Gateway202502} from "../../../src/upgrades/Gateway202502.sol";
+import {SafeNativeTransfer} from "../../../src/utils/SafeTransfer.sol";
+import {stdJson} from "forge-std/StdJson.sol";
+import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
+
+contract DeployGateway202502 is Script {
+    address public constant BEEFY_CLIENT_ADDRESS = 0x6eD05bAa904df3DE117EcFa638d4CB84e1B8A00C;
+
+    function run() public {
+        vm.startBroadcast();
+
+        AgentExecutor executor = new AgentExecutor();
+        Gateway202502 gatewayLogic = new Gateway202502(
+            BEEFY_CLIENT_ADDRESS,
+            address(executor),
+            ParaID.wrap(1002),
+            0x03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314,
+            10,
+            20_000_000_000 // 2 DOT
+        );
+
+        vm.stopBroadcast();
+    }
+}

contracts/scripts/upgrades/westend/DeployGateway202502.sol

@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+pragma solidity 0.8.28;
+
+import {WETH9} from "canonical-weth/WETH9.sol";
+import {Script} from "forge-std/Script.sol";
+import {BeefyClient} from "../../../src/BeefyClient.sol";
+import {AgentExecutor} from "../../../src/AgentExecutor.sol";
+import {ParaID} from "../../../src/Types.sol";
+import {Gateway202502} from "../../../src/upgrades/Gateway202502.sol";
+import {SafeNativeTransfer} from "../../../src/utils/SafeTransfer.sol";
+import {stdJson} from "forge-std/StdJson.sol";
+import {UD60x18, ud60x18} from "prb/math/src/UD60x18.sol";
+
+contract DeployGateway202502 is Script {
+    address public constant BEEFY_CLIENT_ADDRESS = 0x6DFaD3D73A28c48E4F4c616ECda80885b415283a;
+
+    function run() public {
+        vm.startBroadcast();
+
+        AgentExecutor executor = new AgentExecutor();
+        Gateway202502 gatewayLogic = new Gateway202502(
+            BEEFY_CLIENT_ADDRESS,
+            address(executor),
+            ParaID.wrap(1002),
+            0x03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314,
+            12,
+            2_000_000_000_000 // 2 DOT
+        );
+
+        vm.stopBroadcast();
+    }
+}

contracts/src/AgentExecutor.sol

@@ -15,24 +15,13 @@ contract AgentExecutor {
     using SafeTokenTransfer for IERC20;
     using SafeNativeTransfer for address payable;
 
-    /// @dev Transfer ether to `recipient`. Unlike `_transferToken` This logic is not nested within `execute`,
-    /// as the gateway needs to control an agent's ether balance directly.
-    function transferNative(address payable recipient, uint256 amount) external {
+    /// @dev Transfer ether to `recipient`.
+    function transferEther(address payable recipient, uint256 amount) external {
         recipient.safeNativeTransfer(amount);
     }
 
-    /// @dev Transfer ether to Gateway. Used once off for migration purposes. Can be removed after version 1.
-    function transferEtherToGateway(uint256 amount) external {
-        IGateway(msg.sender).depositEther{value: amount}();
-    }
-
-    /// @dev Transfer ERC20 to `recipient`. Only callable via `execute`.
+    /// @dev Transfer ERC20 to `recipient`.
     function transferToken(address token, address recipient, uint128 amount) external {
-        _transferToken(token, recipient, amount);
-    }
-
-    /// @dev Transfer ERC20 to `recipient`. Only callable via `execute`.
-    function _transferToken(address token, address recipient, uint128 amount) internal {
         IERC20(token).safeTransfer(recipient, amount);
     }
 }

contracts/src/Assets.sol

@@ -116,12 +116,8 @@ library Assets {
             revert TokenNotRegistered();
         }
 
-        if (token == address(0)) {
-            return _sendEther(
-                sender, destinationChain, destinationAddress, destinationChainFee, maxDestinationChainFee, amount
-            );
-        } else if (info.foreignID == bytes32(0)) {
-            return _sendNativeToken(
+        if (info.foreignID == bytes32(0)) {
+            return _sendNativeTokenOrEther(
                 token, sender, destinationChain, destinationAddress, destinationChainFee, maxDestinationChainFee, amount
             );
         } else {
@@ -208,10 +204,6 @@ library Assets {
     ) internal returns (Ticket memory ticket) {
         AssetsStorage.Layout storage $ = AssetsStorage.layout();
 
-        if (msg.value < amount) {
-            revert InvalidAmount();
-        }
-
         ticket = _emitSendNativeTokenTicket(
             address(0),
             sender,
@@ -223,14 +215,10 @@ library Assets {
             maxDestinationChainFee,
             amount
         );
-        ticket.value = amount;
-
-        // Lock Native Ether into AssetHub's agent contract
-        payable($.assetHubAgent).safeNativeTransfer(amount);
     }
 
     // @dev Transfer ERC20(Ethereum-native) tokens to Polkadot
-    function _sendNativeToken(
+    function _sendNativeTokenOrEther(
         address token,
         address sender,
         ParaID destinationChain,
@@ -241,21 +229,66 @@ library Assets {
     ) internal returns (Ticket memory ticket) {
         AssetsStorage.Layout storage $ = AssetsStorage.layout();
 
-        ticket = _emitSendNativeTokenTicket(
-            token,
-            sender,
-            $.assetHubParaID,
-            destinationChain,
-            destinationAddress,
-            $.assetHubReserveTransferFee,
-            destinationChainFee,
-            maxDestinationChainFee,
-            amount
-        );
-        ticket.value = 0;
+        if (token != address(0)) {
+            // Lock ERC20
+            _transferToAgent($.assetHubAgent, token, sender, amount);
+        } else {
+            // Lock Ether
+            if (msg.value < amount) {
+                revert InvalidAmount();
+            }
+            // Lock Ether
+            payable($.assetHubAgent).safeNativeTransfer(amount);
+            ticket.value = amount;
+        }
 
-        // Lock the ERC20 into AssetHub's agent contract
-        _transferToAgent($.assetHubAgent, token, sender, amount);
+        ticket.dest = $.assetHubParaID;
+        ticket.costs = _sendTokenCosts(destinationChain, destinationChainFee, maxDestinationChainFee);
+
+        // Construct a message payload
+        if (destinationChain == $.assetHubParaID) {
+            // The funds will be minted into the receiver's account on AssetHub
+            if (destinationAddress.isAddress32()) {
+                // The receiver has a 32-byte account ID
+                ticket.payload = SubstrateTypes.SendTokenToAssetHubAddress32(
+                    token, destinationAddress.asAddress32(), $.assetHubReserveTransferFee, amount
+                );
+            } else {
+                // AssetHub does not support 20-byte account IDs
+                revert Unsupported();
+            }
+        } else {
+            if (destinationChainFee == 0) {
+                revert InvalidDestinationFee();
+            }
+            // The funds will be minted into sovereign account of the destination parachain on AssetHub,
+            // and then reserve-transferred to the receiver's account on the destination parachain.
+            if (destinationAddress.isAddress32()) {
+                // The receiver has a 32-byte account ID
+                ticket.payload = SubstrateTypes.SendTokenToAddress32(
+                    token,
+                    destinationChain,
+                    destinationAddress.asAddress32(),
+                    $.assetHubReserveTransferFee,
+                    destinationChainFee,
+                    amount
+                );
+            } else if (destinationAddress.isAddress20()) {
+                // The receiver has a 20-byte account ID
+                ticket.payload = SubstrateTypes.SendTokenToAddress20(
+                    token,
+                    destinationChain,
+                    destinationAddress.asAddress20(),
+                    $.assetHubReserveTransferFee,
+                    destinationChainFee,
+                    amount
+                );
+            } else {
+                revert Unsupported();
+            }
+        }
+
+        emit IGateway.TokenSent(token, sender, destinationChain, destinationAddress, amount);
     }
 
     // @dev Transfer Polkadot-native tokens back to Polkadot
@@ -371,7 +404,7 @@ library Assets {
             call = abi.encodeCall(AgentExecutor.transferToken, (token, recipient, amount));
         } else {
             // Native ETH
-            call = abi.encodeCall(AgentExecutor.transferNative, (payable(recipient), amount));
+            call = abi.encodeCall(AgentExecutor.transferEther, (payable(recipient), amount));
         }
         (bool success,) = Agent(payable(agent)).invoke(executor, call);
         if (!success) {

contracts/src/Gateway.sol

@@ -296,15 +296,11 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         return ERC1967.load();
     }
 
-    function version() public view returns (uint64) {
-        return CoreStorage.layout().version;
-    }
-
     /**
      * Fee management
      */
     function depositEther() external payable {
-        emit EtherDeposited(msg.sender, msg.value);
+        emit Deposited(msg.sender, msg.value);
     }
 
     /**
@@ -556,7 +552,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
 
         // The fee is already collected into the gateway contract
         // Reimburse excess fee payment
-        uint256 excessFee = (msg.value - totalEther);
+        uint256 excessFee = msg.value - totalEther;
         if (excessFee > _dustThreshold()) {
             payable(msg.sender).safeNativeTransfer(excessFee);
         }
@@ -701,9 +697,10 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         assets.registerTokenFee = config.registerTokenFee;
         assets.assetHubCreateAssetFee = config.assetHubCreateAssetFee;
         assets.assetHubReserveTransferFee = config.assetHubReserveTransferFee;
+
         // Register native Ether
-        TokenInfo storage nativeEther = assets.tokenRegistry[address(0)];
-        nativeEther.isRegistered = true;
+        TokenInfo storage etherTokenInfo = assets.tokenRegistry[address(0)];
+        etherTokenInfo.isRegistered = true;
 
         // Initialize operator storage
         OperatorStorage.Layout storage operatorStorage = OperatorStorage.layout();

contracts/src/Types.sol

@@ -107,6 +107,7 @@ struct Ticket {
     ParaID dest;
     Costs costs;
     bytes payload;
+    // amount of native ether to be sent
     uint128 value;
 }
 

contracts/src/interfaces/IGateway.sol

@@ -36,7 +36,7 @@ interface IGateway {
     event ForeignTokenRegistered(bytes32 indexed tokenID, address token);
 
     // Emitted when ether is deposited
-    event EtherDeposited(address who, uint256 amount);
+    event Deposited(address sender, uint256 amount);
 
     /**
      * Getters
@@ -53,8 +53,6 @@ interface IGateway {
 
     function implementation() external view returns (address);
 
-    function version() external view returns (uint64);
-
     /**
      * Fee management
      */

contracts/src/storage/CoreStorage.sol

@@ -14,8 +14,6 @@ library CoreStorage {
         mapping(bytes32 agentID => address) agents;
         // Agent addresses
         mapping(address agent => bytes32 agentID) agentAddresses;
-        // Version of the Gateway Implementation
-        uint64 version;
     }
 
     bytes32 internal constant SLOT = keccak256("org.snowbridge.storage.core");

contracts/src/upgrades/Gateway202410.sol → contracts/src/upgrades/Gateway202502.sol

@@ -5,7 +5,7 @@ pragma solidity 0.8.28;
 import "../Gateway.sol";
 
 // New `Gateway` logic contract for the `GatewayProxy` deployed on mainnet
-contract Gateway202410 is Gateway {
+contract Gateway202502 is Gateway {
     constructor(
         address beefyClient,
         address agentExecutor,
@@ -31,21 +31,9 @@ contract Gateway202410 is Gateway {
             revert Unauthorized();
         }
 
-        // We expect version 0, deploying version 1.
-        CoreStorage.Layout storage $ = CoreStorage.layout();
-        if ($.version != 0) {
-            revert Unauthorized();
-        }
-        $.version = 1;
-
-        // migrate asset hub agent
-        address agent = _ensureAgent(hex"81c5ab2571199e3188135178f3c2c8e2d268be1313d029b30f534fa579b69b79");
-        bytes memory call = abi.encodeCall(AgentExecutor.transferEtherToGateway, (agent.balance));
-        _invokeOnAgent(agent, call);
-
         // Register native Ether
         AssetsStorage.Layout storage assets = AssetsStorage.layout();
-        TokenInfo storage nativeEther = assets.tokenRegistry[address(0)];
-        nativeEther.isRegistered = true;
+        TokenInfo storage tokenInfo = assets.tokenRegistry[address(0)];
+        tokenInfo.isRegistered = true;
     }
 }