@hyperbridge/sdk 1.3.22 → 1.3.26

package/dist/browser/index.d.ts

@@ -1606,6 +1606,8 @@ declare class ChainConfigService {
     getUniswapV4QuoterAddress(chain: string): HexString;
     getPermit2Address(chain: string): HexString;
     getCoingeckoId(chain: string): string | undefined;
+    getEtherscanApiKey(): string | undefined;
+    getCalldispatcherAddress(chain: string): HexString;
 }
 
 /**
@@ -1854,6 +1856,16 @@ declare function orderCommitment(order: Order): HexString;
 declare function bytes32ToBytes20(bytes32Address: string): HexString;
 declare function bytes20ToBytes32(bytes20Address: string): HexString;
 declare function hexToString(hex: string): string;
+/**
+ * Retries a promise-returning operation with exponential backoff.
+ * This function will attempt to execute the operation up to maxRetries times,
+ * with an exponential backoff delay between attempts.
+ *
+ * @param operation The async operation to retry
+ * @param retryConfig Configuration object containing retry parameters
+ * @returns Promise that resolves with the operation result or rejects with the last error
+ */
+declare function retryPromise<T>(operation: () => Promise<T>, retryConfig: RetryConfig): Promise<T>;
 /**
  * Calculates the commitment hash for a get request.
  * @param get The get request to calculate the commitment hash for.
@@ -1881,6 +1893,11 @@ declare function estimateGasForPost(params: {
  */
 declare function constructRedeemEscrowRequestBody(order: Order, beneficiary: HexString): HexString;
 declare function fetchPrice(identifier: string, chainId?: number, apiKey?: string): Promise<number>;
+/**
+ * Fetches the current network gas price from an Etherscan-family explorer API.
+ * Returns the ProposeGasPrice (in gwei) converted to wei as bigint.
+ */
+declare function getGasPriceFromEtherscan(chainId: string, apiKey?: string): Promise<bigint>;
 /**
  * ERC20 method signatures used for storage slot detection
  */
