@hyperbridge/sdk 1.3.14 → 1.3.16

package/dist/browser/index.d.ts

@@ -2611,6 +2611,7 @@ declare class IntentGateway {
      *
      * @param feeTokenAmount - The amount in fee token (DAI)
      * @param getQuoteIn - Whether to use "source" or "dest" chain for the conversion
+     * @param evmChainID - The EVM chain ID in format "EVM-{id}"
      * @returns The fee token amount converted to native token amount
      * @private
      */
@@ -2621,6 +2622,7 @@ declare class IntentGateway {
      *
      * @param gasEstimate - The estimated gas units
      * @param gasEstimateIn - Whether to use "source" or "dest" chain for the conversion
+     * @param evmChainID - The EVM chain ID in format "EVM-{id}"
      * @returns The gas cost converted to fee token amount
      * @private
      */
@@ -2656,10 +2658,11 @@ declare class IntentGateway {
      * @param tokenIn - The address of the input token
      * @param tokenOut - The address of the output token
      * @param amountIn - The input amount to swap
+     * @param evmChainID - The EVM chain ID in format "EVM-{id}"
      * @param selectedProtocol - Optional specific protocol to use ("v2", "v3", or "v4")
      * @returns Object containing the best protocol, expected output amount, and fee tier (for V3/V4)
      */
-    findBestProtocolWithAmountIn(getQuoteIn: "source" | "dest", tokenIn: HexString, tokenOut: HexString, amountIn: bigint, selectedProtocol?: "v2" | "v3" | "v4"): Promise<{
+    findBestProtocolWithAmountIn(getQuoteIn: "source" | "dest", tokenIn: HexString, tokenOut: HexString, amountIn: bigint, evmChainID: string, selectedProtocol?: "v2" | "v3" | "v4"): Promise<{
         protocol: "v2" | "v3" | "v4" | null;
         amountOut: bigint;
         fee?: number;

package/dist/browser/index.js

@@ -2,7 +2,7 @@ import { createConsola, LogLevels } from 'consola';
 import { flatten, zip, capitalize, maxBy, isNil } from 'lodash-es';
 import { toHex, hexToBytes, encodePacked, keccak256, encodeAbiParameters, bytesToHex, concatHex, createPublicClient, http, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, maxUint256, formatUnits, parseUnits, hexToString as hexToString$1 } from 'viem';
 import mergeRace from '@async-generator/merge-race';
-import { gnosisChiado, gnosis, bscTestnet, bsc, soneium, baseSepolia, base, optimismSepolia, optimism, arbitrumSepolia, arbitrum, mainnet, unichain, polygon, sepolia } from 'viem/chains';
+import { unichain, polygon, gnosisChiado, gnosis, bscTestnet, bsc, soneium, baseSepolia, base, optimismSepolia, optimism, arbitrumSepolia, arbitrum, mainnet, sepolia } from 'viem/chains';
 import { hasWindow, isNode, env } from 'std-env';
 import { Vector, u8, Struct, Tuple, Enum, _void, u64, u32, Option, bool, u128, Bytes } from 'scale-ts';
 import { match } from 'ts-pattern';
@@ -3443,7 +3443,7 @@ var assets = {
     USDT: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2".toLowerCase()
   },
   ["EVM-137" /* POLYGON_MAINNET */]: {
-    WETH: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619".toLowerCase(),
+    WETH: "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270".toLowerCase(),
     DAI: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063".toLowerCase(),
     USDC: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359".toLowerCase(),
     USDT: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F".toLowerCase()
@@ -4643,7 +4643,9 @@ var chains = {
   [bsc.id]: bsc,
   [bscTestnet.id]: bscTestnet,
   [gnosis.id]: gnosis,
-  [gnosisChiado.id]: gnosisChiado
+  [gnosisChiado.id]: gnosisChiado,
+  [polygon.id]: polygon,
+  [unichain.id]: unichain
 };
 var DEFAULT_ADDRESS = "0x0000000000000000000000000000000000000000";
 var EvmChain = class {
@@ -11749,7 +11751,11 @@ var IntentGateway = class {
     const { decimals: sourceChainFeeTokenDecimals } = await this.source.getFeeTokenWithDecimals();
     const { address: destChainFeeTokenAddress, decimals: destChainFeeTokenDecimals } = await this.dest.getFeeTokenWithDecimals();
     const { gas: postGasEstimate, postRequestCalldata } = await this.source.estimateGas(postRequest);
-    const postGasEstimateInSourceFeeToken = await this.convertGasToFeeToken(postGasEstimate, "source");
+    const postGasEstimateInSourceFeeToken = await this.convertGasToFeeToken(
+      postGasEstimate,
+      "source",
+      order.sourceChain
+    );
     const relayerFeeInSourceFeeToken = postGasEstimateInSourceFeeToken + 25n * 10n ** BigInt(sourceChainFeeTokenDecimals - 2);
     const relayerFeeInDestFeeToken = adjustFeeDecimals(
       relayerFeeInSourceFeeToken,
@@ -11804,7 +11810,6 @@ var IntentGateway = class {
       }))
     ];
     let destChainFillGas = 0n;
-    let filledWithNativeToken = false;
     try {
       let protocolFeeInNativeToken = await this.quoteNative(postRequest, relayerFeeInDestFeeToken);
       protocolFeeInNativeToken = protocolFeeInNativeToken + protocolFeeInNativeToken * 50n / 10000n;
@@ -11817,7 +11822,6 @@ var IntentGateway = class {
         value: totalEthValue + protocolFeeInNativeToken,
         stateOverride: stateOverrides
       });
-      filledWithNativeToken = true;
     } catch {
       console.warn(
         `Could not estimate gas for fill order with native token as fees for chain ${order.destChain}, now trying with fee token as fees`
@@ -11852,7 +11856,7 @@ var IntentGateway = class {
         stateOverride: stateOverrides
       });
     }
-    const fillGasInDestFeeToken = await this.convertGasToFeeToken(destChainFillGas, "dest");
+    const fillGasInDestFeeToken = await this.convertGasToFeeToken(destChainFillGas, "dest", order.destChain);
     const fillGasInSourceFeeToken = adjustFeeDecimals(
       fillGasInDestFeeToken,
       destChainFeeTokenDecimals,
@@ -11864,7 +11868,11 @@ var IntentGateway = class {
       sourceChainFeeTokenDecimals
     );
     let totalEstimateInSourceFeeToken = fillGasInSourceFeeToken + protocolFeeInSourceFeeToken + relayerFeeInSourceFeeToken;
-    let totalNativeTokenAmount = await this.convertFeeTokenToNative(totalEstimateInSourceFeeToken, "source");
+    let totalNativeTokenAmount = await this.convertFeeTokenToNative(
+      totalEstimateInSourceFeeToken,
+      "source",
+      order.sourceChain
+    );
     if ([order.destChain, order.sourceChain].includes("EVM-1")) {
       totalEstimateInSourceFeeToken = totalEstimateInSourceFeeToken + totalEstimateInSourceFeeToken * 3000n / 10000n;
       totalNativeTokenAmount = totalNativeTokenAmount + totalNativeTokenAmount * 3200n / 10000n;
@@ -11884,12 +11892,12 @@ var IntentGateway = class {
    *
    * @param feeTokenAmount - The amount in fee token (DAI)
    * @param getQuoteIn - Whether to use "source" or "dest" chain for the conversion
+   * @param evmChainID - The EVM chain ID in format "EVM-{id}"
    * @returns The fee token amount converted to native token amount
    * @private
    */
-  async convertFeeTokenToNative(feeTokenAmount, getQuoteIn) {
+  async convertFeeTokenToNative(feeTokenAmount, getQuoteIn, evmChainID) {
     const client = this[getQuoteIn].client;
-    const evmChainID = `EVM-${client.chain?.id}`;
     const wethAsset = this[getQuoteIn].config.getWrappedNativeAssetWithDecimals(evmChainID).asset;
     const feeToken = await this[getQuoteIn].getFeeTokenWithDecimals();
     try {
@@ -11898,6 +11906,7 @@ var IntentGateway = class {
         feeToken.address,
         wethAsset,
         feeTokenAmount,
+        evmChainID,
         "v2"
       );
       if (amountOut === 0n) {
@@ -11906,7 +11915,7 @@ var IntentGateway = class {
       return amountOut;
     } catch {
       const nativeCurrency = client.chain?.nativeCurrency;
-      const chainId = client.chain?.id;
+      const chainId = Number.parseInt(evmChainID.split("-")[1]);
       const feeTokenAmountDecimal = new Decimal(formatUnits(feeTokenAmount, feeToken.decimals));
       const nativeTokenPriceUsd = new Decimal(await fetchPrice(nativeCurrency?.symbol, chainId));
       const totalCostInNativeToken = feeTokenAmountDecimal.dividedBy(nativeTokenPriceUsd);
@@ -11919,14 +11928,14 @@ var IntentGateway = class {
    *
    * @param gasEstimate - The estimated gas units
    * @param gasEstimateIn - Whether to use "source" or "dest" chain for the conversion
+   * @param evmChainID - The EVM chain ID in format "EVM-{id}"
    * @returns The gas cost converted to fee token amount
    * @private
    */
-  async convertGasToFeeToken(gasEstimate, gasEstimateIn) {
+  async convertGasToFeeToken(gasEstimate, gasEstimateIn, evmChainID) {
     const client = this[gasEstimateIn].client;
     const gasPrice = await client.getGasPrice();
     const gasCostInWei = gasEstimate * gasPrice;
-    const evmChainID = `EVM-${client.chain?.id}`;
     const wethAddr = this[gasEstimateIn].config.getWrappedNativeAssetWithDecimals(evmChainID).asset;
     const feeToken = await this[gasEstimateIn].getFeeTokenWithDecimals();
     try {
@@ -11935,15 +11944,17 @@ var IntentGateway = class {
         wethAddr,
         feeToken.address,
         gasCostInWei,
+        evmChainID,
         "v2"
       );
       if (amountOut === 0n) {
+        console.log("Amount out not found");
         throw new Error();
       }
       return amountOut;
     } catch {
       const nativeCurrency = client.chain?.nativeCurrency;
-      const chainId = client.chain?.id;
+      const chainId = Number.parseInt(evmChainID.split("-")[1]);
       const gasCostInToken = new Decimal(formatUnits(gasCostInWei, nativeCurrency?.decimals));
       const tokenPriceUsd = await fetchPrice(nativeCurrency?.symbol, chainId);
       const gasCostUsd = gasCostInToken.times(tokenPriceUsd);
@@ -12149,12 +12160,12 @@ var IntentGateway = class {
    * @param tokenIn - The address of the input token
    * @param tokenOut - The address of the output token
    * @param amountIn - The input amount to swap
+   * @param evmChainID - The EVM chain ID in format "EVM-{id}"
    * @param selectedProtocol - Optional specific protocol to use ("v2", "v3", or "v4")
    * @returns Object containing the best protocol, expected output amount, and fee tier (for V3/V4)
    */
-  async findBestProtocolWithAmountIn(getQuoteIn, tokenIn, tokenOut, amountIn, selectedProtocol) {
+  async findBestProtocolWithAmountIn(getQuoteIn, tokenIn, tokenOut, amountIn, evmChainID, selectedProtocol) {
     const client = this[getQuoteIn].client;
-    const evmChainID = `EVM-${client.chain?.id}`;
     let amountOutV2 = BigInt(0);
     let amountOutV3 = BigInt(0);
     let amountOutV4 = BigInt(0);
@@ -12354,7 +12365,7 @@ var IntentGateway = class {
           if (!value) throw new Error("Receipt not found");
           return value;
         },
-        { maxRetries: 5, backoffMs: 5e3, logMessage: "Checking for receipt" }
+        { maxRetries: 10, backoffMs: 5e3, logMessage: "Checking for receipt" }
       );
     }
     console.log("Hyperbridge Receipt confirmed.");
@@ -12431,34 +12442,74 @@ var IntentGateway = class {
     const sourceStatusStream = indexerClient.getRequestStatusStream(commitment);
     for await (const statusUpdate of sourceStatusStream) {
       if (statusUpdate.status === RequestStatus.SOURCE_FINALIZED) {
-        const sourceHeight = BigInt(statusUpdate.metadata.blockNumber);
-        const proof = await this.source.queryProof(
-          { Requests: [commitment] },
-          hyperbridgeConfig.stateMachineId,
-          sourceHeight
-        );
-        const sourceIProof = {
-          height: sourceHeight,
-          stateMachine: sourceStateMachine,
-          consensusStateId: sourceConsensusStateId,
-          proof
+        let sourceHeight = BigInt(statusUpdate.metadata.blockNumber);
+        let proof;
+        const checkIfAlreadyDelivered = async () => {
+          const currentStatus = await indexerClient.queryGetRequestWithStatus(commitment);
+          return currentStatus?.statuses.some(
+            (status) => status.status === RequestStatus.HYPERBRIDGE_DELIVERED
+          ) ?? false;
         };
-        yield { status: "SOURCE_PROOF_RECEIVED", data: sourceIProof };
-        const getRequestMessage = {
-          kind: "GetRequest",
-          requests: [getRequest],
-          source: sourceIProof,
-          response: destIProof,
-          signer: pad("0x")
-        };
-        await waitForChallengePeriod(hyperbridge, {
-          height: sourceHeight,
-          id: {
-            stateId: parseStateMachineId(sourceStateMachine).stateId,
-            consensusStateId: sourceConsensusStateId
+        while (true) {
+          try {
+            proof = await this.source.queryProof(
+              { Requests: [commitment] },
+              hyperbridgeConfig.stateMachineId,
+              sourceHeight
+            );
+            break;
+          } catch {
+            const failedHeight = sourceHeight;
+            while (sourceHeight <= failedHeight) {
+              if (await checkIfAlreadyDelivered()) {
+                break;
+              }
+              const nextHeight = await retryPromise(
+                () => hyperbridge.latestStateMachineHeight({
+                  stateId: parseStateMachineId(sourceStateMachine).stateId,
+                  consensusStateId: sourceConsensusStateId
+                }),
+                {
+                  maxRetries: 5,
+                  backoffMs: 5e3,
+                  logMessage: "Failed to fetch latest state machine height (post-source-proof failure)"
+                }
+              );
+              if (nextHeight <= failedHeight) {
+                await sleep(1e4);
+                continue;
+              }
+              sourceHeight = nextHeight;
+            }
+            if (await checkIfAlreadyDelivered()) {
+              break;
+            }
           }
-        });
-        await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
+        }
+        if (proof) {
+          const sourceIProof = {
+            height: sourceHeight,
+            stateMachine: sourceStateMachine,
+            consensusStateId: sourceConsensusStateId,
+            proof
+          };
+          yield { status: "SOURCE_PROOF_RECEIVED", data: sourceIProof };
+          const getRequestMessage = {
+            kind: "GetRequest",
+            requests: [getRequest],
+            source: sourceIProof,
+            response: destIProof,
+            signer: pad("0x")
+          };
+          await waitForChallengePeriod(hyperbridge, {
+            height: sourceHeight,
+            id: {
+              stateId: parseStateMachineId(sourceStateMachine).stateId,
+              consensusStateId: sourceConsensusStateId
+            }
+          });
+          await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
+        }
       }
       yield statusUpdate;
     }