@hyperbridge/sdk 2.5.0 → 2.6.1

package/dist/node/index.d.cts

@@ -1,5 +1,5 @@
-import { I as IChain, H as HexString, a as IEvmConfig, C as ChainConfigService, b as IMessage, S as StateMachineIdParams, c as StateMachineHeight, d as IIsmpMessage, e as IPostRequest, f as IGetRequest, O as Order, E as EstimateGasCallData, R as RetryConfig, g as IPolkadotHubConfig, h as IPharosConfig, i as StateMachineUpdate, P as PostRequestWithStatus, G as GetRequestWithStatus, j as ResponseCommitmentWithValues, k as RequestStatusWithMetadata, l as PostRequestTimeoutStatus, m as SubstrateChain, n as ClientConfig, o as IndexerQueryClient, A as AssetTeleported, T as Transaction, p as IProof, q as IEvmChain, r as IntentsCoprocessor, s as AvailableLiquiditySnapshot, t as IntentOrderStatusUpdate, u as SelectBidResult, v as ResumeIntentOrderOptions, w as CancelOrderOptions, x as CancelQuote, y as SubmitBidOptions, z as PackedUserOperation, F as FillerBid, B as Bid, D as EstimateFillOrderParams, J as FillOrderEstimate, K as ERC7821Call, L as OrderWithStatus, M as OrderStatus, N as TokenGatewayAssetTeleportedWithStatus, Q as TeleportStatus, U as DecodedOrderPlacedLog, V as DecodedPostRequestEvent, W as DecodedPostResponseEvent } from './IntentGatewayV2-tYGohDdW.cjs';
-export { X as AllStatusKey, Y as AssetTeleportedResponse, Z as AvailableLiquidityByChain, _ as BidStorageEntry, $ as BidSubmissionResult, a0 as BlockMetadata, a1 as BytesLikeHex, a2 as CancelOptions, a3 as ChainConfig, a4 as ChainConfigData, a5 as Chains, a6 as ConfiguredAssetSymbol, a7 as Deployment, a8 as DispatchGet, a9 as DispatchInfo, aa as DispatchPost, ab as ExecuteIntentOrderOptions, ac as ExecutionResult, ad as FillOptions, ae as FillerConfig, af as GetRequestResponse, ag as GetResponseByRequestIdResponse, ah as GetResponseStorageValues, ai as HostParams, aj as HyperClientStatus, ak as IBatchConsensusAndGetResponseMessage, al as IBatchConsensusAndPostRequestMessage, am as IConfig, an as IConsensusMessage, ao as IGetRequestMessage, ap as IGetResponse, aq as IGetResponseMessage, ar as IHyperbridgeConfig, as as IPostResponse, at as IRequestMessage, au as ISubstrateConfig, av as ITimeoutPostRequestMessage, aw as IntentGatewayABI, ax as IntentGatewayParams, ay as IntentOrderStatus, az as IntentOrderStatusKey, aA as IsmpRequest, aB as OrderResponse, aC as OrderStatusMetadata, aD as PaymentInfo, aE as PhantomOrderEvent, aF as PhantomOrderPriceSnapshot, aG as PhantomOrderPriceSnapshotsResponse, aH as PollPhantomOrdersOptions, aI as PostRequestStatus, aJ as RequestBody, aK as RequestCommitment, aL as RequestKind, aM as RequestResponse, aN as RequestStatus, aO as RequestStatusKey, aP as SelectOptions, aQ as SigningAccount, aR as StateMachineId, aS as StateMachineResponse, aT as StorageFacade, aU as TimeoutStatus, aV as TimeoutStatusKey, aW as TokenGatewayAssetTeleportedResponse, aX as TokenInfo, aY as TokenPrice, aZ as TokenPricesResponse, a_ as UniswapV4PoolConfigData, a$ as chainConfigs, b0 as convertCodecToIGetRequest, b1 as convertCodecToIProof, b2 as convertIGetRequestToCodec, b3 as convertIProofToCodec, b4 as convertStateIdToStateMachineId, b5 as convertStateMachineEnumToString, b6 as convertStateMachineIdToEnum, b7 as decodeERC7821ExecuteBatch, b8 as decodeUserOpScale, b9 as encodeERC7821ExecuteBatch, ba as encodeISMPMessage, bb as encodeUserOpScale, bc as getChainId, bd as getConfigByStateMachineId, be as getViemChain, bf as hyperbridgeAddress, bg as pharosAtlantic, bh as pharosMainnet, bi as polkadotAssetHubPaseo, bj as polkadotHubMainnet, bk as tronChainIds, bl as tronNile } from './IntentGatewayV2-tYGohDdW.cjs';
+import { I as IChain, H as HexString, a as IEvmConfig, C as ChainConfigService, b as IMessage, S as StateMachineIdParams, c as StateMachineHeight, d as IIsmpMessage, e as IPostRequest, f as IGetRequest, O as Order, E as EstimateGasCallData, R as RetryConfig, g as IPolkadotHubConfig, h as IPharosConfig, i as StateMachineUpdate, P as PostRequestWithStatus, G as GetRequestWithStatus, j as ResponseCommitmentWithValues, k as RequestStatusWithMetadata, l as PostRequestTimeoutStatus, m as SubstrateChain, n as ClientConfig, o as IndexerQueryClient, A as AssetTeleported, T as Transaction, p as IProof, q as IEvmChain, r as IntentsCoprocessor, s as AvailableLiquiditySnapshot, t as IntentOrderStatusUpdate, u as SelectBidResult, v as ResumeIntentOrderOptions, w as CancelOrderOptions, x as CancelQuote, y as SubmitBidOptions, z as PackedUserOperation, F as FillerBid, B as Bid, D as EstimateFillOrderParams, J as FillOrderEstimate, K as ERC7821Call, L as OrderWithStatus, M as OrderStatus, N as TokenGatewayAssetTeleportedWithStatus, Q as TeleportStatus, U as DecodedOrderPlacedLog, V as DecodedPostRequestEvent, W as DecodedPostResponseEvent } from './IntentGatewayV2-BJUF1dsr.cjs';
+export { X as AllStatusKey, Y as AssetTeleportedResponse, Z as AvailableLiquidityByChain, _ as BidStorageEntry, $ as BidSubmissionResult, a0 as BlockMetadata, a1 as BytesLikeHex, a2 as CancelOptions, a3 as ChainConfig, a4 as ChainConfigData, a5 as Chains, a6 as ConfiguredAssetSymbol, a7 as Deployment, a8 as DispatchGet, a9 as DispatchInfo, aa as DispatchPost, ab as ExecuteIntentOrderOptions, ac as ExecutionResult, ad as FillOptions, ae as FillerConfig, af as GetRequestResponse, ag as GetResponseByRequestIdResponse, ah as GetResponseStorageValues, ai as HostParams, aj as HyperClientStatus, ak as IBatchConsensusAndGetResponseMessage, al as IBatchConsensusAndPostRequestMessage, am as IConfig, an as IConsensusMessage, ao as IGetRequestMessage, ap as IGetResponse, aq as IGetResponseMessage, ar as IHyperbridgeConfig, as as IPostResponse, at as IRequestMessage, au as ISubstrateConfig, av as ITimeoutPostRequestMessage, aw as IntentGatewayABI, ax as IntentGatewayParams, ay as IntentOrderStatus, az as IntentOrderStatusKey, aA as IsmpRequest, aB as OrderResponse, aC as OrderStatusMetadata, aD as PaymentInfo, aE as PhantomOrderEvent, aF as PhantomOrderPriceSnapshot, aG as PhantomOrderPriceSnapshotsResponse, aH as PollPhantomOrdersOptions, aI as PostRequestStatus, aJ as RequestBody, aK as RequestCommitment, aL as RequestKind, aM as RequestResponse, aN as RequestStatus, aO as RequestStatusKey, aP as SelectOptions, aQ as SigningAccount, aR as StateMachineId, aS as StateMachineResponse, aT as StorageFacade, aU as TimeoutStatus, aV as TimeoutStatusKey, aW as TokenGatewayAssetTeleportedResponse, aX as TokenInfo, aY as TokenPrice, aZ as TokenPricesResponse, a_ as UniswapV4PoolConfigData, a$ as chainConfigs, b0 as convertCodecToIGetRequest, b1 as convertCodecToIProof, b2 as convertIGetRequestToCodec, b3 as convertIProofToCodec, b4 as convertStateIdToStateMachineId, b5 as convertStateMachineEnumToString, b6 as convertStateMachineIdToEnum, b7 as decodeERC7821ExecuteBatch, b8 as decodeUserOpScale, b9 as encodeERC7821ExecuteBatch, ba as encodeISMPMessage, bb as encodeUserOpScale, bc as getChainId, bd as getConfigByStateMachineId, be as getViemChain, bf as hyperbridgeAddress, bg as pharosAtlantic, bh as pharosMainnet, bi as polkadotAssetHubPaseo, bj as polkadotHubMainnet, bk as tronChainIds, bl as tronNile } from './IntentGatewayV2-BJUF1dsr.cjs';
 import { ConsolaInstance } from 'consola';
 import { GraphQLClient } from 'graphql-request';
 import { PublicClient, TransactionReceipt, Hex, Address } from 'viem';
