@hyperbridge/sdk 1.3.10 → 1.3.12

package/dist/node/index.js

@@ -5,12 +5,11 @@ 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, sepolia } from 'viem/chains';
+import { gnosisChiado, gnosis, bscTestnet, bsc, soneium, baseSepolia, base, optimismSepolia, optimism, arbitrumSepolia, arbitrum, mainnet, unichain, polygon, 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';
 import { WsProvider, ApiPromise } from '@polkadot/api';
-import { RpcWebSocketClient } from 'rpc-websocket-client';
 import { keccakAsU8a, decodeAddress, keccakAsHex, xxhashAsU8a } from '@polkadot/util-crypto';
 import { GraphQLClient } from 'graphql-request';
 import { Decimal } from 'decimal.js';
@@ -3313,6 +3312,8 @@ var Chains = /* @__PURE__ */ ((Chains2) => {
   Chains2["BSC_MAINNET"] = "EVM-56";
   Chains2["ARBITRUM_MAINNET"] = "EVM-42161";
   Chains2["BASE_MAINNET"] = "EVM-8453";
+  Chains2["POLYGON_MAINNET"] = "EVM-137";
+  Chains2["UNICHAIN_MAINNET"] = "EVM-130";
   return Chains2;
 })(Chains || {});
 var chainIds = {
@@ -3323,7 +3324,9 @@ var chainIds = {
   ["EVM-1" /* MAINNET */]: 1,
   ["EVM-56" /* BSC_MAINNET */]: 56,
   ["EVM-42161" /* ARBITRUM_MAINNET */]: 42161,
-  ["EVM-8453" /* BASE_MAINNET */]: 8453
+  ["EVM-8453" /* BASE_MAINNET */]: 8453,
+  ["EVM-137" /* POLYGON_MAINNET */]: 137,
+  ["EVM-130" /* UNICHAIN_MAINNET */]: 130
 };
 var viemChains = {
   "97": bscTestnet,
@@ -3332,7 +3335,9 @@ var viemChains = {
   "1": mainnet,
   "56": bsc,
   "42161": arbitrum,
-  "8453": base
+  "8453": base,
+  "137": polygon,
+  "130": unichain
 };
 var WrappedNativeDecimals = {
   ["EVM-97" /* BSC_CHAPEL */]: 18,
@@ -3341,7 +3346,9 @@ var WrappedNativeDecimals = {
   ["EVM-1" /* MAINNET */]: 18,
   ["EVM-56" /* BSC_MAINNET */]: 18,
   ["EVM-42161" /* ARBITRUM_MAINNET */]: 18,
-  ["EVM-8453" /* BASE_MAINNET */]: 18
+  ["EVM-8453" /* BASE_MAINNET */]: 18,
+  ["EVM-137" /* POLYGON_MAINNET */]: 18,
+  ["EVM-130" /* UNICHAIN_MAINNET */]: 18
 };
 var assets = {
   ["EVM-97" /* BSC_CHAPEL */]: {
@@ -3385,6 +3392,18 @@ var assets = {
     DAI: "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb".toLowerCase(),
     USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913".toLowerCase(),
     USDT: "0xfde4C96c8593536E31F229EA8f37b2ADa2699bb2".toLowerCase()
+  },
+  ["EVM-137" /* POLYGON_MAINNET */]: {
+    WETH: "0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619".toLowerCase(),
+    DAI: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063".toLowerCase(),
+    USDC: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359".toLowerCase(),
+    USDT: "0xc2132D05D31c914a87C6611C10748AEb04B58e8F".toLowerCase()
+  },
+  ["EVM-130" /* UNICHAIN_MAINNET */]: {
+    WETH: "0x4200000000000000000000000000000000000006".toLowerCase(),
+    DAI: "0x0000000000000000000000000000000000000000".toLowerCase(),
+    USDC: "0x078d782b760474a361dda0af3839290b0ef57ad6".toLowerCase(),
+    USDT: "0x9151434b16b9763660705744891fa906f660ecc5".toLowerCase()
   }
 };
 var addresses = {
@@ -3395,7 +3414,9 @@ var addresses = {
     ["EVM-1" /* MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA",
     ["EVM-56" /* BSC_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA",
-    ["EVM-8453" /* BASE_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA"
+    ["EVM-8453" /* BASE_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0xd54165e45926720b062C192a5bacEC64d5bB08DA"
   },
   Host: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x8Aa0Dea6D675d785A882967Bf38183f6117C09b7",
@@ -3404,7 +3425,9 @@ var addresses = {
     ["EVM-1" /* MAINNET */]: "0x792A6236AF69787C40cF76b69B4c8c7B28c4cA20",
     ["EVM-56" /* BSC_MAINNET */]: "0x24B5d421Ec373FcA57325dd2F0C074009Af021F7",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0xE05AFD4Eb2ce6d65c40e1048381BD0Ef8b4B299e",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x6FFe92e4d7a9D589549644544780e6725E84b248"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x6FFe92e4d7a9D589549644544780e6725E84b248",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0xD8d3db17C1dF65b301D45C84405CcAC1395C559a",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x2A17C1c3616Bbc33FCe5aF5B965F166ba76cEDAf"
   },
   UniswapRouter02: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x9639379819420704457B07A0C33B678D9E0F8Df0",
@@ -3413,7 +3436,9 @@ var addresses = {
     ["EVM-1" /* MAINNET */]: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
     ["EVM-56" /* BSC_MAINNET */]: "0x10ED43C718714eb63d5aA57B78B54704E256024E",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x284f11109359a7e1306c3e447ef14d38400063ff"
   },
   UniswapV2Factory: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x12e036669DA18F4A2777853d6e2136b32AceEC86",
@@ -3422,56 +3447,72 @@ var addresses = {
     ["EVM-1" /* MAINNET */]: "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
     ["EVM-56" /* BSC_MAINNET */]: "0xcA143Ce32Fe78f1f7019d7d551a6402fC5350c73",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x5757371414417b8C6CAad45bAeF941aBc7d3Ab32",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x1F98400000000000000000000000000000000002"
   },
   BatchExecutor: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x4CC58B5D8FBf838d062E4b21F75C327835B5F0ef",
     ["EVM-1" /* MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniversalRouter: {
     ["EVM-97" /* BSC_CHAPEL */]: "0xcc6d5ece3d4a57245bf5a2f64f3ed9179b81f714",
     ["EVM-1" /* MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniswapV3Router: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x0000000000000000000000000000000000000000",
     ["EVM-1" /* MAINNET */]: "0x1F98431c8aD98523631AE4a59f267346ea31F984",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniswapV3Factory: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x0000000000000000000000000000000000000000",
     ["EVM-1" /* MAINNET */]: "0x1F98431c8aD98523631AE4a59f267346ea31F984",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniswapV3Quoter: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x0000000000000000000000000000000000000000",
     ["EVM-1" /* MAINNET */]: "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniswapV4PoolManager: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x0000000000000000000000000000000000000000",
     ["EVM-1" /* MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   UniswapV4Quoter: {
     ["EVM-97" /* BSC_CHAPEL */]: "0x0000000000000000000000000000000000000000",
     ["EVM-1" /* MAINNET */]: "0x52f0e24d1c21c8a0cb1e5a5dd6198556bd9e1203",
     ["EVM-56" /* BSC_MAINNET */]: "0x0000000000000000000000000000000000000000",
     ["EVM-42161" /* ARBITRUM_MAINNET */]: "0x0000000000000000000000000000000000000000",
-    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000"
+    ["EVM-8453" /* BASE_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-137" /* POLYGON_MAINNET */]: "0x0000000000000000000000000000000000000000",
+    ["EVM-130" /* UNICHAIN_MAINNET */]: "0x0000000000000000000000000000000000000000"
   },
   Calldispatcher: {
     ["EVM-11155111" /* SEPOLIA */]: "0xC7f13b6D03A0A7F3239d38897503E90553ABe155"
@@ -3485,7 +3526,9 @@ var createRpcUrls = (env2) => ({
   ["EVM-1" /* MAINNET */]: env2.ETH_MAINNET || "https://eth-mainnet.g.alchemy.com/v2/demo",
   ["EVM-56" /* BSC_MAINNET */]: env2.BSC_MAINNET || "https://binance.llamarpc.com",
   ["EVM-42161" /* ARBITRUM_MAINNET */]: env2.ARBITRUM_MAINNET || "https://arbitrum-one.public.blastapi.io",
-  ["EVM-8453" /* BASE_MAINNET */]: env2.BASE_MAINNET || "https://base-mainnet.public.blastapi.io"
+  ["EVM-8453" /* BASE_MAINNET */]: env2.BASE_MAINNET || "https://base-mainnet.public.blastapi.io",
+  ["EVM-137" /* POLYGON_MAINNET */]: env2.POLYGON_MAINNET || "https://polygon-bor-rpc.publicnode.com",
+  ["EVM-130" /* UNICHAIN_MAINNET */]: env2.UNICHAIN_MAINNET || "https://unichain.api.onfinality.io/public"
 });
 var consensusStateIds = {
   ["EVM-97" /* BSC_CHAPEL */]: "BSC0",
@@ -3495,7 +3538,9 @@ var consensusStateIds = {
   ["EVM-1" /* MAINNET */]: "ETH0",
   ["EVM-56" /* BSC_MAINNET */]: "BSC0",
   ["EVM-42161" /* ARBITRUM_MAINNET */]: "ETH0",
-  ["EVM-8453" /* BASE_MAINNET */]: "ETH0"
+  ["EVM-8453" /* BASE_MAINNET */]: "ETH0",
+  ["EVM-137" /* POLYGON_MAINNET */]: "ETH0",
+  ["EVM-130" /* UNICHAIN_MAINNET */]: "ETH0"
 };
 var coingeckoIds = {
   ["EVM-97" /* BSC_CHAPEL */]: "binance-smart-chain",
@@ -3505,7 +3550,9 @@ var coingeckoIds = {
   ["EVM-1" /* MAINNET */]: "ethereum",
   ["EVM-56" /* BSC_MAINNET */]: "binance-smart-chain",
   ["EVM-42161" /* ARBITRUM_MAINNET */]: "arbitrum-one",
-  ["EVM-8453" /* BASE_MAINNET */]: "base"
+  ["EVM-8453" /* BASE_MAINNET */]: "base",
+  ["EVM-137" /* POLYGON_MAINNET */]: "matic-network",
+  ["EVM-130" /* UNICHAIN_MAINNET */]: "ethereum"
 };
 
 // src/configs/ChainConfigService.ts
@@ -4505,6 +4552,14 @@ function adjustFeeDecimals(feeInFeeToken, fromDecimals, toDecimals) {
     return (feeInFeeToken + scaleFactor - 1n) / scaleFactor;
   }
 }
+function replaceWebsocketWithHttp(url) {
+  if (url.startsWith("ws://")) {
+    return url.replace("ws://", "http://");
+  } else if (url.startsWith("wss://")) {
+    return url.replace("wss://", "https://");
+  }
+  return url;
+}
 
 // src/utils/exceptions.ts
 var AbortSignalInternal = class _AbortSignalInternal extends Error {
@@ -5014,14 +5069,52 @@ function deriveSecondLevelSlot(key, firstLevelSlot) {
   const combined = new Uint8Array([...keyBytes, ...slotBytes]);
   return keccak256(combined);
 }
+var HttpRpcClient = class {
+  constructor(url) {
+    this.url = url;
+  }
+  /**
+   * Make an RPC call over HTTP
+   * @param method - The RPC method name
+   * @param params - The parameters for the RPC call
+   * @returns Promise resolving to the RPC response
+   */
+  async call(method, params = []) {
+    const body = JSON.stringify({
+      jsonrpc: "2.0",
+      id: Date.now(),
+      method,
+      params
+    });
+    const response = await fetch(this.url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body
+    });
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`);
+    }
+    const result = await response.json();
+    if (result.error) {
+      throw new Error(`RPC error: ${result.error.message}`);
+    }
+    return result.result;
+  }
+};
 var SubstrateChain = class {
   constructor(params) {
     this.params = params;
+    const url = this.params.ws;
+    const httpUrl = replaceWebsocketWithHttp(url);
+    this.rpcClient = new HttpRpcClient(httpUrl);
   }
   /*
    * api: The Polkadot API instance for the Substrate chain.
    */
   api;
+  rpcClient;
   /*
    * connect: Connects to the Substrate chain using the provided WebSocket URL.
    */
@@ -5081,9 +5174,7 @@ var SubstrateChain = class {
   async queryRequestCommitment(commitment) {
     const prefix = toHex(":child_storage:default:ISMP");
     const key = this.requestCommitmentKey(commitment);
-    const rpc = new RpcWebSocketClient();
-    await rpc.connect(this.params.ws);
-    const item = await rpc.call("childstate_getStorage", [prefix, key]);
+    const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
   }
   /**
@@ -5094,9 +5185,7 @@ var SubstrateChain = class {
   async queryRequestReceipt(commitment) {
     const prefix = toHex(":child_storage:default:ISMP");
     const key = this.requestReceiptKey(commitment);
-    const rpc = new RpcWebSocketClient();
-    await rpc.connect(this.params.ws);
-    const item = await rpc.call("childstate_getStorage", [prefix, key]);
+    const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
   }
   /**
@@ -5116,15 +5205,13 @@ var SubstrateChain = class {
    * @returns {Promise<HexString>} The proof.
    */
   async queryProof(message, counterparty, at) {
-    const rpc = new RpcWebSocketClient();
-    await rpc.connect(this.params.ws);
     if (isEvmChain(counterparty)) {
-      const proof = await rpc.call("mmr_queryProof", [Number(at), message]);
+      const proof = await this.rpcClient.call("mmr_queryProof", [Number(at), message]);
       return toHex(proof.proof);
     }
     if (isSubstrateChain(counterparty)) {
       const childTrieKeys = "Requests" in message ? message.Requests.map(requestCommitmentStorageKey) : message.Responses.map(responseCommitmentStorageKey);
-      const proof = await rpc.call("ismp_queryChildTrieProof", [Number(at), childTrieKeys]);
+      const proof = await this.rpcClient.call("ismp_queryChildTrieProof", [Number(at), childTrieKeys]);
       const basicProof = BasicProof.dec(toHex(proof.proof));
       const encoded = SubstrateStateProof.enc({
         tag: "OverlayProof",
@@ -5188,10 +5275,8 @@ var SubstrateChain = class {
    * @returns The state proof as a hexadecimal string.
    */
   async queryStateProof(at, keys) {
-    const rpc = new RpcWebSocketClient();
-    await rpc.connect(this.params.ws);
     const encodedKeys = keys.map((key) => Array.from(hexToBytes(key)));
-    const proof = await rpc.call("ismp_queryChildTrieProof", [Number(at), encodedKeys]);
+    const proof = await this.rpcClient.call("ismp_queryChildTrieProof", [Number(at), encodedKeys]);
     const basicProof = BasicProof.dec(toHex(proof.proof));
     const encoded = SubstrateStateProof.enc({
       tag: "OverlayProof",
@@ -5211,9 +5296,16 @@ var SubstrateChain = class {
    * @returns {Promise<bigint>} The latest state machine height.
    */
   async latestStateMachineHeight(stateMachineId) {
-    if (!this.api) throw new Error("API not initialized");
-    const latestHeight = await this.api.query.ismp.latestStateMachineHeight(stateMachineId);
-    return BigInt(latestHeight.toString());
+    const state_id = convertStateIdToStateMachineId(stateMachineId.stateId);
+    const consensusStateIdToBytes = hexToBytes(stateMachineId.consensusStateId);
+    const decoder = new TextDecoder("utf-8");
+    const decodedConsensusStateId = decoder.decode(consensusStateIdToBytes);
+    const payload = {
+      state_id,
+      consensus_state_id: decodedConsensusStateId
+    };
+    const latestHeight = await this.rpcClient.call("ismp_queryStateMachineLatestHeight", [payload]);
+    return BigInt(latestHeight);
   }
   /**
    * Get the state machine update time for a given state machine height.
@@ -5221,9 +5313,20 @@ var SubstrateChain = class {
    * @returns {Promise<bigint>} The statemachine update time in seconds.
    */
   async stateMachineUpdateTime(stateMachineHeight) {
-    if (!this.api) throw new Error("API not initialized");
-    const updateTime = await this.api.query.ismp.stateMachineUpdateTime(stateMachineHeight);
-    return BigInt(updateTime.toString());
+    const state_id = convertStateIdToStateMachineId(stateMachineHeight.id.stateId);
+    const consensusStateIdToBytes = hexToBytes(stateMachineHeight.id.consensusStateId);
+    const decoder = new TextDecoder("utf-8");
+    const decodedConsensusStateId = decoder.decode(consensusStateIdToBytes);
+    const stateMachineId = {
+      state_id,
+      consensus_state_id: decodedConsensusStateId
+    };
+    const payload = {
+      id: stateMachineId,
+      height: Number(stateMachineHeight.height)
+    };
+    const updateTime = await this.rpcClient.call("ismp_queryStateMachineUpdateTime", [payload]);
+    return BigInt(updateTime);
   }
   /**
    * Get the challenge period for a given state machine id.
@@ -5231,9 +5334,16 @@ var SubstrateChain = class {
    * @returns {Promise<bigint>} The challenge period in seconds.
    */
   async challengePeriod(stateMachineId) {
-    if (!this.api) throw new Error("API not initialized");
-    const challengePeriod = await this.api.query.ismp.challengePeriod(stateMachineId);
-    return BigInt(challengePeriod.toString());
+    const state_id = convertStateIdToStateMachineId(stateMachineId.stateId);
+    const consensusStateIdToBytes = hexToBytes(stateMachineId.consensusStateId);
+    const decoder = new TextDecoder("utf-8");
+    const decodedConsensusStateId = decoder.decode(consensusStateIdToBytes);
+    const payload = {
+      state_id,
+      consensus_state_id: decodedConsensusStateId
+    };
+    const challengePeriod = await this.rpcClient.call("ismp_queryChallengePeriod", [payload]);
+    return BigInt(challengePeriod);
   }
   /**
    * Encode an ISMP calldata for a substrate chain.
@@ -5283,6 +5393,24 @@ function convertStateMachineIdToEnum(id) {
   }
   return { tag, value };
 }
+function convertStateIdToStateMachineId(stateId) {
+  switch (true) {
+    case stateId.Evm !== void 0:
+      return `EVM-${stateId.Evm}`;
+    case stateId.Polkadot !== void 0:
+      return `POLKADOT-${stateId.Polkadot}`;
+    case stateId.Kusama !== void 0:
+      return `KUSAMA-${stateId.Kusama}`;
+    case stateId.Substrate !== void 0: {
+      const bytes = hexToBytes(stateId.Substrate);
+      const decoder = new TextDecoder("utf-8");
+      const decoded = decoder.decode(bytes);
+      return `SUBSTRATE-${decoded}`;
+    }
+    default:
+      throw new Error("Unsupported stateId variant");
+  }
+}
 function convertIPostRequestToCodec(request) {
   return {
     tag: "Post",
@@ -11552,13 +11680,6 @@ var IntentGateway = class {
     this.source = source;
     this.dest = dest;
   }
-  destStateproofCache = /* @__PURE__ */ new Map();
-  getCachedProof(id) {
-    return this.destStateproofCache.get(id);
-  }
-  clearCachedProof(id) {
-    this.destStateproofCache.delete(id);
-  }
   /**
    * Estimates the total cost required to fill an order, including gas fees, relayer fees,
    * protocol fees, and swap operations.
@@ -12167,117 +12288,128 @@ var IntentGateway = class {
     });
     return filledStatus !== "0x0000000000000000000000000000000000000000000000000000000000000000";
   }
-  async *cancelOrder(order, hyperbridgeConfig, indexerClient) {
-    const hyperbridge = await getChain({
-      ...hyperbridgeConfig,
-      hasher: "Keccak"
-    });
+  async submitAndConfirmReceipt(hyperbridge, commitment, message) {
+    let storageValue = await hyperbridge.queryRequestReceipt(commitment);
+    if (!storageValue) {
+      console.log("No receipt found. Attempting to submit...");
+      try {
+        await hyperbridge.submitUnsigned(message);
+      } catch {
+        console.warn("Submission failed. Awaiting network confirmation...");
+      }
+      console.log("Waiting for network state update...");
+      await sleep(3e4);
+      storageValue = await retryPromise(
+        async () => {
+          const value = await hyperbridge.queryRequestReceipt(commitment);
+          if (!value) throw new Error("Receipt not found");
+          return value;
+        },
+        { maxRetries: 5, backoffMs: 5e3, logMessage: "Checking for receipt" }
+      );
+    }
+    console.log("Hyperbridge Receipt confirmed.");
+  }
+  async *cancelOrder(order, hyperbridgeConfig, indexerClient, storedData) {
+    const hyperbridge = await getChain({ ...hyperbridgeConfig, hasher: "Keccak" });
     const sourceStateMachine = hexToString$1(order.sourceChain);
     const destStateMachine = hexToString$1(order.destChain);
     const sourceConsensusStateId = this.source.config.getConsensusStateId(sourceStateMachine);
     const destConsensusStateId = this.dest.config.getConsensusStateId(destStateMachine);
-    let latestHeight = 0n;
-    while (latestHeight <= order.deadline) {
-      const { stateId } = parseStateMachineId(destStateMachine);
-      latestHeight = await hyperbridge.latestStateMachineHeight({
-        stateId,
-        consensusStateId: destConsensusStateId
-      });
-      yield {
-        status: "AWAITING_DESTINATION_FINALIZED",
-        data: { currentHeight: latestHeight, deadline: order.deadline }
-      };
-      if (latestHeight <= order.deadline) {
-        await sleep(1e4);
+    let destIProof;
+    if (storedData?.destIProof) {
+      destIProof = storedData.destIProof;
+      yield { status: "DESTINATION_FINALIZED", data: { proof: destIProof.proof, height: destIProof.height } };
+    } else {
+      let latestHeight = 0n;
+      let lastFailedHeight = null;
+      let proofHex = null;
+      while (!proofHex) {
+        latestHeight = await retryPromise(
+          () => hyperbridge.latestStateMachineHeight({
+            stateId: parseStateMachineId(destStateMachine).stateId,
+            consensusStateId: destConsensusStateId
+          }),
+          { maxRetries: 5, backoffMs: 500, logMessage: "Failed to fetch latest state machine height" }
+        );
+        const shouldFetchProof = lastFailedHeight === null ? latestHeight > order.deadline : latestHeight > lastFailedHeight;
+        if (!shouldFetchProof) {
+          yield {
+            status: "AWAITING_DESTINATION_FINALIZED",
+            data: {
+              currentHeight: latestHeight,
+              deadline: order.deadline,
+              ...lastFailedHeight && { lastFailedHeight }
+            }
+          };
+          await sleep(1e4);
+          continue;
+        }
+        try {
+          const intentGatewayAddress = this.dest.config.getIntentGatewayAddress(destStateMachine);
+          const orderId = orderCommitment(order);
+          const slotHash = await this.dest.client.readContract({
+            abi: IntentGateway_default.ABI,
+            address: intentGatewayAddress,
+            functionName: "calculateCommitmentSlotHash",
+            args: [orderId]
+          });
+          proofHex = await this.dest.queryStateProof(latestHeight, [slotHash], intentGatewayAddress);
+        } catch (error) {
+          lastFailedHeight = latestHeight;
+          yield {
+            status: "PROOF_FETCH_FAILED",
+            data: {
+              failedHeight: latestHeight,
+              error: error instanceof Error ? error.message : String(error),
+              deadline: order.deadline
+            }
+          };
+          await sleep(1e4);
+        }
       }
+      destIProof = {
+        consensusStateId: destConsensusStateId,
+        height: latestHeight,
+        proof: proofHex,
+        stateMachine: destStateMachine
+      };
+      yield { status: "DESTINATION_FINALIZED", data: { proof: destIProof.proof, height: destIProof.height } };
     }
-    yield { status: "DESTINATION_FINALIZED", data: { height: latestHeight } };
-    const intentGatewayAddress = this.dest.config.getIntentGatewayAddress(destStateMachine);
-    const orderId = orderCommitment(order);
-    const slotHash = await this.dest.client.readContract({
-      abi: IntentGateway_default.ABI,
-      address: intentGatewayAddress,
-      functionName: "calculateCommitmentSlotHash",
-      args: [orderId]
-    });
-    const proof = await this.dest.queryStateProof(latestHeight, [slotHash], intentGatewayAddress);
-    const destIProof = {
-      consensusStateId: destConsensusStateId,
-      height: latestHeight,
-      proof,
-      stateMachine: destStateMachine
-    };
-    this.destStateproofCache.set(order.id, destIProof);
-    yield { status: "STATE_PROOF_RECEIVED", data: { proof, height: latestHeight } };
-    const getRequest = yield { status: "AWAITING_GET_REQUEST" };
-    if (!getRequest) {
-      throw new Error("[Cancel Order]: Get Request not provided");
-    }
-    const commitment = getRequestCommitment({
-      ...getRequest,
-      keys: [...getRequest.keys]
-    });
-    const statusStream = indexerClient.getRequestStatusStream(commitment);
-    for await (const statusUpdate of statusStream) {
+    const getRequest = storedData?.getRequest ?? (yield { status: "AWAITING_GET_REQUEST" });
+    if (!getRequest) throw new Error("[Cancel Order]: Get Request not provided");
+    const commitment = getRequestCommitment({ ...getRequest, keys: [...getRequest.keys] });
+    const sourceStatusStream = indexerClient.getRequestStatusStream(commitment);
+    for await (const statusUpdate of sourceStatusStream) {
       if (statusUpdate.status === RequestStatus.SOURCE_FINALIZED) {
-        const sourceHeight = statusUpdate.metadata.blockNumber;
-        const proof2 = await this.source.queryProof(
+        const sourceHeight = BigInt(statusUpdate.metadata.blockNumber);
+        const proof = await this.source.queryProof(
           { Requests: [commitment] },
           hyperbridgeConfig.stateMachineId,
-          BigInt(sourceHeight)
+          sourceHeight
         );
-        const { stateId } = parseStateMachineId(sourceStateMachine);
         const sourceIProof = {
-          height: BigInt(sourceHeight),
+          height: sourceHeight,
           stateMachine: sourceStateMachine,
           consensusStateId: sourceConsensusStateId,
-          proof: proof2
+          proof
         };
+        yield { status: "SOURCE_PROOF_RECEIVED", data: sourceIProof };
         const getRequestMessage = {
           kind: "GetRequest",
           requests: [getRequest],
           source: sourceIProof,
-          response: this.getCachedProof(order.id),
+          response: destIProof,
           signer: pad("0x")
         };
         await waitForChallengePeriod(hyperbridge, {
-          height: BigInt(sourceHeight),
+          height: sourceHeight,
           id: {
-            stateId,
+            stateId: parseStateMachineId(sourceStateMachine).stateId,
             consensusStateId: sourceConsensusStateId
           }
         });
-        const receiptKey = hyperbridge.requestReceiptKey(commitment);
-        const { api } = hyperbridge;
-        if (!api) {
-          throw new Error("Hyperbridge API is not available");
-        }
-        let storageValue = await api.rpc.childstate.getStorage(":child_storage:default:ISMP", receiptKey);
-        if (storageValue.isNone) {
-          console.log("No receipt found. Attempting to submit...");
-          try {
-            await hyperbridge.submitUnsigned(getRequestMessage);
-          } catch {
-            console.warn("Submission failed. Awaiting network confirmation...");
-          }
-          console.log("Waiting for network state update...");
-          await sleep(3e4);
-          storageValue = await retryPromise(
-            async () => {
-              const value = await api.rpc.childstate.getStorage(":child_storage:default:ISMP", receiptKey);
-              if (value.isNone) {
-                throw new Error("Receipt not found");
-              }
-              return value;
-            },
-            {
-              maxRetries: 10,
-              backoffMs: 5e3,
-              logMessage: "Checking for receipt"
-            }
-          );
-        }
-        console.log("Receipt confirmed on Hyperbridge. Proceeding.");
+        await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
       }
       yield statusUpdate;
     }
@@ -12653,6 +12785,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, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, 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, 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, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, teleport, teleportDot, viemChains };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map