@hyperbridge/sdk 2.6.1 → 2.8.0

package/dist/node/index.js

@@ -10,7 +10,7 @@ import { match } from 'ts-pattern';
 import { WsProvider, ApiPromise, Keyring } from '@polkadot/api';
 import { Struct, Vector, u8, Bytes, Enum, Tuple, _void, u64, u32, Option, bool, u128 } from 'scale-ts';
 import { keccakAsU8a, decodeAddress, keccakAsHex, xxhashAsU8a, blake2AsU8a } from '@polkadot/util-crypto';
-import { hexToU8a, u8aToHex, u8aConcat } from '@polkadot/util';
+import { hexToU8a, u8aToHex, u8aConcat, stringToU8a, isHex as isHex$1, u8aToString } from '@polkadot/util';
 import PQueue from 'p-queue';
 import { hasWindow, isNode, env } from 'std-env';
 import mergeRace from '@async-generator/merge-race';
@@ -2682,7 +2682,8 @@ var chainConfigs = {
       ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
       EURC: "0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c",
       XSGD: "0x70e8dE73cE538DA2bEEd35d14187F6959a8ecA96",
-      TRYB: "0x2C537E5624e4af88A7ae4060C022609376C8D0EB"
+      TRYB: "0x2C537E5624e4af88A7ae4060C022609376C8D0EB",
+      USDR: "0x9623DfB044D5612Ce0c0F1606973CCAEFd03CD05"
     },
     tokenDecimals: {
       USDC: 6,
@@ -2721,6 +2722,10 @@ var chainConfigs = {
     consensusStateId: "ETH0",
     coingeckoId: "ethereum",
     layerZeroEid: 30101,
+    erc4626Vaults: [
+      { label: "Aave stataUSDC", address: "0xD4fa2D31b7968E448877f69A96DE69f5de8cD23E", asset: "USDC" },
+      { label: "Aave stataUSDT", address: "0x7Bc3485026Ac48b6cf9BaF0A377477Fff5703Af8", asset: "USDT" }
+    ],
     popularTokens: [
       "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
       "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
@@ -2775,6 +2780,10 @@ var chainConfigs = {
     defaultRpcUrl: "https://binance.llamarpc.com",
     consensusStateId: "BSC0",
     coingeckoId: "binance-smart-chain",
+    erc4626Vaults: [
+      { label: "Aave stataUSDC", address: "0x3906cDdfb781f02B21f21BD81ed7Fd8DC37075E1", asset: "USDC" },
+      { label: "Aave stataUSDT", address: "0x0471D185cc7Be61E154277cAB2396cD397663da6", asset: "USDT" }
+    ],
     popularTokens: [
       "0x0E09FaBB73Bd3Ade0a17ECC321fD13a19e81cE82",
       "0x000Ae314E2A2172a039B26378814C252734f556A",
@@ -2834,6 +2843,10 @@ var chainConfigs = {
     consensusStateId: "ETH0",
     coingeckoId: "arbitrum-one",
     layerZeroEid: 30110,
+    erc4626Vaults: [
+      { label: "Aave stataUSDC", address: "0x7F6501d3B98eE91f9b9535E4b0ac710Fb0f9e0bc", asset: "USDC" },
+      { label: "Aave stataUSDT", address: "0xa6D12574eFB239FC1D2099732bd8b5dC6306897F", asset: "USDT" }
+    ],
     popularTokens: [
       "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
       "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
@@ -2854,7 +2867,8 @@ var chainConfigs = {
       EXT: "0x0e668E5127087e236578893a0e01E41837A28469",
       cNGN: "0x46C85152bFe9f96829aA94755D9f915F9B10EF5F",
       ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
-      EURC: "0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42"
+      EURC: "0x60a3E35Cc302bFA44Cb288Bc5a4F316Fdb1adb42",
+      USDR: "0x3B5F2810fB2168FfA9C73160F97BF9f2461fFa5c"
     },
     tokenDecimals: {
       USDC: 6,
@@ -2896,6 +2910,10 @@ var chainConfigs = {
     coingeckoId: "base",
     layerZeroEid: 30184,
     uniswapV4Pools: [{ tokens: ["USDC", "cNGN"], fee: 1500, tickSpacing: 30 }],
+    erc4626Vaults: [
+      { label: "Aave stataUSDC", address: "0xC768c589647798a6EE01A91FdE98EF2ed046DBD6", asset: "USDC" },
+      { label: "Yield Bearing cNGN", address: "0xa82A3531021317240Fb32E67f9c7bC091F737D3b", asset: "cNGN" }
+    ],
     popularTokens: [
       "0x4200000000000000000000000000000000000006",
       "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
@@ -2916,7 +2934,8 @@ var chainConfigs = {
       EXT: "0x7C8c11ADb8EF7cd3CFa718008Ea048445C6E7209",
       cNGN: "0x52828daa48C1a9A06F37500882b42daf0bE04C3B",
       ZARP: "0xb755506531786C8aC63B756BaB1ac387bACB0C04",
-      XSGD: "0xDC3326e71D45186F113a2F448984CA0e8D201995"
+      XSGD: "0xDC3326e71D45186F113a2F448984CA0e8D201995",
+      USDR: "0x3B5F2810fB2168FfA9C73160F97BF9f2461fFa5c"
     },
     tokenDecimals: {
       USDC: 6,
@@ -2956,6 +2975,10 @@ var chainConfigs = {
     consensusStateId: "POLY",
     coingeckoId: "polygon-pos",
     layerZeroEid: 30109,
+    erc4626Vaults: [
+      { label: "Aave stataUSDC", address: "0x79261231698B26Ed9085b59ae89d59843Ae925a8", asset: "USDC" },
+      { label: "Aave stataUSDT", address: "0x2eaD203C5C1C00612B1DdbBb20e4180dA822d6ff", asset: "USDT" }
+    ],
     popularTokens: [
       "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
       "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
@@ -3002,7 +3025,7 @@ var chainConfigs = {
       WETH: "0x360ad4f9a9A8EFe9A8DCB5f461c4Cc1047E1Dcf9",
       //wmatic, change it to wpol
       DAI: "0x0000000000000000000000000000000000000000",
-      USDC: "0x693b854d6965ffeaae21c74049dea644b56fcacb",
+      USDC: "0xBE97E73126D66188d72fbF99029126D0340a7f18",
       USDT: "0x0000000000000000000000000000000000000000"
     },
     tokenDecimals: {
@@ -3011,7 +3034,7 @@ var chainConfigs = {
     },
     tokenStorageSlots: {
       USDT: { balanceSlot: 0, allowanceSlot: 1 },
-      USDC: { balanceSlot: 1, allowanceSlot: 2 }
+      USDC: { balanceSlot: 0, allowanceSlot: 1 }
     },
     addresses: {
       IntentGateway: "0x6CF42FA9BecbC5b6a26884964956b113530f7cFA",
@@ -4818,6 +4841,24 @@ var ABI3 = [
             internalType: "uint256"
           }
         ]
+      },
+      {
+        name: "predispatchCall",
+        type: "bytes",
+        indexed: false,
+        internalType: "bytes"
+      },
+      {
+        name: "outputCall",
+        type: "bytes",
+        indexed: false,
+        internalType: "bytes"
+      },
+      {
+        name: "graffiti",
+        type: "bytes32",
+        indexed: false,
+        internalType: "bytes32"
       }
     ],
     anonymous: false
@@ -5177,6 +5218,19 @@ var ChainConfigService = class {
   getExtDecimals(chain) {
     return this.getConfig(chain)?.tokenDecimals?.EXT;
   }
+  /** Configured exotic (non-USD) tokens on a chain, for selection UIs. EXT is a test asset and is not offered. */
+  getKnownExoticTokens(chain) {
+    const config = this.getConfig(chain);
+    const tokens = [];
+    if (config?.assets?.cNGN) {
+      tokens.push({ symbol: "cNGN", address: config.assets.cNGN, decimals: config.tokenDecimals?.cNGN });
+    }
+    return tokens;
+  }
+  /** Known ERC-4626 treasury vaults on a chain, for selection UIs. */
+  getKnownVaults(chain) {
+    return this.getConfig(chain)?.erc4626Vaults ?? [];
+  }
   getChainId(chain) {
     return this.getConfig(chain)?.chainId ?? 0;
   }
@@ -7466,17 +7520,30 @@ var SubstrateChain = class _SubstrateChain {
       rotationMap.set(BigInt(setId.toString()), BigInt(height.toString()));
     }
     const proofs = [];
-    let epoch = currentEpoch - 1n;
+    let epoch = currentEpoch + 1n;
     while (rotationMap.has(epoch)) {
-      const height = rotationMap.get(epoch);
-      const key = beefyOffchainKey(height);
-      const proof = await this.rpcClient.call("offchain_localStorageGet", ["PERSISTENT", key]);
+      const key = rotationOffchainKey(epoch);
+      let proof = await this.rpcClient.call("offchain_localStorageGet", ["PERSISTENT", key]);
+      if (!proof) {
+        const legacyKey = messagingOffchainKey(rotationMap.get(epoch));
+        proof = await this.rpcClient.call("offchain_localStorageGet", ["PERSISTENT", legacyKey]);
+      }
       if (!proof) return void 0;
       proofs.push(proof);
       epoch++;
     }
-    const messagingKey = beefyOffchainKey(lastProvenHeight);
-    const messagingProof = await this.rpcClient.call("offchain_localStorageGet", ["PERSISTENT", messagingKey]);
+    const messagingKey = messagingOffchainKey(lastProvenHeight);
+    let messagingProof = await this.rpcClient.call("offchain_localStorageGet", ["PERSISTENT", messagingKey]);
+    if (!messagingProof) {
+      for (const [setId, height] of rotationMap) {
+        if (height !== lastProvenHeight) continue;
+        messagingProof = await this.rpcClient.call("offchain_localStorageGet", [
+          "PERSISTENT",
+          rotationOffchainKey(setId)
+        ]);
+        break;
+      }
+    }
     if (!messagingProof) return void 0;
     proofs.push(messagingProof);
     return { proofs, provenHeight: lastProvenHeight };
@@ -7493,11 +7560,17 @@ var SubstrateChain = class _SubstrateChain {
     throw new Error(`${name} not found in runtime`);
   }
 };
-function beefyOffchainKey(provenHeight) {
-  const prefix = new TextEncoder().encode("beefy_consensus_proofs::");
-  const heightBytes = new Uint8Array(8);
-  new DataView(heightBytes.buffer).setBigUint64(0, provenHeight, false);
-  return toHex(new Uint8Array([...prefix, ...heightBytes]));
+function beefyOffchainKey(prefix, id) {
+  const prefixBytes = new TextEncoder().encode(prefix);
+  const idBytes = new Uint8Array(8);
+  new DataView(idBytes.buffer).setBigUint64(0, id, false);
+  return toHex(new Uint8Array([...prefixBytes, ...idBytes]));
+}
+function messagingOffchainKey(provenHeight) {
+  return beefyOffchainKey("beefy_consensus_proofs::", provenHeight);
+}
+function rotationOffchainKey(setId) {
+  return beefyOffchainKey("beefy_consensus_proofs::rotation::", setId);
 }
 function requestCommitmentStorageKey(key) {
   const prefix = new TextEncoder().encode("RequestCommitments");
@@ -8167,14 +8240,17 @@ var IntentsCoprocessor = class _IntentsCoprocessor {
     const orders = [];
     for (const { event } of records) {
       if (event.section !== "intentsCoprocessor" || event.method !== "PhantomOrderRegistered") continue;
-      const [commitment, chain, createdAt, tokenA, tokenB, standardAmount] = event.data;
+      const [commitment, chain, createdAt, legs] = event.data;
       orders.push({
         commitment: commitment.toHex(),
         chain: new TextDecoder().decode(hexToU8a(chain.toHex())),
         createdAt: createdAt.toNumber(),
-        tokenA: tokenA.toHex(),
-        tokenB: tokenB.toHex(),
-        standardAmount: BigInt(standardAmount.toString())
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        legs: legs.map((leg) => ({
+          tokenA: leg.tokenA.toHex(),
+          tokenB: leg.tokenB.toHex(),
+          standardAmount: BigInt(leg.standardAmount.toString())
+        }))
       });
     }
     return orders;
@@ -15385,14 +15461,21 @@ function orderCommitment(order) {
   const encoded = encodeAbiParameters([orderType], [transformOrderForContract(order)]);
   return keccak256(encoded);
 }
-async function convertGasToFeeToken(ctx, gasEstimate, gasEstimateIn, evmChainID, gasPriceOverride) {
+function bumpGasPrice(gasPrice, bumpPercent) {
+  if (bumpPercent < 0n) {
+    throw new Error("Gas price bump percent cannot be negative");
+  }
+  return (gasPrice * (100n + bumpPercent) + 99n) / 100n;
+}
+async function convertGasToFeeToken(ctx, gasEstimate, gasEstimateIn, evmChainID, gasPriceOverride, gasPriceBumpPercent = 0n) {
   if (TESTNET_CHAINS.has(evmChainID)) return 1n;
   const chain = ctx[gasEstimateIn];
   const client = chain.client;
-  const gasPrice = gasPriceOverride ?? await retryPromise(() => client.getGasPrice(), {
+  const baseGasPrice = gasPriceOverride ?? await retryPromise(() => client.getGasPrice(), {
     maxRetries: 3,
     backoffMs: 250
   });
+  const gasPrice = bumpGasPrice(baseGasPrice, gasPriceBumpPercent);
   const gasCostInWei = gasEstimate * gasPrice;
   const wethAddr = chain.configService.getWrappedNativeAssetWithDecimals(evmChainID).asset;
   const feeToken = await getFeeToken(ctx, evmChainID, chain);
@@ -15463,13 +15546,13 @@ function deriveCanonicalPlacedOrder(order, args) {
     session: args.session,
     predispatch: {
       assets: args.predispatch.map((asset) => ({ ...asset })),
-      call: order.predispatch.call
+      call: args.predispatchCall ?? order.predispatch.call
     },
     inputs: args.inputs.map((asset) => ({ ...asset })),
     output: {
       beneficiary: args.beneficiary,
       assets: args.outputs.map((asset) => ({ ...asset })),
-      call: order.output.call
+      call: args.outputCall ?? order.output.call
     }
   };
   return { ...canonicalOrder, id: orderCommitment(canonicalOrder) };
@@ -15893,6 +15976,12 @@ var OrderCanceller = class _OrderCanceller {
   static DEFAULT_MAX_RECOVERY_RESTARTS = 1;
   static PROOF_FRESHNESS_MAX_RETRIES = 3;
   static PROOF_FRESHNESS_BACKOFF_MS = 500;
+  /**
+   * Gas budget used to size the relayer fee for a cross-chain cancellation
+   * message (the GET response or RefundEscrow POST executed on the source
+   * chain), priced at the source chain's gas price.
+   */
+  static CANCEL_MESSAGE_GAS = 800000n;
   logger = createConsola({
     level: LogLevels.info,
     formatOptions: { columns: 80, colors: true, compact: true, date: false }
@@ -15951,9 +16040,14 @@ var OrderCanceller = class _OrderCanceller {
       timeoutTimestamp: 0n,
       context
     };
-    const feeInSourceFeeToken = await convertGasToFeeToken(this.ctx, 400000n, "source", sourceStateMachine);
+    const feeInSourceFeeToken = await convertGasToFeeToken(
+      this.ctx,
+      _OrderCanceller.CANCEL_MESSAGE_GAS,
+      "source",
+      sourceStateMachine
+    );
     const relayerFee = feeInSourceFeeToken * 1005n / 1000n;
-    const nativeValue = await this.ctx.source.quoteNative(getRequest, relayerFee);
+    const nativeValue = await this.ctx.source.quoteNative(getRequest, relayerFee) * 101n / 100n;
     return { nativeValue, relayerFee };
   }
   /**
@@ -16212,7 +16306,7 @@ var OrderCanceller = class _OrderCanceller {
       body,
       timeoutTimestamp: 0n
     };
-    const nativeValue = await this.ctx.dest.quoteNative(postRequest, relayerFee);
+    const nativeValue = await this.ctx.dest.quoteNative(postRequest, relayerFee) * 101n / 100n;
     return { nativeValue, relayerFee };
   }
   /**
@@ -16542,8 +16636,12 @@ var OrderCanceller = class _OrderCanceller {
    * Converts estimated gas on the source chain into the dest chain's fee token.
    */
   async estimateRelayerFee(sourceChainId, destChainId) {
-    const POST_REQUEST_GAS = 400000n;
-    const feeInSourceFeeToken = await convertGasToFeeToken(this.ctx, POST_REQUEST_GAS, "source", sourceChainId);
+    const feeInSourceFeeToken = await convertGasToFeeToken(
+      this.ctx,
+      _OrderCanceller.CANCEL_MESSAGE_GAS,
+      "source",
+      sourceChainId
+    );
     const sourceFeeToken = await getFeeToken(this.ctx, sourceChainId, this.ctx.source);
     const destFeeToken = await getFeeToken(this.ctx, destChainId, this.ctx.dest);
     const feeInDestFeeToken = adjustDecimals(feeInSourceFeeToken, sourceFeeToken.decimals, destFeeToken.decimals);
@@ -17302,12 +17400,15 @@ var GasEstimator = class {
    *
    * @param params - Parameters including the order to estimate and optional
    *   percentage bumps for `maxPriorityFeePerGas` and `maxFeePerGas`.
+   * @param pricingOptions - Internal fee-pricing policy. Direct estimates use
+   *   the default zero gas-price bump; SDK order-fee quotes opt into headroom.
    * @returns A {@link FillOrderEstimate} containing all gas components,
    *   EIP-1559 fee values, total cost in wei, and total cost in the source
    *   chain's fee token.
    */
-  async estimateFillOrder(params) {
+  async estimateFillOrder(params, pricingOptions = {}) {
     const { order } = params;
+    const orderFeeGasPriceBumpPercent = pricingOptions.orderFeeGasPriceBumpPercent ?? 0n;
     const solverPrivateKey = generatePrivateKey();
     const solverAccountAddress = privateKeyToAddress(solverPrivateKey);
     const souceStateMachineId = isHex(order.source) ? hexToString$1(order.source) : order.source;
@@ -17338,7 +17439,12 @@ var GasEstimator = class {
         intentGatewayV2Address,
         entryPointAddress
       }),
-      isSameChain ? Promise.resolve({ postRequestFee: 0n, relayerFeeInSourceFeeToken: 0n }) : this.estimateCrossChainFees(sourceFeeToken, destFeeToken, souceStateMachineId)
+      isSameChain ? Promise.resolve({ postRequestFee: 0n, relayerFeeInSourceFeeToken: 0n }) : this.estimateCrossChainFees(
+        sourceFeeToken,
+        destFeeToken,
+        souceStateMachineId,
+        orderFeeGasPriceBumpPercent
+      )
     ]);
     const { viem: stateOverrides, bundler: bundlerStateOverrides } = stateOverridesResult;
     const fillOptions = {
@@ -17503,7 +17609,8 @@ var GasEstimator = class {
       totalGas,
       "dest",
       destStateMachineId,
-      gasPrice
+      gasPrice,
+      orderFeeGasPriceBumpPercent
     );
     const totalGasInSourceFeeToken = isSameChain ? totalGasInDestFeeToken : adjustDecimals(totalGasInDestFeeToken, destFeeToken.decimals, sourceFeeToken.decimals);
     const totalGasCostWei = isSameChain ? rawTotalGasCostWei : await convertFeeTokenToWei(this.ctx, totalGasInSourceFeeToken, "source", souceStateMachineId);
@@ -17527,12 +17634,14 @@ var GasEstimator = class {
    * 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) {
+  async estimateCrossChainFees(sourceFeeToken, destFeeToken, sourceChainId, orderFeeGasPriceBumpPercent) {
     const postRequestFeeInSourceFeeToken = await convertGasToFeeToken(
       this.ctx,
       RELAYER_MESSAGE_GAS,
       "source",
-      sourceChainId
+      sourceChainId,
+      void 0,
+      orderFeeGasPriceBumpPercent
     );
     const postRequestFeeInDestFeeToken = adjustDecimals(
       postRequestFeeInSourceFeeToken,
@@ -18302,6 +18411,7 @@ function isConfiguredAddress(address) {
 }
 
 // src/protocols/intents/IntentGateway.ts
+var CROSS_CHAIN_ORDER_FEE_GAS_PRICE_BUMP_PERCENT = 10n;
 var IntentGateway = class _IntentGateway {
   /** EVM chain on which orders are placed and escrowed. */
   source;
@@ -18488,14 +18598,22 @@ 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 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)`.
+   * 1. If `order.fees` is unset or zero, prices the fee on an internal copy
+   *    via {@link quoteOrderFees}: same-chain fees are twice the fill-gas
+   *    estimate without a gas-price bump; cross-chain gas is priced 10% above
+   *    the live price before attaching (fill gas + the settlement relayer fee)
+   *    with a further 5% buffer over the whole sum — strictly above the solver's
+   *    unpadded requirement. Direct solver estimates remain unbumped. The wei
+   *    cost used for the `value` field receives a 2% buffer.
+   * 2. Yields `AWAITING_PLACE_ORDER` with `{ to, data, value, nativeFee,
+   *    feeTokenAmount, feeTokenAddress, sessionPrivateKey }`. `value` carries
+   *    only the order's native-token input amounts; `nativeFee` is the native
+   *    amount that funds `order.fees` (`0n` when the caller set `order.fees`);
+   *    `feeTokenAmount`/`feeTokenAddress` are the exact fee encoded in `data`
+   *    and the source-chain token it is charged in. To pay the fee in native
+   *    token, sign the transaction with `value + nativeFee`; with a fee-token
+   *    allowance, `value` alone. Pass the signed transaction back via
+   *    `gen.next(signedTx)`.
    * 3. Yields `ORDER_PLACED` with the finalised order and transaction hash once
    *    the `OrderPlaced` event is confirmed.
    * 4. Delegates to {@link OrderExecutor.executeOrder} and forwards all
@@ -18516,33 +18634,33 @@ var IntentGateway = class _IntentGateway {
    */
   async *execute(order, graffiti = DEFAULT_GRAFFITI, options) {
     const executionOrder = { ...order };
-    let value;
+    let nativeFee = 0n;
     if (!executionOrder.fees || executionOrder.fees === 0n) {
-      const estimate = await this.gasEstimator.estimateFillOrder({
-        order: executionOrder,
+      const feesQuote = await this.quoteOrderFees(executionOrder, {
         maxPriorityFeePerGasBumpPercent: options?.maxPriorityFeePerGasBumpPercent,
         maxFeePerGasBumpPercent: options?.maxFeePerGasBumpPercent
       });
-      if (estimate.totalGasCostWei === 0n || estimate.totalGasInFeeToken === 0n) {
-        throw new Error("Gas estimation failed");
-      }
-      const isSameChain = this.source.config.stateMachineId === this.dest.config.stateMachineId;
-      value = estimate.totalGasCostWei + estimate.totalGasCostWei * 2n / 100n;
-      const crossChainFeeBump = isSameChain ? 0n : await convertGasToFeeToken(
-        this.ctx,
-        RELAYER_MESSAGE_GAS,
-        "source",
-        this.source.config.stateMachineId
-      );
-      executionOrder.fees = isSameChain ? estimate.totalGasInFeeToken * 2n : (estimate.totalGasInFeeToken + crossChainFeeBump) * 105n / 100n;
+      nativeFee = feesQuote.nativeValue;
+      executionOrder.fees = feesQuote.fees;
     }
+    const value = executionOrder.inputs.filter((input) => bytes32ToBytes20(input.token) === ADDRESS_ZERO2).reduce((sum, input) => sum + input.amount, 0n);
     const placeOrderGen = this.orderPlacer.placeOrder(executionOrder, graffiti);
     const placeOrderFirst = await placeOrderGen.next();
     if (placeOrderFirst.done) {
       throw new Error("placeOrder generator completed without yielding");
     }
     const { to, data, sessionPrivateKey } = placeOrderFirst.value;
-    const signedTransaction = yield { status: "AWAITING_PLACE_ORDER", to, data, value, sessionPrivateKey };
+    const { address: feeTokenAddress } = await getFeeToken(this.ctx, this.source.config.stateMachineId, this.source);
+    const signedTransaction = yield {
+      status: "AWAITING_PLACE_ORDER",
+      to,
+      data,
+      value,
+      nativeFee,
+      sessionPrivateKey,
+      feeTokenAmount: executionOrder.fees,
+      feeTokenAddress
+    };
     const placeOrderSecond = await placeOrderGen.next(signedTransaction);
     if (placeOrderSecond.done === false) {
       throw new Error("placeOrder generator yielded unexpectedly after signing");
@@ -18842,6 +18960,50 @@ var IntentGateway = class _IntentGateway {
   async estimateFillOrder(params) {
     return this.gasEstimator.estimateFillOrder(params);
   }
+  /**
+   * Quotes the solver fee for an order using the same policy {@link execute} /
+   * {@link executeBest} apply when `order.fees` is `0n`.
+   *
+   * Use this before placing to display the fee, or to check what the user can
+   * afford: pay `fees` in the source-chain fee token (check balance and
+   * allowance, then set `order.fees` and submit with `value: 0`), or leave
+   * `order.fees` at `0n` and let the SDK attach `nativeValue` to the placement
+   * transaction (check the native balance).
+   *
+   * @param order - The order to quote. `order.fees` is ignored and not mutated.
+   * Gas prices used to derive cross-chain `fees` receive 10% SDK-only headroom.
+   * Same-chain quotes and direct calls to {@link estimateFillOrder}, including
+   * Simplex solver estimates, remain unbumped.
+   *
+   * @param options - Optional transaction gas-price bump percentages, as in {@link execute}.
+   * @returns An {@link OrderFeesQuote} with the fee-token amount, the native
+   *   value for the native rail, and the underlying estimate.
+   * @throws If gas estimation returns zero.
+   */
+  async quoteOrderFees(order, options) {
+    const isSameChain = this.source.config.stateMachineId === this.dest.config.stateMachineId;
+    const estimate = await this.gasEstimator.estimateFillOrder(
+      {
+        order,
+        maxPriorityFeePerGasBumpPercent: options?.maxPriorityFeePerGasBumpPercent,
+        maxFeePerGasBumpPercent: options?.maxFeePerGasBumpPercent
+      },
+      {
+        orderFeeGasPriceBumpPercent: isSameChain ? 0n : CROSS_CHAIN_ORDER_FEE_GAS_PRICE_BUMP_PERCENT
+      }
+    );
+    if (estimate.totalGasCostWei === 0n || estimate.totalGasInFeeToken === 0n) {
+      throw new Error("Gas estimation failed");
+    }
+    const fees = isSameChain ? estimate.totalGasInFeeToken * 2n : (estimate.totalGasInFeeToken + estimate.relayerFeeInSourceFeeToken) * 105n / 100n;
+    const { address: feeToken } = await this.source.getFeeTokenWithDecimals();
+    return {
+      fees,
+      nativeValue: estimate.totalGasCostWei + estimate.totalGasCostWei * 2n / 100n,
+      feeToken,
+      estimate
+    };
+  }
   /**
    * Encodes a list of calls into ERC-7821 `execute` calldata using
    * single-batch mode.
@@ -18968,6 +19130,44 @@ var IntentGateway = class _IntentGateway {
     }
   }
 };
+var FILL_ORDER_ABI = IntentGatewayV2_default.ABI;
+var DECLARATION_VERSION = 1;
+var MAX_DECLARED_CHAINS = 255;
+function encodeAcceptedSourceChains(chains2) {
+  if (chains2.length > MAX_DECLARED_CHAINS) {
+    throw new Error(`Cannot declare more than ${MAX_DECLARED_CHAINS} source chains`);
+  }
+  const bytes = [DECLARATION_VERSION, chains2.length];
+  for (const chain of chains2) {
+    const encoded = stringToU8a(chain);
+    if (encoded.length === 0 || encoded.length > 255) {
+      throw new Error(`Invalid state machine id in source chain declaration: ${chain}`);
+    }
+    bytes.push(encoded.length, ...encoded);
+  }
+  return u8aToHex(new Uint8Array(bytes));
+}
+function decodeAcceptedSourceChains(paymasterAndData) {
+  if (!paymasterAndData || !isHex$1(paymasterAndData)) return null;
+  const bytes = hexToU8a(paymasterAndData);
+  if (bytes.length < 2 || bytes[0] !== DECLARATION_VERSION) return null;
+  const count = bytes[1];
+  const chains2 = [];
+  let offset = 2;
+  for (let entry = 0; entry < count; entry++) {
+    if (offset >= bytes.length) return null;
+    const length = bytes[offset];
+    offset += 1;
+    if (length === 0 || offset + length > bytes.length) return null;
+    chains2.push(u8aToString(bytes.subarray(offset, offset + length)));
+    offset += length;
+  }
+  if (offset !== bytes.length) return null;
+  return chains2;
+}
+FILL_ORDER_ABI.find(
+  (item) => item?.type === "function" && item?.name === "fillOrder"
+)?.inputs?.[0];
 var TokenGateway = class {
   source;
   dest;
@@ -23438,6 +23638,6 @@ async function teleportDot(param_) {
   return stream;
 }
 
-export { ADDRESS_ZERO2 as ADDRESS_ZERO, BundlerMethod, ChainConfigService, Chains, CryptoUtils, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, ERC20Method, ERC7821_BATCH_MODE, EvmChain, ABI as EvmHostABI, EvmLanguage, HyperClientStatus, HyperFungibleToken, HyperFungibleTokenABI, IntentGateway, ABI3 as IntentGatewayABI, IntentOrderStatus, IntentsCoprocessor, InvalidPhantomSnapshotError, IsmpClient, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, OrderStatusChecker, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, PhantomSnapshotUnavailableError, PharosChain, PolkadotHubChain, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, SubstrateChain, Swap, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, TokenGateway, TronChain, USE_ETHERSCAN_CHAINS, UnsupportedIntentQuotePairError, UnsupportedIntentQuoteStrategyError, WrappedHyperFungibleTokenABI, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createEvmChain, createQueryClient, decodeERC7821ExecuteBatch, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeStateMachineId, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChainId, getConfigByStateMachineId, getContractCallInput, getContractCallInputs, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, normalizeAddressForEvmBytes32, normalizeAddressForStateMachine, normalizeEvmAddress, normalizeEvmChainId, normalizeStateMachineId, orderCommitment, parseStateMachineId, pharosAtlantic, pharosMainnet, polkadotAssetHubPaseo, polkadotHubMainnet, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, quoteUniswap, requestCommitmentKey, responseCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
+export { ADDRESS_ZERO2 as ADDRESS_ZERO, BundlerMethod, ChainConfigService, Chains, CryptoUtils, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DOMAIN_TYPEHASH, DUMMY_PRIVATE_KEY, ERC20Method, ERC7821_BATCH_MODE, EvmChain, ABI as EvmHostABI, EvmLanguage, HyperClientStatus, HyperFungibleToken, HyperFungibleTokenABI, IntentGateway, ABI3 as IntentGatewayABI, IntentOrderStatus, IntentsCoprocessor, InvalidPhantomSnapshotError, IsmpClient, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, OrderStatusChecker, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, PhantomSnapshotUnavailableError, PharosChain, PolkadotHubChain, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, SELECT_SOLVER_TYPEHASH, STATE_COMMITMENTS_SLOT, SubstrateChain, Swap, TESTNET_CHAINS, TeleportStatus, TimeoutStatus, TokenGateway, TronChain, USE_ETHERSCAN_CHAINS, UnsupportedIntentQuotePairError, UnsupportedIntentQuoteStrategyError, WrappedHyperFungibleTokenABI, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createEvmChain, createQueryClient, decodeAcceptedSourceChains, decodeERC7821ExecuteBatch, decodeUserOpScale, encodeAcceptedSourceChains, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeStateMachineId, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChainId, getConfigByStateMachineId, getContractCallInput, getContractCallInputs, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, normalizeAddressForEvmBytes32, normalizeAddressForStateMachine, normalizeEvmAddress, normalizeEvmChainId, normalizeStateMachineId, orderCommitment, parseStateMachineId, pharosAtlantic, pharosMainnet, polkadotAssetHubPaseo, polkadotHubMainnet, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, quoteUniswap, requestCommitmentKey, responseCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map