@@ -1917,10 +1917,12 @@ declare class IntentGateway {
      * placement, fee estimation, bid collection, and execution.
      *
      * **Yield/receive protocol:**
-     * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and sets
-     *    same-chain fees to twice the estimate. Cross-chain orders retain a 1% buffer
-     *    and include an additional 600k-gas fee uplift, while the wei cost used for
-     *    the `value` field receives a 2% buffer.
+     * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and
+     *    sets same-chain fees to twice the estimate. Cross-chain orders attach
+     *    (fill gas + a settlement-message uplift of `RELAYER_MESSAGE_GAS`, the
+     *    same gas budget the solver's relayer fee uses) with a 5% buffer over
+     *    the whole sum — strictly above the solver's unpadded requirement. The
+     *    wei cost used for the `value` field receives a 2% buffer.
      * 2. Yields `AWAITING_PLACE_ORDER` with `{ to, data, value, sessionPrivateKey }`.
      *    The caller must sign the transaction and pass it back via `gen.next(signedTx)`.
      * 3. Yields `ORDER_PLACED` with the finalised order and transaction hash once

package/dist/node/index.d.ts

@@ -1,5 +1,5 @@
-import { I as IChain, H as HexString, a as IEvmConfig, C as ChainConfigService, b as IMessage, S as StateMachineIdParams, c as StateMachineHeight, d as IIsmpMessage, e as IPostRequest, f as IGetRequest, O as Order, E as EstimateGasCallData, R as RetryConfig, g as IPolkadotHubConfig, h as IPharosConfig, i as StateMachineUpdate, P as PostRequestWithStatus, G as GetRequestWithStatus, j as ResponseCommitmentWithValues, k as RequestStatusWithMetadata, l as PostRequestTimeoutStatus, m as SubstrateChain, n as ClientConfig, o as IndexerQueryClient, A as AssetTeleported, T as Transaction, p as IProof, q as IEvmChain, r as IntentsCoprocessor, s as AvailableLiquiditySnapshot, t as IntentOrderStatusUpdate, u as SelectBidResult, v as ResumeIntentOrderOptions, w as CancelOrderOptions, x as CancelQuote, y as SubmitBidOptions, z as PackedUserOperation, F as FillerBid, B as Bid, D as EstimateFillOrderParams, J as FillOrderEstimate, K as ERC7821Call, L as OrderWithStatus, M as OrderStatus, N as TokenGatewayAssetTeleportedWithStatus, Q as TeleportStatus, U as DecodedOrderPlacedLog, V as DecodedPostRequestEvent, W as DecodedPostResponseEvent } from './IntentGatewayV2-tYGohDdW.js';
-export { X as AllStatusKey, Y as AssetTeleportedResponse, Z as AvailableLiquidityByChain, _ as BidStorageEntry, $ as BidSubmissionResult, a0 as BlockMetadata, a1 as BytesLikeHex, a2 as CancelOptions, a3 as ChainConfig, a4 as ChainConfigData, a5 as Chains, a6 as ConfiguredAssetSymbol, a7 as Deployment, a8 as DispatchGet, a9 as DispatchInfo, aa as DispatchPost, ab as ExecuteIntentOrderOptions, ac as ExecutionResult, ad as FillOptions, ae as FillerConfig, af as GetRequestResponse, ag as GetResponseByRequestIdResponse, ah as GetResponseStorageValues, ai as HostParams, aj as HyperClientStatus, ak as IBatchConsensusAndGetResponseMessage, al as IBatchConsensusAndPostRequestMessage, am as IConfig, an as IConsensusMessage, ao as IGetRequestMessage, ap as IGetResponse, aq as IGetResponseMessage, ar as IHyperbridgeConfig, as as IPostResponse, at as IRequestMessage, au as ISubstrateConfig, av as ITimeoutPostRequestMessage, aw as IntentGatewayABI, ax as IntentGatewayParams, ay as IntentOrderStatus, az as IntentOrderStatusKey, aA as IsmpRequest, aB as OrderResponse, aC as OrderStatusMetadata, aD as PaymentInfo, aE as PhantomOrderEvent, aF as PhantomOrderPriceSnapshot, aG as PhantomOrderPriceSnapshotsResponse, aH as PollPhantomOrdersOptions, aI as PostRequestStatus, aJ as RequestBody, aK as RequestCommitment, aL as RequestKind, aM as RequestResponse, aN as RequestStatus, aO as RequestStatusKey, aP as SelectOptions, aQ as SigningAccount, aR as StateMachineId, aS as StateMachineResponse, aT as StorageFacade, aU as TimeoutStatus, aV as TimeoutStatusKey, aW as TokenGatewayAssetTeleportedResponse, aX as TokenInfo, aY as TokenPrice, aZ as TokenPricesResponse, a_ as UniswapV4PoolConfigData, a$ as chainConfigs, b0 as convertCodecToIGetRequest, b1 as convertCodecToIProof, b2 as convertIGetRequestToCodec, b3 as convertIProofToCodec, b4 as convertStateIdToStateMachineId, b5 as convertStateMachineEnumToString, b6 as convertStateMachineIdToEnum, b7 as decodeERC7821ExecuteBatch, b8 as decodeUserOpScale, b9 as encodeERC7821ExecuteBatch, ba as encodeISMPMessage, bb as encodeUserOpScale, bc as getChainId, bd as getConfigByStateMachineId, be as getViemChain, bf as hyperbridgeAddress, bg as pharosAtlantic, bh as pharosMainnet, bi as polkadotAssetHubPaseo, bj as polkadotHubMainnet, bk as tronChainIds, bl as tronNile } from './IntentGatewayV2-tYGohDdW.js';
+import { I as IChain, H as HexString, a as IEvmConfig, C as ChainConfigService, b as IMessage, S as StateMachineIdParams, c as StateMachineHeight, d as IIsmpMessage, e as IPostRequest, f as IGetRequest, O as Order, E as EstimateGasCallData, R as RetryConfig, g as IPolkadotHubConfig, h as IPharosConfig, i as StateMachineUpdate, P as PostRequestWithStatus, G as GetRequestWithStatus, j as ResponseCommitmentWithValues, k as RequestStatusWithMetadata, l as PostRequestTimeoutStatus, m as SubstrateChain, n as ClientConfig, o as IndexerQueryClient, A as AssetTeleported, T as Transaction, p as IProof, q as IEvmChain, r as IntentsCoprocessor, s as AvailableLiquiditySnapshot, t as IntentOrderStatusUpdate, u as SelectBidResult, v as ResumeIntentOrderOptions, w as CancelOrderOptions, x as CancelQuote, y as SubmitBidOptions, z as PackedUserOperation, F as FillerBid, B as Bid, D as EstimateFillOrderParams, J as FillOrderEstimate, K as ERC7821Call, L as OrderWithStatus, M as OrderStatus, N as TokenGatewayAssetTeleportedWithStatus, Q as TeleportStatus, U as DecodedOrderPlacedLog, V as DecodedPostRequestEvent, W as DecodedPostResponseEvent } from './IntentGatewayV2-BJUF1dsr.js';
+export { X as AllStatusKey, Y as AssetTeleportedResponse, Z as AvailableLiquidityByChain, _ as BidStorageEntry, $ as BidSubmissionResult, a0 as BlockMetadata, a1 as BytesLikeHex, a2 as CancelOptions, a3 as ChainConfig, a4 as ChainConfigData, a5 as Chains, a6 as ConfiguredAssetSymbol, a7 as Deployment, a8 as DispatchGet, a9 as DispatchInfo, aa as DispatchPost, ab as ExecuteIntentOrderOptions, ac as ExecutionResult, ad as FillOptions, ae as FillerConfig, af as GetRequestResponse, ag as GetResponseByRequestIdResponse, ah as GetResponseStorageValues, ai as HostParams, aj as HyperClientStatus, ak as IBatchConsensusAndGetResponseMessage, al as IBatchConsensusAndPostRequestMessage, am as IConfig, an as IConsensusMessage, ao as IGetRequestMessage, ap as IGetResponse, aq as IGetResponseMessage, ar as IHyperbridgeConfig, as as IPostResponse, at as IRequestMessage, au as ISubstrateConfig, av as ITimeoutPostRequestMessage, aw as IntentGatewayABI, ax as IntentGatewayParams, ay as IntentOrderStatus, az as IntentOrderStatusKey, aA as IsmpRequest, aB as OrderResponse, aC as OrderStatusMetadata, aD as PaymentInfo, aE as PhantomOrderEvent, aF as PhantomOrderPriceSnapshot, aG as PhantomOrderPriceSnapshotsResponse, aH as PollPhantomOrdersOptions, aI as PostRequestStatus, aJ as RequestBody, aK as RequestCommitment, aL as RequestKind, aM as RequestResponse, aN as RequestStatus, aO as RequestStatusKey, aP as SelectOptions, aQ as SigningAccount, aR as StateMachineId, aS as StateMachineResponse, aT as StorageFacade, aU as TimeoutStatus, aV as TimeoutStatusKey, aW as TokenGatewayAssetTeleportedResponse, aX as TokenInfo, aY as TokenPrice, aZ as TokenPricesResponse, a_ as UniswapV4PoolConfigData, a$ as chainConfigs, b0 as convertCodecToIGetRequest, b1 as convertCodecToIProof, b2 as convertIGetRequestToCodec, b3 as convertIProofToCodec, b4 as convertStateIdToStateMachineId, b5 as convertStateMachineEnumToString, b6 as convertStateMachineIdToEnum, b7 as decodeERC7821ExecuteBatch, b8 as decodeUserOpScale, b9 as encodeERC7821ExecuteBatch, ba as encodeISMPMessage, bb as encodeUserOpScale, bc as getChainId, bd as getConfigByStateMachineId, be as getViemChain, bf as hyperbridgeAddress, bg as pharosAtlantic, bh as pharosMainnet, bi as polkadotAssetHubPaseo, bj as polkadotHubMainnet, bk as tronChainIds, bl as tronNile } from './IntentGatewayV2-BJUF1dsr.js';
 import { ConsolaInstance } from 'consola';
 import { GraphQLClient } from 'graphql-request';
 import { PublicClient, TransactionReceipt, Hex, Address } from 'viem';
@@ -1917,10 +1917,12 @@ declare class IntentGateway {
      * placement, fee estimation, bid collection, and execution.
      *
      * **Yield/receive protocol:**
-     * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and sets
-     *    same-chain fees to twice the estimate. Cross-chain orders retain a 1% buffer
-     *    and include an additional 600k-gas fee uplift, while the wei cost used for
-     *    the `value` field receives a 2% buffer.
+     * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and
+     *    sets same-chain fees to twice the estimate. Cross-chain orders attach
+     *    (fill gas + a settlement-message uplift of `RELAYER_MESSAGE_GAS`, the
+     *    same gas budget the solver's relayer fee uses) with a 5% buffer over
+     *    the whole sum — strictly above the solver's unpadded requirement. The
+     *    wei cost used for the `value` field receives a 2% buffer.
      * 2. Yields `AWAITING_PLACE_ORDER` with `{ to, data, value, sessionPrivateKey }`.
      *    The caller must sign the transaction and pass it back via `gen.next(signedTx)`.
      * 3. Yields `ORDER_PLACED` with the finalised order and transaction hash once

package/dist/node/index.js

@@ -2678,7 +2678,11 @@ var chainConfigs = {
       DAI: "0x6b175474e89094c44da98b954eedeac495271d0f",
       USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
       USDT: "0xdac17f958d2ee523a2206206994597c13d831ec7",
-      cNGN: "0x17CDB2a01e7a34CbB3DD4b83260B05d0274C8dab"
+      cNGN: "0x17CDB2a01e7a34CbB3DD4b83260B05d0274C8dab",
+      ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
+      EURC: "0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
+      XSGD: "0x70e8dE73cE538DA2bEEd35d14187F6959a8ecA96",
+      TRYB: "0x2C537E5624e4af88A7ae4060C022609376C8D0EB"
     },
     tokenDecimals: {
       USDC: 6,
@@ -2848,7 +2852,9 @@ var chainConfigs = {
       USDC: "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913",
       USDT: "0xfde4c96c8593536e31f229ea8f37b2ada2699bb2",
       EXT: "0x0e668E5127087e236578893a0e01E41837A28469",
-      cNGN: "0x46C85152bFe9f96829aA94755D9f915F9B10EF5F"
+      cNGN: "0x46C85152bFe9f96829aA94755D9f915F9B10EF5F",
+      ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
+      EURC: "0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42"
     },
     tokenDecimals: {
       USDC: 6,
@@ -2908,7 +2914,9 @@ var chainConfigs = {
       USDC: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
       USDT: "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
       EXT: "0x7C8c11ADb8EF7cd3CFa718008Ea048445C6E7209",
-      cNGN: "0x52828daa48C1a9A06F37500882b42daf0bE04C3B"
+      cNGN: "0x52828daa48C1a9A06F37500882b42daf0bE04C3B",
+      ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
+      XSGD: "0xDC3326e71D45186F113a2F448984CA0e8D201995"
     },
     tokenDecimals: {
       USDC: 6,
@@ -5145,6 +5153,21 @@ var ChainConfigService = class {
   getCNgnAsset(chain) {
     return this.getConfig(chain)?.assets?.cNGN;
   }
+  /**
+   * Address of `symbol` on `chain` from the per-chain asset table, matched
+   * case-insensitively ("cNGN" ≡ "CNGN"). This table is the single source of
+   * truth for token addresses — the simplex asset registry resolves through
+   * it, so a new asset is added once in `chain.ts` and nowhere else.
+   */
+  getAssetBySymbol(chain, symbol) {
+    const assets = this.getConfig(chain)?.assets;
+    if (!assets) return void 0;
+    const target = symbol.trim().toUpperCase();
+    for (const [key, address] of Object.entries(assets)) {
+      if (key.toUpperCase() === target) return address;
+    }
+    return void 0;
+  }
   getCNgnDecimals(chain) {
     return this.getConfig(chain)?.tokenDecimals?.cNGN;
   }
@@ -7368,29 +7391,28 @@ var SubstrateChain = class _SubstrateChain {
     return BigInt(latestHeight);
   }
   /**
-   * Get the state machine update time for a given state machine height.
+   * Get the state machine update time for a given state machine height. Reads the
+   * `BoundedStateMachineUpdateTime` map in pallet-ismp directly, so the height is either
+   * still retained on-chain or it has been evicted — there's no intermediate RPC to
+   * reinterpret the absence.
    * @param {StateMachineHeight} stateMachineHeight - The state machine height.
    * @returns {Promise<bigint>} The statemachine update time in seconds.
    */
   async stateMachineUpdateTime(stateMachineHeight) {
-    const state_id = convertStateIdToStateMachineId(stateMachineHeight.id.stateId);
-    const stateMachineId = {
-      state_id,
-      consensus_state_id: stateMachineHeight.id.consensusStateId
-    };
-    const payload = {
-      id: stateMachineId,
-      height: Number(stateMachineHeight.height)
+    if (!this.api) throw new Error("API not initialized");
+    const id = {
+      stateId: stateMachineHeight.id.stateId,
+      // on-chain StateMachineId encodes consensusStateId as [u8; 4]
+      consensusStateId: toHex(toBytes(stateMachineHeight.id.consensusStateId))
     };
-    try {
-      const updateTime = await this.rpcClient.call("ismp_queryStateMachineUpdateTime", [payload]);
-      return BigInt(updateTime);
-    } catch (error) {
-      if (MissingConsensusUpdateTimeError.isError(error)) {
-        throw new MissingConsensusUpdateTimeError(MISSING_CONSENSUS_UPDATE_TIME_MESSAGE, { cause: error });
-      }
-      throw error;
+    const updateTime = await this.api.query.ismp.boundedStateMachineUpdateTime(
+      id,
+      Number(stateMachineHeight.height)
+    );
+    if (updateTime.isNone) {
+      throw new MissingConsensusUpdateTimeError(MISSING_CONSENSUS_UPDATE_TIME_MESSAGE);
     }
+    return BigInt(updateTime.unwrap().toString());
   }
   /**
    * Get the challenge period for a given state machine id.
@@ -17241,6 +17263,7 @@ var BidManager = class {
     }
   }
 };
+var RELAYER_MESSAGE_GAS = 1000000n;
 var GasEstimator = class {
   /**
    * @param ctx - Shared IntentsV2 context providing the source and destination
@@ -17261,7 +17284,12 @@ var GasEstimator = class {
    *
    * **Cross-chain orders:** also estimates the ISMP POST request fee required
    * for the solver to trigger source-chain escrow redemption after filling, and
-   * includes it in `fillOptions.relayerFee` and `fillOptions.nativeDispatchFee`.
+   * includes it in `fillOptions.relayerFee`. The dispatch is always paid in the
+   * fee token — `nativeDispatchFee` is fixed at 0. The native rail would draw
+   * from the solver account's native balance, which nothing guarantees, and a
+   * shortfall is invisible to estimation (the account balance is overridden
+   * during simulation) — it would only surface as a reverted execution that
+   * still bills the paymaster.
    *
    * **Bundler path:** constructs a mock `PackedUserOperation` signed by an
    * ephemeral keypair, applies state overrides, and calls
@@ -17310,24 +17338,19 @@ var GasEstimator = class {
         intentGatewayV2Address,
         entryPointAddress
       }),
-      isSameChain ? Promise.resolve({ postRequestFee: 0n, protocolFee: 0n }) : this.estimateCrossChainFees(
-        sourceFeeToken,
-        destFeeToken,
-        souceStateMachineId,
-        destStateMachineId,
-        order
-      )
+      isSameChain ? Promise.resolve({ postRequestFee: 0n, relayerFeeInSourceFeeToken: 0n }) : this.estimateCrossChainFees(sourceFeeToken, destFeeToken, souceStateMachineId)
     ]);
     const { viem: stateOverrides, bundler: bundlerStateOverrides } = stateOverridesResult;
     const fillOptions = {
       relayerFee: crossChainFees.postRequestFee,
-      nativeDispatchFee: crossChainFees.protocolFee,
+      // Always dispatch with the fee token (see the method docs).
+      nativeDispatchFee: 0n,
       outputs: order.output.assets.map((asset) => ({
         ...asset,
         token: normalizeAddressForEvmBytes32(asset.token)
       }))
     };
-    const totalNativeValue = totalEthValue + fillOptions.nativeDispatchFee;
+    const totalNativeValue = totalEthValue;
     const priorityFeeBumpPercent = params.maxPriorityFeePerGasBumpPercent ?? 8;
     const maxFeeBumpPercent = params.maxFeePerGasBumpPercent ?? 10;
     let maxPriorityFeePerGas = gasPrice + gasPrice * BigInt(priorityFeeBumpPercent) / 100n;
@@ -17494,37 +17517,32 @@ var GasEstimator = class {
       maxPriorityFeePerGas,
       totalGasCostWei,
       totalGasInFeeToken: totalGasInSourceFeeToken,
+      relayerFeeInSourceFeeToken: crossChainFees.relayerFeeInSourceFeeToken,
       fillOptions
     };
   }
   /**
-   * Estimates cross-chain ISMP POST request fees by running the gas-to-fee-token
-   * conversion and host nonce fetch in parallel, then quoting the native dispatch cost.
-   */
-  async estimateCrossChainFees(sourceFeeToken, destFeeToken, sourceChainId, destChainId, order) {
-    const postRequestGas = 400000n;
-    const [postRequestFeeInSourceFeeToken, nonce] = await Promise.all([
-      convertGasToFeeToken(this.ctx, postRequestGas, "source", sourceChainId),
-      this.ctx.dest.getHostNonce()
-    ]);
-    let postRequestFeeInDestFeeToken = adjustDecimals(
+   * Estimates the cross-chain ISMP POST request fee (the relayer fee for the
+   * RedeemEscrow message), in both the source and destination fee tokens.
+   * The dispatch is always paid in the fee token — the native rail was
+   * removed because it silently drew on a native balance nothing guarantees.
+   */
+  async estimateCrossChainFees(sourceFeeToken, destFeeToken, sourceChainId) {
+    const postRequestFeeInSourceFeeToken = await convertGasToFeeToken(
+      this.ctx,
+      RELAYER_MESSAGE_GAS,
+      "source",
+      sourceChainId
+    );
+    const postRequestFeeInDestFeeToken = adjustDecimals(
       postRequestFeeInSourceFeeToken,
       sourceFeeToken.decimals,
       destFeeToken.decimals
     );
-    const postRequest = {
-      source: destChainId,
-      dest: sourceChainId,
-      body: constructRedeemEscrowRequestBody({ ...order, id: orderCommitment(order) }, MOCK_ADDRESS),
-      timeoutTimestamp: 0n,
-      nonce,
-      from: this.ctx.source.configService.getIntentGatewayAddress(destChainId),
-      to: this.ctx.source.configService.getIntentGatewayAddress(sourceChainId)
+    return {
+      postRequestFee: postRequestFeeInDestFeeToken,
+      relayerFeeInSourceFeeToken: postRequestFeeInSourceFeeToken
     };
-    postRequestFeeInDestFeeToken = postRequestFeeInDestFeeToken * 1005n / 1000n;
-    let protocolFeeInNativeToken = await this.ctx.dest.quoteNative(postRequest, postRequestFeeInDestFeeToken).catch(() => 0n);
-    protocolFeeInNativeToken = protocolFeeInNativeToken * 1005n / 1000n;
-    return { postRequestFee: postRequestFeeInDestFeeToken, protocolFee: protocolFeeInNativeToken };
   }
   /**
    * Builds EVM state override objects for gas estimation of the `fillOrder`
@@ -18284,7 +18302,6 @@ function isConfiguredAddress(address) {
 }
 
 // src/protocols/intents/IntentGateway.ts
-var CROSS_CHAIN_ORDER_FEE_GAS_BUMP = 600000n;
 var IntentGateway = class _IntentGateway {
   /** EVM chain on which orders are placed and escrowed. */
   source;
@@ -18471,10 +18488,12 @@ var IntentGateway = class _IntentGateway {
    * placement, fee estimation, bid collection, and execution.
    *
    * **Yield/receive protocol:**
-   * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and sets
-   *    same-chain fees to twice the estimate. Cross-chain orders retain a 1% buffer
-   *    and include an additional 600k-gas fee uplift, while the wei cost used for
-   *    the `value` field receives a 2% buffer.
+   * 1. If `order.fees` is unset or zero, estimates gas on an internal copy and
+   *    sets same-chain fees to twice the estimate. Cross-chain orders attach
+   *    (fill gas + a settlement-message uplift of `RELAYER_MESSAGE_GAS`, the
+   *    same gas budget the solver's relayer fee uses) with a 5% buffer over
+   *    the whole sum — strictly above the solver's unpadded requirement. The
+   *    wei cost used for the `value` field receives a 2% buffer.
    * 2. Yields `AWAITING_PLACE_ORDER` with `{ to, data, value, sessionPrivateKey }`.
    *    The caller must sign the transaction and pass it back via `gen.next(signedTx)`.
    * 3. Yields `ORDER_PLACED` with the finalised order and transaction hash once
@@ -18511,11 +18530,11 @@ var IntentGateway = class _IntentGateway {
       value = estimate.totalGasCostWei + estimate.totalGasCostWei * 2n / 100n;
       const crossChainFeeBump = isSameChain ? 0n : await convertGasToFeeToken(
         this.ctx,
-        CROSS_CHAIN_ORDER_FEE_GAS_BUMP,
+        RELAYER_MESSAGE_GAS,
         "source",
         this.source.config.stateMachineId
       );
-      executionOrder.fees = isSameChain ? estimate.totalGasInFeeToken * 2n : estimate.totalGasInFeeToken + (crossChainFeeBump + estimate.totalGasInFeeToken * 1n / 100n);
+      executionOrder.fees = isSameChain ? estimate.totalGasInFeeToken * 2n : (estimate.totalGasInFeeToken + crossChainFeeBump) * 105n / 100n;
     }
     const placeOrderGen = this.orderPlacer.placeOrder(executionOrder, graffiti);
     const placeOrderFirst = await placeOrderGen.next();