@hyperbridge/sdk 1.8.2 → 1.8.4

package/dist/node/index.d.ts

@@ -1837,6 +1837,10 @@ declare enum TeleportStatus {
     RECEIVED = "RECEIVED",
     REFUNDED = "REFUNDED"
 }
+interface CancelQuote {
+    nativeValue: bigint;
+    relayerFee: bigint;
+}
 interface TokenGatewayAssetTeleportedResponse {
     tokenGatewayAssetTeleportedV2s: {
         nodes: Array<{
@@ -3909,16 +3913,17 @@ declare class IntentGateway {
         };
     }): AsyncGenerator<IntentOrderStatusUpdate, void, HexString>;
     /**
-     * Quotes the native token cost for cancelling an order.
+     * Returns both the native token cost and the relayer fee for cancelling an
+     * order. Use `relayerFee` to approve the ERC-20 spend before submitting.
      *
-     * Delegates to {@link OrderCanceller.quoteCancelNative}.
+     * Delegates to {@link OrderCanceller.quoteCancelOrder}.
      *
      * @param order - The order to quote cancellation for.
      * @param fromDest - If `true`, quotes the destination-initiated cancellation fee.
-     *   Defaults to `false` (source-side cancellation).
-     * @returns The native token amount required to submit the cancel transaction.
+     * @returns `{ nativeValue }` — native token amount (wei) to send as `value`;
+     *   `{ relayerFee }` — relayer incentive denominated in the chain's fee token.
      */
-    quoteCancelNative(order: Order, fromDest?: boolean): Promise<bigint>;
+    quoteCancelOrder(order: Order, fromDest?: boolean): Promise<CancelQuote>;
     /**
      * Async generator that cancels an order and streams status events until
      * cancellation is complete.
@@ -8029,4 +8034,4 @@ declare const getChainId: (stateMachineId: string) => number | undefined;
 declare const getViemChain: (chainId: number) => Chain | undefined;
 declare const hyperbridgeAddress = "";
 
-export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BidStorageEntry, type BidSubmissionResult, type BlockMetadata, type BundlerGasEstimate, BundlerMethod, type CancelEvent, type CancelOptions, type ChainConfig, type ChainConfigData, ChainConfigService, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DecodedPostRequestEvent, type DecodedPostResponseEvent, type DispatchGet, type DispatchInfo, type DispatchPost, ERC20Method, type ERC7821Call, ERC7821_BATCH_MODE, type EstimateFillOrderParams, type EstimateGasCallData, EvmChain, type EvmChainParams, ABI as EvmHostABI, EvmLanguage, type ExecuteIntentOrderOptions, type ExecutionResult, type FillOptions, type FillOrderEstimate, type FillerBid, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmChain, 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 IntentGatewayContext, type IntentGatewayParams, ABI$1 as IntentGatewayV2ABI, IntentOrderStatus, type IntentOrderStatusKey, type IntentOrderStatusUpdate, IntentsCoprocessor, type IsmpRequest, MOCK_ADDRESS, type NewDeployment, ORDER_V2_PARAM_TYPE, type Order, type OrderResponse, OrderStatus, OrderStatusChecker, type OrderStatusMetadata, type OrderWithStatus, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, type PackedUserOperation, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, type QuoteNativeResult, 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, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, type SelectBidResult, type SelectOptions, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, type StorageFacade, type SubmitBidOptions, SubstrateChain, Swap, TESTNET_CHAINS, type TeleportParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, TokenGateway, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type Transaction, TronChain, type TronChainParams, USE_ETHERSCAN_CHAINS, type XcmGatewayParams, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createEvmChain, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChainId, getConfigByStateMachineId, getContractCallInput, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, parseStateMachineId, polkadotAssetHubPaseo, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
+export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BidStorageEntry, type BidSubmissionResult, type BlockMetadata, type BundlerGasEstimate, BundlerMethod, type CancelEvent, type CancelOptions, type CancelQuote, type ChainConfig, type ChainConfigData, ChainConfigService, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DecodedPostRequestEvent, type DecodedPostResponseEvent, type DispatchGet, type DispatchInfo, type DispatchPost, ERC20Method, type ERC7821Call, ERC7821_BATCH_MODE, type EstimateFillOrderParams, type EstimateGasCallData, EvmChain, type EvmChainParams, ABI as EvmHostABI, EvmLanguage, type ExecuteIntentOrderOptions, type ExecutionResult, type FillOptions, type FillOrderEstimate, type FillerBid, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmChain, 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 IntentGatewayContext, type IntentGatewayParams, ABI$1 as IntentGatewayV2ABI, IntentOrderStatus, type IntentOrderStatusKey, type IntentOrderStatusUpdate, IntentsCoprocessor, type IsmpRequest, MOCK_ADDRESS, type NewDeployment, ORDER_V2_PARAM_TYPE, type Order, type OrderResponse, OrderStatus, OrderStatusChecker, type OrderStatusMetadata, type OrderWithStatus, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, type PackedUserOperation, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, type QuoteNativeResult, 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, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, type SelectBidResult, type SelectOptions, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, type StorageFacade, type SubmitBidOptions, SubstrateChain, Swap, TESTNET_CHAINS, type TeleportParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, TokenGateway, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type Transaction, TronChain, type TronChainParams, USE_ETHERSCAN_CHAINS, type XcmGatewayParams, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createEvmChain, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChainId, getConfigByStateMachineId, getContractCallInput, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, orderCommitment, parseStateMachineId, polkadotAssetHubPaseo, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };

package/dist/node/index.js

@@ -14826,6 +14826,34 @@ async function convertGasToFeeToken(ctx, gasEstimate, gasEstimateIn, evmChainID,
     return parseUnits(gasCostInFeeToken.toFixed(feeToken.decimals), feeToken.decimals);
   }
 }
+async function convertFeeTokenToWei(ctx, feeTokenAmount, feeTokenIn, evmChainID) {
+  const chain = ctx[feeTokenIn];
+  const client = chain.client;
+  const wethAddr = chain.configService.getWrappedNativeAssetWithDecimals(evmChainID).asset;
+  const feeToken = await getFeeToken(ctx, evmChainID, chain);
+  try {
+    const { amountOut } = await ctx.swap.findBestProtocolWithAmountIn(
+      client,
+      feeToken.address,
+      wethAddr,
+      feeTokenAmount,
+      evmChainID,
+      { selectedProtocol: "v2" }
+    );
+    if (amountOut === 0n) {
+      throw new Error();
+    }
+    return amountOut;
+  } catch {
+    const nativeCurrency = client.chain?.nativeCurrency;
+    const chainId = Number.parseInt(evmChainID.split("-")[1]);
+    const feeTokenAmountInToken = new Decimal2(formatUnits(feeTokenAmount, feeToken.decimals));
+    const nativeTokenPriceUsd = await fetchPrice(nativeCurrency?.symbol, chainId);
+    const feeTokenAmountUsd = feeTokenAmountInToken.times(new Decimal2(1));
+    const nativeAmount = feeTokenAmountUsd.dividedBy(nativeTokenPriceUsd);
+    return parseUnits(nativeAmount.toFixed(nativeCurrency?.decimals ?? 18), nativeCurrency?.decimals ?? 18);
+  }
+}
 
 // src/protocols/intents/OrderPlacer.ts
 var OrderPlacer = class {
@@ -15157,21 +15185,20 @@ var OrderCanceller = class {
     this.ctx = ctx;
   }
   /**
-   * Quotes the native token cost of cancelling an order from the given chain.
-   *
-   * For same-chain orders the cost is zero. For cross-chain orders, the
-   * quote covers the ISMP GET/POST dispatch fee.
+   * 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
+   * submitting the cancel transaction.
    *
-   * @param order - The order to quote a cancellation for.
-   * @param fromDest - If `true`, quotes the destination-initiated cancellation fee.
-   *   Defaults to `false` (source-side cancellation).
-   * @returns The native token amount required to submit the cancel transaction.
+   * @param order - The order to quote.
+   * @param fromDest - If `true`, quotes the destination-initiated path.
+   * @returns `{ nativeValue }` — native token amount (wei) to send as `value`;
+   *   `{ relayerFee }` — relayer incentive denominated in the chain's fee token.
    */
-  async quoteCancelNative(order, fromDest = false) {
+  async quoteCancelOrder(order, fromDest = false) {
     if (fromDest) {
-      return this.quoteCancelNativeFromDest(order);
+      return this.quoteCancelFromDest(order);
     }
-    return this.quoteCancelNativeFromSource(order);
+    return this.quoteCancelFromSource(order);
   }
   /**
    * Quotes the native token cost of a source-initiated cross-chain cancellation.
@@ -15183,8 +15210,9 @@ var OrderCanceller = class {
    * @param order - The order to quote.
    * @returns The native token dispatch fee in wei.
    */
-  async quoteCancelNativeFromSource(order) {
-    if (order.source === order.destination) return 0n;
+  async quoteCancelFromSource(order) {
+    if (order.source === order.destination) return { nativeValue: 0n, relayerFee: 0n };
+    const sourceStateMachine = order.source.startsWith("0x") ? hexToString(order.source) : order.source;
     const height = order.deadline + 1n;
     const destIntentGateway = this.ctx.dest.configService.getIntentGatewayV2Address(
       hexToString(order.destination)
@@ -15198,7 +15226,7 @@ var OrderCanceller = class {
     const key = concatHex([destIntentGateway, slotHash]);
     const context = encodeWithdrawalRequest(order, order.user);
     const getRequest = {
-      source: order.source.startsWith("0x") ? hexToString(order.source) : order.source,
+      source: sourceStateMachine,
       dest: order.destination.startsWith("0x") ? hexToString(order.destination) : order.destination,
       from: this.ctx.source.configService.getIntentGatewayV2Address(hexToString(order.destination)),
       nonce: await this.ctx.source.getHostNonce(),
@@ -15207,7 +15235,10 @@ var OrderCanceller = class {
       timeoutTimestamp: 0n,
       context
     };
-    return await this.ctx.source.quoteNative(getRequest, 0n);
+    const feeInSourceFeeToken = await convertGasToFeeToken(this.ctx, 400000n, "source", sourceStateMachine);
+    const relayerFee = feeInSourceFeeToken * 1005n / 1000n;
+    const nativeValue = await this.ctx.source.quoteNative(getRequest, relayerFee);
+    return { nativeValue, relayerFee };
   }
   /**
    * Async generator that cancels an order and streams status events until
@@ -15302,17 +15333,17 @@ var OrderCanceller = class {
       STORAGE_KEYS.getRequest(orderId)
     );
     if (!getRequest) {
-      const value = await this.quoteCancelNativeFromSource(order);
+      const quote = await this.quoteCancelFromSource(order);
       const data = encodeFunctionData({
         abi: ABI7,
         functionName: "cancelOrder",
-        args: [transformOrderForContract(order), { relayerFee: 0n, height: destIProof.height }]
+        args: [transformOrderForContract(order), { relayerFee: quote.relayerFee, height: destIProof.height }]
       });
       const signedTransaction = yield {
         status: "AWAITING_CANCEL_TRANSACTION",
         data,
         to: intentGatewayAddress,
-        value
+        value: quote.nativeValue
       };
       const receipt = signedTransaction.length === 66 ? await this.ctx.source.getTransactionReceipt(signedTransaction) : await this.ctx.source.broadcastTransaction(signedTransaction);
       const events = parseEventLogs({ abi: evmHost_default.ABI, logs: receipt.logs });
@@ -15397,8 +15428,8 @@ var OrderCanceller = class {
    * @param order - The order to quote.
    * @returns The native token dispatch fee in wei.
    */
-  async quoteCancelNativeFromDest(order) {
-    if (order.source === order.destination) return 0n;
+  async quoteCancelFromDest(order) {
+    if (order.source === order.destination) return { nativeValue: 0n, relayerFee: 0n };
     const destStateMachine = order.destination.startsWith("0x") ? hexToString(order.destination) : order.destination;
     const sourceStateMachine = order.source.startsWith("0x") ? hexToString(order.source) : order.source;
     const destIntentGateway = this.ctx.dest.configService.getIntentGatewayV2Address(destStateMachine);
@@ -15414,7 +15445,8 @@ var OrderCanceller = class {
       body,
       timeoutTimestamp: 0n
     };
-    return await this.ctx.dest.quoteNative(postRequest, relayerFee);
+    const nativeValue = await this.ctx.dest.quoteNative(postRequest, relayerFee);
+    return { nativeValue, relayerFee };
   }
   /**
    * Async generator that cancels an order by initiating from the destination
@@ -15447,17 +15479,17 @@ var OrderCanceller = class {
       STORAGE_KEYS.postCommitment(orderId)
     );
     if (!commitment) {
-      const value = await this.quoteCancelNativeFromDest(order);
+      const quote = await this.quoteCancelFromDest(order);
       const data = encodeFunctionData({
         abi: ABI7,
         functionName: "cancelOrder",
-        args: [transformOrderForContract(order), { relayerFee: 0n, height: 0n }]
+        args: [transformOrderForContract(order), { relayerFee: quote.relayerFee, height: 0n }]
       });
       const signedTransaction = yield {
         status: "AWAITING_CANCEL_TRANSACTION",
         data,
         to: intentGatewayAddress,
-        value
+        value: quote.nativeValue
       };
       const receipt = signedTransaction.length === 66 ? await this.ctx.dest.getTransactionReceipt(signedTransaction) : await this.ctx.dest.broadcastTransaction(signedTransaction);
       yield {
@@ -17887,7 +17919,7 @@ var GasEstimator = class {
       }
     }
     const totalGas = callGasLimit + verificationGasLimit + preVerificationGas;
-    const totalGasCostWei = totalGas * maxFeePerGas;
+    const rawTotalGasCostWei = totalGas * maxFeePerGas;
     const totalGasInDestFeeToken = await convertGasToFeeToken(
       this.ctx,
       totalGas,
@@ -17895,11 +17927,8 @@ var GasEstimator = class {
       destStateMachineId,
       gasPrice
     );
-    const totalGasInSourceFeeToken = adjustDecimals(
-      totalGasInDestFeeToken,
-      destFeeToken.decimals,
-      sourceFeeToken.decimals
-    );
+    const totalGasInSourceFeeToken = isSameChain ? totalGasInDestFeeToken : adjustDecimals(totalGasInDestFeeToken, destFeeToken.decimals, sourceFeeToken.decimals);
+    const totalGasCostWei = isSameChain ? rawTotalGasCostWei : await convertFeeTokenToWei(this.ctx, totalGasInSourceFeeToken, "source", souceStateMachineId);
     return {
       callGasLimit,
       verificationGasLimit,
@@ -18340,17 +18369,18 @@ var IntentGateway = class _IntentGateway {
     return;
   }
   /**
-   * Quotes the native token cost for cancelling an order.
+   * Returns both the native token cost and the relayer fee for cancelling an
+   * order. Use `relayerFee` to approve the ERC-20 spend before submitting.
    *
-   * Delegates to {@link OrderCanceller.quoteCancelNative}.
+   * Delegates to {@link OrderCanceller.quoteCancelOrder}.
    *
    * @param order - The order to quote cancellation for.
    * @param fromDest - If `true`, quotes the destination-initiated cancellation fee.
-   *   Defaults to `false` (source-side cancellation).
-   * @returns The native token amount required to submit the cancel transaction.
+   * @returns `{ nativeValue }` — native token amount (wei) to send as `value`;
+   *   `{ relayerFee }` — relayer incentive denominated in the chain's fee token.
    */
-  async quoteCancelNative(order, fromDest = false) {
-    return this.orderCanceller.quoteCancelNative(order, fromDest);
+  async quoteCancelOrder(order, fromDest = false) {
+    return this.orderCanceller.quoteCancelOrder(order, fromDest);
   }
   /**
    * Async generator that cancels an order and streams status events until