@@ -1938,6 +1955,14 @@ declare function getStorageSlot(client: PublicClient, contractAddress: HexString
  * @returns The adjusted fee amount with the target decimal precision
  */
 declare function adjustFeeDecimals(feeInFeeToken: bigint, fromDecimals: number, toDecimals: number): bigint;
+/**
+ * Chains that should prefer the Etherscan API for gas price lookup
+ */
+declare const USE_ETHERSCAN_CHAINS: Set<string>;
+/**
+ * Testnet chains
+ */
+declare const TESTNET_CHAINS: Set<string>;
 
 interface SubstrateChainParams {
     ws: string;
@@ -2300,6 +2325,16 @@ declare class IndexerClient {
         commitmentTimestamp: bigint;
         chain: string;
     }): Promise<StateMachineUpdate | undefined>;
+    /**
+     * Query for the latest state machine update height
+     * @params statemachineId - ID of the state machine
+     * @params chain - The identifier for the chain where the state machine update should be queried (corresponds to a stateMachineId)
+     * @returns Latest height or undefined if no updates found
+     */
+    queryLatestStateMachineHeight({ statemachineId, chain, }: {
+        statemachineId: string;
+        chain: string;
+    }): Promise<bigint | undefined>;
     /**
      * Queries a request by CommitmentHash
      *
@@ -2764,6 +2799,13 @@ declare class IntentGateway {
         fee?: number;
         transactions?: Transaction[];
     }>;
+    createMultiHopSwapThroughPair(dexPairAddress: HexString, tokenIn: HexString, tokenOut: HexString, amountIn: bigint, evmChainID: string, getQuoteIn: "source" | "dest", recipient: HexString, protocol?: "v2" | "v3"): Promise<{
+        finalAmountOut: bigint;
+        calldata: Transaction[];
+    }>;
+    private buildSwapPath;
+    private executeSwapPath;
+    private createSwapCalldata;
     /**
      * Checks if an order has been filled by verifying the commitment status on-chain.
      * Reads the storage slot corresponding to the order's commitment hash.
@@ -3195,4 +3237,4 @@ declare const coingeckoIds: {
     "EVM-130": string;
 };
 
-export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BlockMetadata, type CancelOptions, type ChainConfig, ChainConfigService, type ChainId, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DispatchGet, type DispatchPost, ERC20Method, type EstimateGasCallData, EvmChain, type EvmChainParams, type ExecutionResult, type FillOptions, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, type IsmpRequest, type NewDeployment, type Order, type OrderResponse, OrderStatus, type OrderStatusMetadata, type OrderWithStatus, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, STATE_COMMITMENTS_SLOT, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, SubstrateChain, type SubstrateChainParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, type Transaction, WrappedNativeDecimals, type XcmGatewayParams, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, maxBigInt, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, teleport, teleportDot, viemChains };
+export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BlockMetadata, type CancelOptions, type ChainConfig, ChainConfigService, type ChainId, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DispatchGet, type DispatchPost, ERC20Method, type EstimateGasCallData, EvmChain, type EvmChainParams, type ExecutionResult, type FillOptions, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, type IsmpRequest, type NewDeployment, type Order, type OrderResponse, OrderStatus, type OrderStatusMetadata, type OrderWithStatus, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, STATE_COMMITMENTS_SLOT, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, SubstrateChain, type SubstrateChainParams, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, type Transaction, USE_ETHERSCAN_CHAINS, WrappedNativeDecimals, type XcmGatewayParams, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getGasPriceFromEtherscan, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, maxBigInt, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, viemChains };

package/dist/browser/index.js

@@ -3528,7 +3528,13 @@ var addresses = {
     ["EVM-130" /* UNICHAIN_MAINNET */]: "0x52f0e24d1c21c8a0cb1e5a5dd6198556bd9e1203"
   },
   Calldispatcher: {
-    ["EVM-11155111" /* SEPOLIA */]: "0xC7f13b6D03A0A7F3239d38897503E90553ABe155"
+    ["EVM-11155111" /* SEPOLIA */]: "0xC7f13b6D03A0A7F3239d38897503E90553ABe155",
+    ["EVM-1" /* MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
+    ["EVM-56" /* BSC_MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
+    ["EVM-42161" /* ARBITRUM_MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
+    ["EVM-8453" /* BASE_MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0xc71251c8b3e7b02697a84363eef6dce8dfbdf333"
   },
   Permit2: {
     ["EVM-1" /* MAINNET */]: "0x000000000022D473030F116dDEE9F6B43aC78BA3",
@@ -3643,6 +3649,12 @@ var ChainConfigService = class {
   getCoingeckoId(chain) {
     return coingeckoIds[chain];
   }
+  getEtherscanApiKey() {
+    return typeof process !== "undefined" ? process?.env?.ETHERSCAN_API_KEY : void 0;
+  }
+  getCalldispatcherAddress(chain) {
+    return addresses.Calldispatcher[chain];
+  }
 };
 function getPeakPosByHeight(height) {
   return (1n << BigInt(height + 1)) - 2n;
@@ -4525,6 +4537,24 @@ async function fetchPrice(identifier, chainId = 1, apiKey) {
   }
   return data[key].usd;
 }
+async function getGasPriceFromEtherscan(chainId, apiKey) {
+  let parsedChainId = Number(chainId.split("-")[1]);
+  const url = apiKey ? `https://api.etherscan.io/v2/api?chainid=${parsedChainId}&module=gastracker&action=gasoracle&apikey=${apiKey}` : `https://api.etherscan.io/v2/api?chainid=${parsedChainId}&module=gastracker&action=gasoracle`;
+  const response = await fetch(url);
+  const data = await response.json();
+  return gweiToWei(data.result.ProposeGasPrice);
+}
+function gweiToWei(gwei) {
+  if (!gwei || typeof gwei !== "string") {
+    throw new Error(`Invalid gwei value: ${gwei}`);
+  }
+  const [intPart, fracPartRaw] = gwei.split(".");
+  const fracPart = (fracPartRaw || "").slice(0, 9);
+  const fracPadded = fracPart.padEnd(9, "0");
+  const whole = BigInt(intPart || "0") * 1000000000n;
+  const fractional = BigInt(fracPadded || "0");
+  return whole + fractional;
+}
 var ERC20Method = /* @__PURE__ */ ((ERC20Method2) => {
   ERC20Method2["BALANCE_OF"] = "0x70a08231";
   ERC20Method2["ALLOWANCE"] = "0xdd62ed3e";
@@ -4631,6 +4661,8 @@ function adjustFeeDecimals(feeInFeeToken, fromDecimals, toDecimals) {
     return (feeInFeeToken + scaleFactor - 1n) / scaleFactor;
   }
 }
+var USE_ETHERSCAN_CHAINS = /* @__PURE__ */ new Set(["EVM-137", "EVM-56", "EVM-1"]);
+var TESTNET_CHAINS = /* @__PURE__ */ new Set(["EVM-10200", "EVM-97"]);
 function replaceWebsocketWithHttp(url) {
   if (url.startsWith("ws://")) {
     return url.replace("ws://", "http://");
@@ -6716,6 +6748,30 @@ query StateMachineUpdatesByTimestamp($statemachineId: String!, $commitmentTimest
     }
   }
 `;
+var LATEST_STATE_MACHINE_UPDATE = `
+query LatestStateMachineUpdate($statemachineId: String!, $chain: String!) {
+	stateMachineUpdateEvents(
+		filter: {
+			and: [
+				{ stateMachineId: { equalTo: $statemachineId } }
+				{ chain: { equalTo: $chain } }
+			]
+		}
+		orderBy: HEIGHT_DESC
+		first: 1
+	) {
+		nodes {
+			height
+			stateMachineId
+			chain
+			blockHash
+			blockNumber
+			transactionHash
+			createdAt
+		}
+	}
+}
+`;
 var ASSET_TELEPORTED_BY_PARAMS = `
 query AssetTeleportedByParams($id: String!) {
   assetTeleported(id: $id) {
@@ -7105,6 +7161,32 @@ var IndexerClient = class {
     logger.trace("Response >", first_node);
     return first_node;
   }
+  /**
+   * Query for the latest state machine update height
+   * @params statemachineId - ID of the state machine
+   * @params chain - The identifier for the chain where the state machine update should be queried (corresponds to a stateMachineId)
+   * @returns Latest height or undefined if no updates found
+   */
+  async queryLatestStateMachineHeight({
+    statemachineId,
+    chain
+  }) {
+    const logger = this.logger.withTag("[queryLatestStateMachineHeight]()");
+    const message = `querying latest StateMachineId(${statemachineId}) height in chain Chain(${chain})`;
+    const response = await this.withRetry(
+      () => {
+        return this.client.request(LATEST_STATE_MACHINE_UPDATE, {
+          statemachineId,
+          chain
+        });
+      },
+      { logger, logMessage: message }
+    );
+    const first_node = response?.stateMachineUpdateEvents?.nodes[0];
+    if (!first_node) return void 0;
+    logger.trace("Latest height >", first_node.height);
+    return BigInt(first_node.height);
+  }
   /**
    * Queries a request by CommitmentHash
    *
@@ -10331,6 +10413,37 @@ var UNISWAP_V4_QUOTER_ABI = [
   }
 ];
 
+// src/abis/uniswapV2Pair.ts
+var ABI6 = [
+  {
+    inputs: [],
+    name: "token0",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  },
+  {
+    inputs: [],
+    name: "token1",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address"
+      }
+    ],
+    stateMutability: "view",
+    type: "function"
+  }
+];
+var uniswapV2Pair_default = { ABI: ABI6 };
+
 // src/abis/permit2.ts
 var PERMIT2_ABI = [
   {
@@ -10363,7 +10476,7 @@ var PERMIT2_ABI = [
 ];
 
 // src/abis/universalRouter.ts
-var ABI6 = [
+var ABI7 = [
   {
     inputs: [
       {
@@ -10806,7 +10919,7 @@ var ABI6 = [
     type: "receive"
   }
 ];
-var universalRouter_default = { ABI: ABI6 };
+var universalRouter_default = { ABI: ABI7 };
 
 // src/protocols/intents.ts
 var IntentGateway = class {
@@ -11026,7 +11139,15 @@ var IntentGateway = class {
    */
   async convertGasToFeeToken(gasEstimate, gasEstimateIn, evmChainID) {
     const client = this[gasEstimateIn].client;
-    const gasPrice = await client.getGasPrice();
+    const useEtherscan = USE_ETHERSCAN_CHAINS.has(evmChainID);
+    const etherscanApiKey = useEtherscan ? this[gasEstimateIn].config.getEtherscanApiKey() : void 0;
+    const gasPrice = useEtherscan && etherscanApiKey ? await retryPromise(() => getGasPriceFromEtherscan(evmChainID, etherscanApiKey), {
+      maxRetries: 3,
+      backoffMs: 250
+    }).catch(async () => {
+      console.warn({ evmChainID }, "Error getting gas price from etherscan, using client's gas price");
+      return await client.getGasPrice();
+    }) : await client.getGasPrice();
     const gasCostInWei = gasEstimate * gasPrice;
     const wethAddr = this[gasEstimateIn].config.getWrappedNativeAssetWithDecimals(evmChainID).asset;
     const feeToken = await this[gasEstimateIn].getFeeTokenWithDecimals();
@@ -11098,8 +11219,8 @@ var IntentGateway = class {
         args: [amountOut, [tokenInForQuote, tokenOutForQuote]]
       });
       return v2AmountIn.result[0];
-    } catch (error) {
-      console.warn("V2 quote failed:", error);
+    } catch {
+      console.warn("V2 quote failed:");
       return maxUint256;
     }
   }
@@ -11122,8 +11243,8 @@ var IntentGateway = class {
         args: [amountIn, [tokenInForQuote, tokenOutForQuote]]
       });
       return v2AmountOut.result[1];
-    } catch (error) {
-      console.warn("V2 quote failed:", error);
+    } catch {
+      console.warn("V2 quote failed:");
       return BigInt(0);
     }
   }
