Merge pull request #28 from skip-mev/jw/eureka-native-transfer

support native tokens in EurekaHandler.transfer

Author: thal0x

EurekaHandler/src/EurekaHandler.sol

@@ -10,6 +10,7 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
 import {IICS20TransferMsgs, IICS20Transfer} from "./interfaces/eureka/ICS20Transfer.sol";
 import {IIBCVoucher} from "./interfaces/lombard/IIBCVoucher.sol";
 import {IEurekaHandler} from "./interfaces/IEurekaHandler.sol";
+import {IWETH} from "./interfaces/IWETH.sol";
 
 contract EurekaHandler is IEurekaHandler, Initializable, UUPSUpgradeable, OwnableUpgradeable {
     using SafeERC20 for IERC20;
@@ -41,16 +42,21 @@ contract EurekaHandler is IEurekaHandler, Initializable, UUPSUpgradeable, Ownabl
         lbtc = _lbtc;
     }
 
-    function transfer(uint256 amount, TransferParams memory transferParams, Fees memory fees) external {
+    function transfer(uint256 amount, TransferParams memory transferParams, Fees memory fees) external payable {        
         require(block.timestamp < fees.quoteExpiry, "Fee quote expired");
 
+        if (msg.value > 0) {
+            require(msg.value == amount + fees.relayFee, "Insufficient native token");
+            IWETH(transferParams.token).deposit{value: msg.value}();
+        } else {
+            IERC20(transferParams.token).safeTransferFrom(msg.sender, address(this), amount + fees.relayFee);
+        }
+
         // Collect fees
         if (fees.relayFee > 0) {
-            IERC20(transferParams.token).safeTransferFrom(msg.sender, fees.relayFeeRecipient, fees.relayFee);
+            IERC20(transferParams.token).safeTransfer(fees.relayFeeRecipient, fees.relayFee);
         }
 
-        IERC20(transferParams.token).safeTransferFrom(msg.sender, address(this), amount);
-
         _sendTransfer(
             IICS20TransferMsgs.SendTransferMsg({
                 denom: transferParams.token,

EurekaHandler/src/interfaces/IEurekaHandler.sol

@@ -17,7 +17,7 @@ interface IEurekaHandler {
         uint64 quoteExpiry;
     }
 
-    function transfer(uint256 amount, TransferParams memory transferParams, Fees memory fees) external;
+    function transfer(uint256 amount, TransferParams memory transferParams, Fees memory fees) external payable;
 
     function swapAndTransfer(
         address swapInputToken,

EurekaHandler/src/interfaces/IWETH.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.18;
+
+interface IWETH {
+    function deposit() external payable;
+
+    function withdraw(uint256 value) external;
+}

EurekaHandler/test/EurekaHandler.t.sol

@@ -8,7 +8,7 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {EurekaHandler, IEurekaHandler} from "../src/EurekaHandler.sol";
 import {IICS20Transfer, IICS20TransferMsgs} from "../src/interfaces/eureka/ICS20Transfer.sol";
 import {IIBCVoucher} from "../src/interfaces/lombard/IIBCVoucher.sol";
-
+import {IWETH} from "../src/interfaces/IWETH.sol";
 contract EurekaHandlerTest is Test {
     address ics20Transfer = 0xbb87C1ACc6306ad2233a4c7BBE75a1230409b358;
     address swapRouter = 0x3bFA4769FB09eefC5a80d6E87c3B9C650f7Ae48E;
@@ -97,6 +97,53 @@ contract EurekaHandlerTest is Test {
         handler.transfer(amount, transferParams, fees);
     }
 
+    function testTransferWithNativeToken() public {
+        address token = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2;
+        uint256 amount = 1_000_000;
+
+        IEurekaHandler.TransferParams memory transferParams = IEurekaHandler.TransferParams({
+            token: token,
+            recipient: "cosmos1234",
+            sourceClient: "client-0",
+            destPort: "transfer",
+            timeoutTimestamp: uint64(block.timestamp + 100),
+            memo: ""
+        });
+
+        IEurekaHandler.Fees memory fees = IEurekaHandler.Fees({
+            relayFee: 100,
+            relayFeeRecipient: relayFeeRecipient,
+            quoteExpiry: uint64(block.timestamp + 100)
+        });
+
+        address alice = makeAddr("alice");
+
+        vm.mockCall(token, abi.encodeWithSelector(IWETH.deposit.selector), abi.encode(true));
+
+        vm.mockCall(
+            address(ics20Transfer),
+            abi.encodeWithSelector(
+                IICS20Transfer.sendTransferWithSender.selector,
+                IICS20TransferMsgs.SendTransferMsg({
+                    denom: token,
+                    amount: amount,
+                    receiver: transferParams.recipient,
+                    sourceClient: transferParams.sourceClient,
+                    destPort: transferParams.destPort,
+                    timeoutTimestamp: transferParams.timeoutTimestamp,
+                    memo: transferParams.memo
+                }),
+                alice
+            ),
+            abi.encode(1)
+        );        
+
+        vm.deal(alice, amount + fees.relayFee);
+
+        vm.startPrank(alice);
+        handler.transfer{value: amount + fees.relayFee}(amount, transferParams, fees);
+    }
+
     function testSwapAndTransfer() public {
         address weth = 0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14;
         address usdc = 0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238;