@hyperbridge/sdk 2.3.1 → 2.3.3

package/dist/node/index.cjs

@@ -6786,15 +6786,20 @@ var EvmChain = class _EvmChain {
   async quoteNative(request, fee) {
     const totalFee = await this.quote(request) + fee;
     const feeToken = await this.getFeeTokenWithDecimals();
-    return this.getAmountsIn(totalFee, feeToken.address, request.source);
+    const hostRouter = await this.publicClient.readContract({
+      address: this.params.host,
+      abi: evmHost_default.ABI,
+      functionName: "uniswapV2Router"
+    });
+    return this.getAmountsIn(totalFee, feeToken.address, request.source, hostRouter);
   }
   /**
    * Given a desired output amount of a token, returns how much native is needed as input.
-   * Uses the chain's Uniswap V2 router: WETH → tokenOut path.
+   * Uses the chain's Uniswap V2 router (or `router` when provided): WETH → tokenOut path.
    */
-  async getAmountsIn(amountOut, tokenOutForQuote, chain) {
+  async getAmountsIn(amountOut, tokenOutForQuote, chain, router) {
     const chainId = chain ?? `EVM-${this.params.chainId}`;
-    const v2Router = this.configService.getUniswapRouterV2Address(chainId);
+    const v2Router = router ?? this.configService.getUniswapRouterV2Address(chainId);
     const WETH = this.configService.getWrappedNativeAssetWithDecimals(chainId).asset;
     const v2AmountIn = await this.publicClient.simulateContract({
       address: v2Router,
@@ -7039,6 +7044,11 @@ var ExpectedError = class _ExpectedError extends Error {
     return error instanceof _ExpectedError;
   }
 };
+
+// src/configs/constants.ts
+var ISMP_PREFIX = ":child_storage:default:ISMPv2";
+
+// src/chains/substrate.ts
 var HttpRpcClient = class {
   constructor(url) {
     this.url = url;
@@ -7162,7 +7172,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The commitment data if found, undefined otherwise.
    */
   async queryRequestCommitment(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.requestCommitmentKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -7173,7 +7183,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The relayer address responsible for delivering the request.
    */
   async queryRequestReceipt(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.requestReceiptKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -7197,7 +7207,7 @@ var SubstrateChain = class _SubstrateChain {
    * @returns {Promise<HexString | undefined>} The receipt data if present, otherwise undefined.
    */
   async queryResponseReceipt(commitment) {
-    const prefix = viem.toHex(":child_storage:default:ISMP");
+    const prefix = viem.toHex(ISMP_PREFIX);
     const key = this.responseReceiptKey(commitment);
     const item = await this.rpcClient.call("childstate_getStorage", [prefix, key]);
     return item;
@@ -15305,7 +15315,11 @@ var OrderExecutor = class {
    */
   async fetchBids(params) {
     const { commitment, solver, solverLockStartTime } = params;
-    const fetchedBids = await this.ctx.intentsCoprocessor.getBidsForOrder(commitment);
+    const intentsCoprocessor = this.ctx.intentsCoprocessor;
+    if (!intentsCoprocessor) {
+      throw new Error("IntentsCoprocessor required for order execution");
+    }
+    const fetchedBids = await intentsCoprocessor.getBidsForOrder(commitment);
     if (solver) {
       const { address, timeoutMs } = solver;
       const solverLockActive = Date.now() - solverLockStartTime < timeoutMs;
@@ -15394,7 +15408,7 @@ var OrderExecutor = class {
    *   → (`FILLED` | `PARTIAL_FILL`)* → (`FILLED` | `EXPIRED`)
    *
    * **Cross-chain:** `AWAITING_BIDS` → `BIDS_RECEIVED` → `BID_SELECTED`
-   *   (terminates — settlement is confirmed async via Hyperbridge)
+   *   → `FILLED`
    */
   async *executeOrder(options) {
     const { order, sessionPrivateKey, auctionTimeMs, pollIntervalMs = DEFAULT_POLL_INTERVAL, solver } = options;
@@ -15533,7 +15547,13 @@ var OrderExecutor = class {
           userOp: result.userOp,
           transactionHash: result.txnHash
         };
-        const fill = this.processFillResult(result, commitment, targetAssets, totalFilledAssets, remainingAssets);
+        const fill = this.processFillResult(
+          result,
+          commitment,
+          targetAssets,
+          totalFilledAssets,
+          remainingAssets
+        );
         totalFilledAssets = fill.totalFilledAssets;
         remainingAssets = fill.remainingAssets;
         if (fill.update) {
@@ -15559,6 +15579,10 @@ var OrderCanceller = class {
     this.ctx = ctx;
   }
   ctx;
+  logger = consola.createConsola({
+    level: consola.LogLevels.info,
+    formatOptions: { columns: 80, colors: true, compact: true, date: false }
+  }).withTag("[OrderCanceller]");
   /**
    * Returns both the native token cost and the relayer fee for cancelling an
    * order. Frontends can use `relayerFee` to approve the ERC-20 spend before
@@ -15974,32 +15998,55 @@ var OrderCanceller = class {
   }
   /**
    * Submits an unsigned GET request message to Hyperbridge and waits until
-   * the request receipt is confirmed on-chain.
+   * the GET response receipt is confirmed on-chain.
    *
-   * If the initial submission fails, the method waits 30 seconds and then
-   * retries querying for the receipt up to 10 times with 5-second back-off.
+   * GET handling on Hyperbridge creates a response receipt keyed by the
+   * request commitment. That receipt is the durable delivery signal, so a
+   * duplicate unsigned submission is considered successful only if the
+   * response receipt can be observed.
    *
    * @param hyperbridge - Hyperbridge Substrate chain client.
    * @param commitment - The GET request commitment hash used to poll for the receipt.
    * @param message - The fully constructed GET request message to submit.
    */
   async submitAndConfirmReceipt(hyperbridge, commitment, message) {
-    let storageValue = await hyperbridge.queryRequestReceipt(commitment);
-    if (!storageValue) {
-      try {
-        await hyperbridge.submitUnsigned(message);
-      } catch {
-      }
+    this.logger.info(`Checking GET response receipt before Hyperbridge delivery (${commitment})`);
+    if (await this.queryDeliveredReceipt(hyperbridge, commitment)) {
+      this.logger.info(`GET ${commitment} already delivered to Hyperbridge; skipping unsigned submission`);
+      return;
+    }
+    try {
+      this.logger.info(`Submitting unsigned GET ${commitment} to Hyperbridge`);
+      await hyperbridge.submitUnsigned(message);
+      this.logger.info(`Unsigned GET ${commitment} submitted; waiting for Hyperbridge response receipt`);
       await sleep(3e4);
-      storageValue = await retryPromise(
-        async () => {
-          const value = await hyperbridge.queryRequestReceipt(commitment);
-          if (!value) throw new Error("Receipt not found");
-          return value;
-        },
-        { maxRetries: 10, backoffMs: 5e3, logMessage: "Checking for receipt" }
+    } catch (error) {
+      this.logger.warn(
+        `Unsigned GET submit failed for ${commitment}; polling response receipt before failing: ${String(error)}`
       );
     }
+    try {
+      await this.pollDeliveredReceipt(hyperbridge, commitment);
+      this.logger.info(`Confirmed Hyperbridge GET delivery for ${commitment}`);
+    } catch (error) {
+      const message2 = `Failed to deliver GET request to Hyperbridge; no response receipt found for ${commitment}: ${String(error)}`;
+      this.logger.error(message2);
+      throw new Error(message2);
+    }
+  }
+  async queryDeliveredReceipt(hyperbridge, commitment) {
+    return hyperbridge.queryResponseReceipt(commitment);
+  }
+  async pollDeliveredReceipt(hyperbridge, commitment) {
+    this.logger.info(`Polling Hyperbridge GET response receipt for ${commitment}`);
+    return retryPromise(
+      async () => {
+        const value = await this.queryDeliveredReceipt(hyperbridge, commitment);
+        if (!value) throw new Error(`GET response receipt not found for ${commitment}`);
+        return value;
+      },
+      { maxRetries: 10, backoffMs: 5e3, logMessage: `Checking GET response receipt ${commitment}` }
+    );
   }
   /**
    * Estimates the relayer fee for delivering a POST from dest to source.
@@ -16070,7 +16117,7 @@ var BidImpl = class {
     const sessionKeyAddress = this.order.session;
     const sessionKeyData = this.sessionPrivateKey ? { privateKey: this.sessionPrivateKey } : await this.ctx.sessionKeyStorage.getSessionKeyByAddress(sessionKeyAddress);
     if (!sessionKeyData) {
-      throw new Error("SessionKey not found for commitment: " + commitment);
+      throw new Error(`SessionKey not found for commitment: ${commitment}`);
     }
     const signature = await CryptoUtils.signSolverSelection(
       commitment,
@@ -16130,8 +16177,8 @@ var BidImpl = class {
   /**
    * Signs the `SelectSolver` message with the session key, appends it to the
    * solver's existing UserOp signature, and submits the UserOperation to the
-   * bundler. For same-chain orders, waits for the receipt and reads
-   * `OrderFilled` / `PartialFill` logs to determine fill status.
+   * bundler. Waits for the receipt and reads `OrderFilled` / `PartialFill`
+   * logs to determine fill status.
    *
    * @returns A {@link SelectBidResult} with the submitted UserOperation, its hash,
    *   the solver address, transaction hash, and fill status.
@@ -16171,33 +16218,31 @@ var BidImpl = class {
         { maxRetries: 5, backoffMs: 2e3, logMessage: "Fetching user operation receipt" }
       );
       txnHash = receipt.receipt.transactionHash;
-      if (this.order.source === this.order.destination) {
-        try {
-          const chainReceipt = await this.ctx.dest.client.waitForTransactionReceipt({
-            hash: txnHash,
-            confirmations: 1
-          });
-          const events = viem.parseEventLogs({
-            abi: ABI3,
-            logs: chainReceipt.logs,
-            eventName: ["OrderFilled", "PartialFill"]
-          });
-          const matched = events.find((e) => {
-            if (e.eventName === "OrderFilled")
-              return e.args.commitment.toLowerCase() === commitment.toLowerCase();
-            if (e.eventName === "PartialFill")
-              return e.args.commitment.toLowerCase() === commitment.toLowerCase();
-            return false;
-          });
-          if (matched?.eventName === "OrderFilled") {
-            fillStatus = "full";
-          } else if (matched?.eventName === "PartialFill") {
-            fillStatus = "partial";
-            filledAssets = matched.args.outputs ?? [];
-          }
-        } catch {
-          throw new Error("Failed to determine fill status from logs");
+      try {
+        const chainReceipt = await this.ctx.dest.client.waitForTransactionReceipt({
+          hash: txnHash,
+          confirmations: 1
+        });
+        const events = viem.parseEventLogs({
+          abi: ABI3,
+          logs: chainReceipt.logs,
+          eventName: ["OrderFilled", "PartialFill"]
+        });
+        const matched = events.find((e) => {
+          if (e.eventName === "OrderFilled")
+            return e.args.commitment.toLowerCase() === commitment.toLowerCase();
+          if (e.eventName === "PartialFill")
+            return e.args.commitment.toLowerCase() === commitment.toLowerCase();
+          return false;
+        });
+        if (matched?.eventName === "OrderFilled") {
+          fillStatus = "full";
+        } else if (matched?.eventName === "PartialFill") {
+          fillStatus = "partial";
+          filledAssets = matched.args.outputs ?? [];
         }
+      } catch {
+        throw new Error("Failed to determine fill status from logs");
       }
     } catch (err) {
       throw new Error(`Failed to execute bid: ${err instanceof Error ? err.message : String(err)}`);
@@ -16999,9 +17044,9 @@ var GasEstimator = class {
       from: this.ctx.source.configService.getIntentGatewayAddress(destChainId),
       to: this.ctx.source.configService.getIntentGatewayAddress(sourceChainId)
     };
+    postRequestFeeInDestFeeToken = postRequestFeeInDestFeeToken * 1005n / 1000n;
     let protocolFeeInNativeToken = await this.ctx.dest.quoteNative(postRequest, postRequestFeeInDestFeeToken).catch(() => 0n);
     protocolFeeInNativeToken = protocolFeeInNativeToken * 1005n / 1000n;
-    postRequestFeeInDestFeeToken = postRequestFeeInDestFeeToken * 1005n / 1000n;
     return { postRequestFee: postRequestFeeInDestFeeToken, protocolFee: protocolFeeInNativeToken };
   }
   /**