@@ -11160,7 +11281,7 @@ var IntentGateway = class {
           bestAmountIn = amountIn;
           bestFee = fee;
         }
-      } catch (error) {
+      } catch {
         console.warn(`V3 quote failed for fee ${fee}, continuing to next fee tier`);
       }
     }
@@ -11199,7 +11320,7 @@ var IntentGateway = class {
           bestAmountOut = amountOut;
           bestFee = fee;
         }
-      } catch (error) {
+      } catch {
         console.warn(`V3 quote failed for fee ${fee}, continuing to next fee tier`);
       }
     }
@@ -11244,7 +11365,7 @@ var IntentGateway = class {
           bestAmountIn = amountIn;
           bestFee = fee;
         }
-      } catch (error) {
+      } catch {
         console.warn(`V4 quote failed for fee ${fee}, continuing to next fee tier`);
       }
     }
@@ -11289,7 +11410,7 @@ var IntentGateway = class {
           bestAmountOut = amountOut;
           bestFee = fee;
         }
-      } catch (error) {
+      } catch {
         console.warn(`V4 quote failed for fee ${fee}, continuing to next fee tier`);
       }
     }
@@ -12181,6 +12302,108 @@ var IntentGateway = class {
       };
     }
   }
+  async createMultiHopSwapThroughPair(dexPairAddress, tokenIn, tokenOut, amountIn, evmChainID, getQuoteIn, recipient, protocol = "v2") {
+    const client = this[getQuoteIn].client;
+    const wethAsset = this[getQuoteIn].config.getWrappedNativeAssetWithDecimals(evmChainID).asset;
+    const calldispatcher = this[getQuoteIn].config.getCalldispatcherAddress(evmChainID);
+    const [token0, token1] = await Promise.all([
+      client.readContract({
+        address: dexPairAddress,
+        abi: uniswapV2Pair_default.ABI,
+        functionName: "token0"
+      }),
+      client.readContract({
+        address: dexPairAddress,
+        abi: uniswapV2Pair_default.ABI,
+        functionName: "token1"
+      })
+    ]);
+    const intermediateToken = tokenOut.toLowerCase() === token0.toLowerCase() ? token1 : token0;
+    const swapPath = this.buildSwapPath(tokenIn, tokenOut, intermediateToken, wethAsset, calldispatcher, recipient);
+    return this.executeSwapPath(swapPath, amountIn, evmChainID, getQuoteIn, protocol);
+  }
+  buildSwapPath(tokenIn, tokenOut, intermediateToken, wethAsset, calldispatcher, recipient) {
+    const normalize = (token) => token.toLowerCase();
+    if (normalize(intermediateToken) === normalize(tokenIn)) {
+      return [{ from: tokenIn, to: tokenOut, recipient }];
+    }
+    if (normalize(intermediateToken) === normalize(wethAsset)) {
+      return [
+        { from: tokenIn, to: wethAsset, recipient: calldispatcher },
+        { from: wethAsset, to: tokenOut, recipient }
+      ];
+    }
+    return [
+      { from: tokenIn, to: wethAsset, recipient: calldispatcher },
+      { from: wethAsset, to: intermediateToken, recipient: calldispatcher },
+      { from: intermediateToken, to: tokenOut, recipient }
+    ];
+  }
+  async executeSwapPath(path, initialAmount, evmChainID, getQuoteIn, protocol) {
+    let currentAmount = initialAmount;
+    const calldata = [];
+    for (let i = 0; i < path.length; i++) {
+      const segment = path[i];
+      const isLastSwap = i === path.length - 1;
+      const slippage = isLastSwap && path.length > 1 ? 990n : 995n;
+      const swapResult = await this.createSwapCalldata(
+        protocol,
+        segment.from,
+        segment.to,
+        currentAmount,
+        segment.recipient,
+        evmChainID,
+        getQuoteIn,
+        slippage
+      );
+      currentAmount = swapResult.amountOut;
+      calldata.push(...swapResult.calldata);
+    }
+    return {
+      finalAmountOut: currentAmount,
+      calldata
+    };
+  }
+  async createSwapCalldata(protocol, tokenIn, tokenOut, amountIn, recipient, evmChainID, getQuoteIn, slippageFactor) {
+    if (protocol === "v2") {
+      let amountOut = await this.getV2QuoteWithAmountIn(getQuoteIn, tokenIn, tokenOut, amountIn, evmChainID);
+      amountOut = amountOut * slippageFactor / 1000n;
+      return {
+        amountOut,
+        calldata: this.createV2SwapCalldataExactIn(
+          tokenIn,
+          tokenOut,
+          amountIn,
+          amountOut,
+          recipient,
+          evmChainID,
+          getQuoteIn
+        )
+      };
+    } else {
+      const { amountOut, fee } = await this.getV3QuoteWithAmountIn(
+        getQuoteIn,
+        tokenIn,
+        tokenOut,
+        amountIn,
+        evmChainID
+      );
+      const adjustedAmountOut = amountOut * slippageFactor / 1000n;
+      return {
+        amountOut: adjustedAmountOut,
+        calldata: this.createV3SwapCalldataExactIn(
+          tokenIn,
+          tokenOut,
+          amountIn,
+          adjustedAmountOut,
+          fee,
+          recipient,
+          evmChainID,
+          getQuoteIn
+        )
+      };
+    }
+  }
   /**
    * Checks if an order has been filled by verifying the commitment status on-chain.
    * Reads the storage slot corresponding to the order's commitment hash.
@@ -12239,13 +12462,17 @@ var IntentGateway = class {
       let lastFailedHeight = null;
       let proofHex = null;
       while (!proofHex) {
-        latestHeight = await retryPromise(
-          () => hyperbridge.latestStateMachineHeight({
-            stateId: parseStateMachineId(destStateMachine).stateId,
-            consensusStateId: destConsensusStateId
+        const height = await retryPromise(
+          () => indexerClient.queryLatestStateMachineHeight({
+            statemachineId: destStateMachine,
+            chain: hyperbridgeConfig.stateMachineId
           }),
           { maxRetries: 5, backoffMs: 500, logMessage: "Failed to fetch latest state machine height" }
         );
+        if (!height) {
+          throw new Error("No state machine updates found for destination chain");
+        }
+        latestHeight = height;
         const shouldFetchProof = lastFailedHeight === null ? latestHeight > order.deadline : latestHeight > lastFailedHeight;
         if (!shouldFetchProof) {
           yield {
@@ -12317,9 +12544,9 @@ var IntentGateway = class {
               break;
             }
             const nextHeight = await retryPromise(
-              () => hyperbridge.latestStateMachineHeight({
-                stateId: parseStateMachineId(sourceStateMachine).stateId,
-                consensusStateId: sourceConsensusStateId
+              () => indexerClient.queryLatestStateMachineHeight({
+                statemachineId: sourceStateMachine,
+                chain: hyperbridgeConfig.stateMachineId
               }),
               {
                 maxRetries: 5,
@@ -12327,6 +12554,11 @@ var IntentGateway = class {
                 logMessage: "Failed to fetch latest state machine height (post-source-proof failure)"
               }
             );
+            if (!nextHeight) {
+              throw new Error(
+                `No state machine updates found for ${sourceStateMachine} on chain ${hyperbridgeConfig.stateMachineId}`
+              );
+            }
             if (nextHeight <= failedHeight) {
               await sleep(1e4);
               continue;
@@ -12746,6 +12978,6 @@ async function teleportDot(param_) {
   return stream;
 }
 
-export { ADDRESS_ZERO, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, ERC20Method, EvmChain, HyperClientStatus, IndexerClient, IntentGateway, OrderStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, STATE_COMMITMENTS_SLOT, SubstrateChain, TeleportStatus, TimeoutStatus, WrappedNativeDecimals, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, maxBigInt, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, teleport, teleportDot, viemChains };
+export { ADDRESS_ZERO, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, ERC20Method, EvmChain, HyperClientStatus, IndexerClient, IntentGateway, OrderStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, STATE_COMMITMENTS_SLOT, SubstrateChain, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, USE_ETHERSCAN_CHAINS, WrappedNativeDecimals, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getGasPriceFromEtherscan, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, maxBigInt, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, viemChains };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map