support native token

Author: fernandomg

typescript/solver/solvers/hyperlane7683/filler.ts

@@ -1,4 +1,5 @@
-import { type MultiProvider } from "@hyperlane-xyz/sdk";
+import { AddressZero } from "@ethersproject/constants";
+import type { MultiProvider } from "@hyperlane-xyz/sdk";
 import {
   addressToBytes32,
   bytes32ToAddress,
@@ -20,8 +21,8 @@ import {
   settleOrder,
 } from "./utils.js";
 
-import { allowBlockLists, metadata } from "./config/index.js";
 import { chainIdsToName, isAllowedIntent } from "../../config/index.js";
+import { allowBlockLists, metadata } from "./config/index.js";
 
 export const create = (multiProvider: MultiProvider) => {
   const { protocolName } = setup();
@@ -146,38 +147,48 @@ async function fill(
   });
 
   await Promise.all(
-    maxSpent.map(async ({ chainId, token, amount, recipient }) => {
-      token = bytes32ToAddress(token);
-      recipient = bytes32ToAddress(recipient);
-      const _chainId = chainId.toString();
-
-      const filler = multiProvider.getSigner(_chainId);
-      const tx = await Erc20__factory.connect(token, filler).approve(
-        recipient,
-        amount,
-      );
+    maxSpent.map(
+      async ({ amount, chainId, recipient, token: tokenAddress }) => {
+        tokenAddress = bytes32ToAddress(tokenAddress);
+        recipient = bytes32ToAddress(recipient);
+        const _chainId = chainId.toString();
+
+        const filler = multiProvider.getSigner(_chainId);
 
-      const receipt = await tx.wait();
-      const baseUrl =
-        multiProvider.getChainMetadata(_chainId).blockExplorers?.[0].url;
+        if (tokenAddress === AddressZero) {
+          // native token
+          return;
+        }
 
-      if (baseUrl) {
-        log.debug(
-          `${protocolName} - Approval Tx: ${baseUrl}/tx/${receipt.transactionHash}`,
+        const tx = await Erc20__factory.connect(tokenAddress, filler).approve(
+          recipient,
+          amount,
         );
-      } else {
-        log.debug(`${protocolName} - Approval Tx: ${receipt.transactionHash}`);
-      }
 
-      log.debug(
-        `${protocolName} - Approved ${amount.toString()} of ${token} to ${recipient} on ${_chainId}`,
-      );
-    }),
+        const receipt = await tx.wait();
+        const baseUrl =
+          multiProvider.getChainMetadata(_chainId).blockExplorers?.[0].url;
+
+        if (baseUrl) {
+          log.debug(
+            `${protocolName} - Approval Tx: ${baseUrl}/tx/${receipt.transactionHash}`,
+          );
+        } else {
+          log.debug(
+            `${protocolName} - Approval Tx: ${receipt.transactionHash}`,
+          );
+        }
+
+        log.debug(
+          `${protocolName} - Approved ${amount.toString()} of ${tokenAddress} to ${recipient} on ${_chainId}`,
+        );
+      },
+    ),
   );
 
   await Promise.all(
     fillInstructions.map(
-      async ({ destinationChainId, destinationSettler, originData }) => {
+      async ({ destinationChainId, destinationSettler, originData }, index) => {
         destinationSettler = bytes32ToAddress(destinationSettler);
         const _chainId = destinationChainId.toString();
 
@@ -195,6 +206,7 @@ async function fill(
           orderId,
           originData,
           addressToBytes32(fillerAddress),
+          { value: maxSpent[index].amount },
         );
 
         const receipt = await tx.wait();

typescript/solver/solvers/hyperlane7683/utils.ts

@@ -7,11 +7,11 @@ import { Erc20__factory } from "../../typechain/factories/contracts/Erc20__facto
 
 import type { Provider } from "@ethersproject/abstract-provider";
 import { bytes32ToAddress } from "@hyperlane-xyz/utils";
+import { chainIdsToName } from "../../config/index.js";
 import { createLogger } from "../../logger.js";
 import { Hyperlane7683__factory } from "../../typechain/factories/hyperlane7683/contracts/Hyperlane7683__factory.js";
-import type { ResolvedCrossChainOrder } from "./types.js";
-import { chainIdsToName } from "../../config/index.js";
 import { metadata } from "./config/index.js";
+import type { ResolvedCrossChainOrder } from "./types.js";
 
 export const log = createLogger(metadata.protocolName);
 
@@ -138,8 +138,23 @@ export async function retrieveOriginInfo(
 ): Promise<Array<string>> {
   const originInfo = await Promise.all(
     resolvedOrder.minReceived.map(async ({ amount, chainId, token }) => {
+      const tokenAddress = bytes32ToAddress(token);
+
+      // native token
+      if (tokenAddress === AddressZero) {
+        const { nativeToken } = multiProvider.getChainMetadata(
+          chainId.toString(),
+        );
+
+        return {
+          amount,
+          decimals: nativeToken?.decimals ?? 18,
+          symbol: nativeToken?.symbol ?? "ETH",
+        };
+      }
+
       const erc20 = Erc20__factory.connect(
-        bytes32ToAddress(token),
+        tokenAddress,
         multiProvider.getProvider(chainId.toString()),
       );
       const [decimals, symbol] = await Promise.all([
@@ -166,20 +181,35 @@ export async function retrieveTargetInfo(
 ): Promise<Array<string>> {
   const targetInfo = await Promise.all(
     resolvedOrder.maxSpent.map(async ({ amount, chainId, token }) => {
+      const tokenAddress = bytes32ToAddress(token);
+
+      if (tokenAddress === AddressZero) {
+        const { nativeToken } = multiProvider.getChainMetadata(
+          chainId.toString(),
+        );
+
+        return {
+          amount,
+          chainId,
+          decimals: nativeToken?.decimals ?? 18,
+          symbol: nativeToken?.symbol ?? "ETH",
+        };
+      }
+
       const erc20 = Erc20__factory.connect(
-        bytes32ToAddress(token),
+        tokenAddress,
         multiProvider.getProvider(chainId.toString()),
       );
       const [decimals, symbol] = await Promise.all([
         erc20.decimals(),
         erc20.symbol(),
       ]);
 
-      return { amount, decimals, symbol, chainId };
+      return { amount, chainId, decimals, symbol };
     }),
   );
 
-  return targetInfo.map(({ amount, decimals, symbol, chainId }) => {
+  return targetInfo.map(({ amount, chainId, decimals, symbol }) => {
     const destinationChain =
       chainIdsToName[chainId.toNumber()] ?? "UNKNOWN_CHAIN";
     return `${formatUnits(amount, decimals)} ${symbol} on ${destinationChain}`;