@hyperbridge/sdk 2.0.0 → 2.0.1

package/dist/browser/index.js

@@ -1,5 +1,5 @@
 import { createConsola, LogLevels } from 'consola';
-import { defineChain, keccak256, toHex, createPublicClient, http, hexToBytes, bytesToHex, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, numberToBytes, getAddress, encodePacked, encodeAbiParameters, maxUint256, parseAbiParameters, parseAbiItem, concat, decodeFunctionData, decodeAbiParameters, isHex, hexToString as hexToString$1, parseEventLogs, parseUnits, concatHex, formatUnits } from 'viem';
+import { defineChain, keccak256, toHex, createPublicClient, http, hexToBytes, bytesToHex, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, numberToBytes, getAddress, encodePacked, isHex, encodeAbiParameters, maxUint256, parseAbiParameters, parseAbiItem, concat, decodeFunctionData, decodeAbiParameters, hexToString as hexToString$1, parseEventLogs, parseUnits, concatHex, formatUnits } from 'viem';
 import { baseSepolia, optimismSepolia, arbitrumSepolia, soneium, gnosis, optimism, polygonAmoy, unichain, polygon, base, arbitrum, bsc, mainnet, sepolia, gnosisChiado, bscTestnet, tron } from 'viem/chains';
 import { TronWeb } from 'tronweb';
 import { flatten, zip, capitalize, maxBy, isNil } from 'lodash-es';
@@ -7894,15 +7894,24 @@ function postRequestCommitment(post) {
   };
 }
 function bytes32ToBytes20(bytes32Address) {
+  if (bytes32Address.length === 42) {
+    return bytes32Address;
+  }
   if (bytes32Address === ADDRESS_ZERO2) {
     return ADDRESS_ZERO2;
   }
+  if (bytes32Address.length !== 66) {
+    throw new Error(`Expected a 20-byte or 32-byte hex value, got ${bytes32Address.length} characters`);
+  }
   const bytes = hexToBytes(bytes32Address);
   const addressBytes = bytes.slice(12);
   return bytesToHex(addressBytes);
 }
 function bytes20ToBytes32(bytes20Address) {
   if (bytes20Address.length === 66) return bytes20Address;
+  if (bytes20Address.length !== 42) {
+    throw new Error(`Expected a 20-byte or 32-byte hex value, got ${bytes20Address.length} characters`);
+  }
   return `0x${bytes20Address.slice(2).padStart(64, "0")}`;
 }
 function hexToString(hex) {
@@ -7913,6 +7922,33 @@ function hexToString(hex) {
   }
   return new TextDecoder().decode(bytes);
 }
+function normalizeStateMachineId(stateMachineId) {
+  return isHex(stateMachineId) ? hexToString(stateMachineId) : stateMachineId;
+}
+function normalizeEvmChainId(chainId) {
+  if (typeof chainId === "number") {
+    if (!Number.isInteger(chainId) || chainId <= 0) {
+      throw new Error(`Invalid EVM chain ID: ${chainId}. Expected a positive integer.`);
+    }
+    return { chainId, stateMachineId: `EVM-${chainId}` };
+  }
+  const stateMachineId = normalizeStateMachineId(chainId);
+  const { stateId } = parseStateMachineId(stateMachineId);
+  if (!stateId.Evm) {
+    throw new Error(`Unsupported chainId format: ${chainId}. Expected a number or EVM state machine ID.`);
+  }
+  return { chainId: stateId.Evm, stateMachineId };
+}
+function encodeStateMachineId(stateMachineId) {
+  return isHex(stateMachineId) ? stateMachineId : toHex(stateMachineId);
+}
+function normalizeAddressForEvmBytes32(address) {
+  if (address.length === 66) return address;
+  return bytes20ToBytes32(address);
+}
+function normalizeAddressForStateMachine(address, stateMachineId) {
+  return isEvmChain(normalizeStateMachineId(stateMachineId)) ? normalizeAddressForEvmBytes32(address) : address;
+}
 var DEFAULT_LOGGER = createConsola({
   level: LogLevels.silent
 });
@@ -8059,7 +8095,10 @@ function encodeWithdrawalRequest(order, beneficiary) {
       {
         commitment: order.id,
         beneficiary: bytes20ToBytes32(beneficiary),
-        tokens: order.inputs
+        tokens: order.inputs.map((token) => ({
+          ...token,
+          token: normalizeAddressForEvmBytes32(token.token)
+        }))
       }
     ]
   );
@@ -11432,13 +11471,200 @@ var PERMIT2_ABI = [
     type: "function"
   }
 ];
+var UniswapQuoteEngine = class {
+  constructor(adapter, chainConfigService = new ChainConfigService()) {
+    this.adapter = adapter;
+    this.chainConfigService = chainConfigService;
+  }
+  adapter;
+  chainConfigService;
+  async quote(params, options = {}) {
+    this.validateQuoteParams(params);
+    const protocols = this.getQuoteProtocols(params.protocols);
+    const { chainId, stateMachineId: evmChainID } = normalizeEvmChainId(params.chainId);
+    const client = options.client ?? this.resolveClient(params.chainId);
+    const quotes = [];
+    for (const protocol of protocols) {
+      const quote = params.tradeType === "EXACT_INPUT" ? await this.quoteExactInputForProtocol(params, client, protocol, chainId, evmChainID) : await this.quoteExactOutputForProtocol(params, client, protocol, chainId, evmChainID);
+      if (quote) quotes.push(quote);
+    }
+    return { bestQuote: this.selectBestQuote(quotes, params.tradeType), quotes };
+  }
+  resolveClient(chainId) {
+    const { stateMachineId: evmChainID } = normalizeEvmChainId(chainId);
+    const rpcUrl = this.chainConfigService.getRpcUrl(evmChainID);
+    if (!rpcUrl) {
+      throw new Error(`No RPC URL configured for chain ${evmChainID}`);
+    }
+    return createPublicClient({ transport: http(rpcUrl) });
+  }
+  getQuoteProtocols(protocols) {
+    return protocols?.length ? protocols : ["v2", "v3", "v4"];
+  }
+  validateQuoteParams(params) {
+    if (params.tradeType === "EXACT_INPUT" && params.amountIn === void 0) {
+      throw new Error("amountIn is required for EXACT_INPUT quotes");
+    }
+    if (params.tradeType === "EXACT_OUTPUT" && params.amountOut === void 0) {
+      throw new Error("amountOut is required for EXACT_OUTPUT quotes");
+    }
+    if (params.slippageBps !== void 0 && (params.slippageBps < 0 || params.slippageBps > 1e4)) {
+      throw new Error("slippageBps must be between 0 and 10000");
+    }
+  }
+  applySlippageToAmountOut(amountOut, slippageBps) {
+    return amountOut * BigInt(1e4 - slippageBps) / 10000n;
+  }
+  applySlippageToAmountIn(amountIn, slippageBps) {
+    const numerator = amountIn * BigInt(1e4 + slippageBps);
+    return (numerator + 9999n) / 10000n;
+  }
+  selectBestQuote(quotes, tradeType) {
+    if (quotes.length === 0) return null;
+    if (tradeType === "EXACT_INPUT") {
+      return quotes.reduce((best, current) => {
+        return current.amountOut > best.amountOut ? current : best;
+      });
+    }
+    return quotes.reduce((best, current) => {
+      return current.amountIn < best.amountIn ? current : best;
+    });
+  }
+  createExactInputTransactions(protocol, params, minAmountOut, fee, evmChainID) {
+    const amountIn = params.amountIn;
+    const recipient = params.recipient;
+    const path = [params.tokenIn.address, params.tokenOut.address];
+    switch (protocol) {
+      case "v2":
+        return this.adapter.createV2SwapCalldataExactIn(path, amountIn, minAmountOut, recipient, evmChainID);
+      case "v3":
+        return this.adapter.createV3SwapCalldataExactIn(
+          path,
+          amountIn,
+          minAmountOut,
+          [fee],
+          recipient,
+          evmChainID
+        );
+      case "v4":
+        return this.adapter.createV4SwapCalldataExactIn(
+          params.tokenIn.address,
+          params.tokenOut.address,
+          amountIn,
+          minAmountOut,
+          fee,
+          evmChainID
+        );
+    }
+  }
+  createExactOutputTransactions(protocol, params, maxAmountIn, fee, evmChainID) {
+    const amountOut = params.amountOut;
+    const recipient = params.recipient;
+    const path = [params.tokenIn.address, params.tokenOut.address];
+    switch (protocol) {
+      case "v2":
+        return this.adapter.createV2SwapCalldataExactOut(path, amountOut, maxAmountIn, recipient, evmChainID);
+      case "v3":
+        return this.adapter.createV3SwapCalldataExactOut(
+          path,
+          amountOut,
+          maxAmountIn,
+          [fee],
+          recipient,
+          evmChainID
+        );
+      case "v4":
+        return this.adapter.createV4SwapCalldataExactOut(
+          params.tokenIn.address,
+          params.tokenOut.address,
+          amountOut,
+          maxAmountIn,
+          fee,
+          evmChainID
+        );
+    }
+  }
+  async quoteExactInputForProtocol(params, client, protocol, chainId, evmChainID) {
+    const generateCalldata = !!params.recipient;
+    const result = await this.adapter.findBestProtocolWithAmountIn(
+      client,
+      params.tokenIn.address,
+      params.tokenOut.address,
+      params.amountIn,
+      evmChainID,
+      {
+        selectedProtocol: protocol,
+        generateCalldata,
+        recipient: params.recipient
+      }
+    );
+    if (result.protocol === null || result.amountOut === 0n) return null;
+    let transactions = result.transactions;
+    const slippageBps = params.slippageBps ?? 0;
+    if (generateCalldata && slippageBps > 0) {
+      const minAmountOut = this.applySlippageToAmountOut(result.amountOut, slippageBps);
+      transactions = this.createExactInputTransactions(protocol, params, minAmountOut, result.fee, evmChainID);
+    }
+    return {
+      protocol,
+      tradeType: params.tradeType,
+      chainId,
+      tokenIn: params.tokenIn,
+      tokenOut: params.tokenOut,
+      amountIn: params.amountIn,
+      amountOut: result.amountOut,
+      fee: result.fee,
+      route: { tokens: [params.tokenIn.address, params.tokenOut.address] },
+      transactions
+    };
+  }
+  async quoteExactOutputForProtocol(params, client, protocol, chainId, evmChainID) {
+    const generateCalldata = !!params.recipient;
+    const result = await this.adapter.findBestProtocolWithAmountOut(
+      client,
+      params.tokenIn.address,
+      params.tokenOut.address,
+      params.amountOut,
+      evmChainID,
+      {
+        selectedProtocol: protocol,
+        generateCalldata,
+        recipient: params.recipient
+      }
+    );
+    if (result.protocol === null || result.amountIn === maxUint256) return null;
+    let transactions = result.transactions;
+    const slippageBps = params.slippageBps ?? 0;
+    if (generateCalldata && slippageBps > 0) {
+      const maxAmountIn = this.applySlippageToAmountIn(result.amountIn, slippageBps);
+      transactions = this.createExactOutputTransactions(protocol, params, maxAmountIn, result.fee, evmChainID);
+    }
+    return {
+      protocol,
+      tradeType: params.tradeType,
+      chainId,
+      tokenIn: params.tokenIn,
+      tokenOut: params.tokenOut,
+      amountIn: result.amountIn,
+      amountOut: params.amountOut,
+      fee: result.fee,
+      route: { tokens: [params.tokenIn.address, params.tokenOut.address] },
+      transactions
+    };
+  }
+};
 
 // src/utils/swap.ts
 var COMMON_FEE_TIERS = [100, 500, 2500, 3e3, 1e4];
 var Swap = class {
   chainConfigService;
+  uniswapQuoteEngine;
   constructor() {
     this.chainConfigService = new ChainConfigService();
+    this.uniswapQuoteEngine = new UniswapQuoteEngine(this, this.chainConfigService);
+  }
+  async quoteUniswap(params) {
+    return this.uniswapQuoteEngine.quote(params);
   }
   /**
    * Gets V2 quote for exact output swap.
@@ -12777,6 +13003,9 @@ var Swap = class {
     }
   }
 };
+async function quoteUniswap(params) {
+  return new Swap().quoteUniswap(params);
+}
 
 // src/abis/erc7281.ts
 var ABI6 = [
@@ -15281,17 +15510,18 @@ function transformOrderForContract(order) {
   const { id: _id, ...contractOrder } = order;
   return {
     ...contractOrder,
-    source: order.source.startsWith("0x") ? order.source : toHex(order.source),
-    destination: order.destination.startsWith("0x") ? order.destination : toHex(order.destination),
-    inputs: order.inputs.map((t) => ({ ...t, token: bytes20ToBytes32(t.token) })),
+    source: encodeStateMachineId(order.source),
+    destination: encodeStateMachineId(order.destination),
+    user: normalizeAddressForEvmBytes32(order.user),
+    inputs: order.inputs.map((t) => ({ ...t, token: normalizeAddressForEvmBytes32(t.token) })),
     predispatch: {
       ...order.predispatch,
-      assets: order.predispatch.assets.map((t) => ({ ...t, token: bytes20ToBytes32(t.token) }))
+      assets: order.predispatch.assets.map((t) => ({ ...t, token: normalizeAddressForEvmBytes32(t.token) }))
     },
     output: {
       ...order.output,
-      beneficiary: bytes20ToBytes32(order.output.beneficiary),
-      assets: order.output.assets.map((t) => ({ ...t, token: bytes20ToBytes32(t.token) }))
+      beneficiary: normalizeAddressForEvmBytes32(order.output.beneficiary),
+      assets: order.output.assets.map((t) => ({ ...t, token: normalizeAddressForEvmBytes32(t.token) }))
     }
   };
 }
@@ -15421,7 +15651,7 @@ var OrderPlacer = class {
       args: [transformOrderForContract(order), graffiti]
     });
     const intentGatewayAddress = this.ctx.source.configService.getIntentGatewayV2Address(
-      hexToString(order.source)
+      normalizeStateMachineId(order.source)
     );
     const signedTransaction = yield {
       to: intentGatewayAddress,
@@ -15511,7 +15741,9 @@ var OrderExecutor = class {
    * UserOperation, pre-bound to the order's destination chain and entry point.
    */
   createUserOpHasher(order) {
-    const entryPointAddress = this.ctx.dest.configService.getEntryPointV08Address(hexToString(order.destination));
+    const entryPointAddress = this.ctx.dest.configService.getEntryPointV08Address(
+      normalizeStateMachineId(order.destination)
+    );
     const chainId = BigInt(
       this.ctx.dest.client.chain?.id ?? Number.parseInt(this.ctx.dest.config.stateMachineId.split("-")[1])
     );
@@ -15796,12 +16028,12 @@ var OrderCanceller = class {
    * submitting the cancel transaction.
    *
    * @param order - The order to quote.
-   * @param fromDest - If `true`, quotes the destination-initiated path.
+   * @param options - Choose the initiation side. Defaults to source-side cancellation.
    * @returns `{ nativeValue }` — native token amount (wei) to send as `value`;
    *   `{ relayerFee }` — relayer incentive denominated in the chain's fee token.
    */
-  async quoteCancelOrder(order, fromDest = false) {
-    if (fromDest) {
+  async quoteCancelOrder(order, options = {}) {
+    if (options.from === "destination") {
       return this.quoteCancelFromDest(order);
     }
     return this.quoteCancelFromSource(order);
@@ -15818,10 +16050,10 @@ var OrderCanceller = class {
    */
   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 sourceStateMachine = normalizeStateMachineId(order.source);
     const height = order.deadline + 1n;
     const destIntentGateway = this.ctx.dest.configService.getIntentGatewayV2Address(
-      hexToString(order.destination)
+      normalizeStateMachineId(order.destination)
     );
     const slotHash = await this.ctx.dest.client.readContract({
       abi: ABI7,
@@ -15833,8 +16065,8 @@ var OrderCanceller = class {
     const context = encodeWithdrawalRequest(order, order.user);
     const getRequest = {
       source: sourceStateMachine,
-      dest: order.destination.startsWith("0x") ? hexToString(order.destination) : order.destination,
-      from: this.ctx.source.configService.getIntentGatewayV2Address(hexToString(order.destination)),
+      dest: normalizeStateMachineId(order.destination),
+      from: this.ctx.source.configService.getIntentGatewayV2Address(normalizeStateMachineId(order.destination)),
       nonce: await this.ctx.source.getHostNonce(),
       height,
       keys: [key],
@@ -15856,13 +16088,13 @@ var OrderCanceller = class {
    * @param order - The order to cancel.
    * @param indexerClient - Indexer client used to stream ISMP request status
    *   updates and query state-machine heights.
-   * @param fromDest - If `true`, initiates cancellation from the destination chain.
-   *   Defaults to `false` (source-side cancellation).
+   * @param options - Choose the initiation side. Defaults to source-side cancellation.
    * @yields {@link CancelEvent} objects describing each stage of the
    *   cancellation lifecycle.
    */
-  async *cancelOrder(order, indexerClient, fromDest = false) {
-    if (fromDest) {
+  async *cancelOrder(order, indexerClient, options = {}) {
+    const isSameChain = order.source === order.destination;
+    if (options.from === "destination" && !isSameChain) {
       yield* this.cancelOrderFromDest(order, indexerClient);
       return;
     }
@@ -15895,7 +16127,7 @@ var OrderCanceller = class {
     const orderId = order.id;
     const isSameChain = order.source === order.destination;
     const intentGatewayAddress = this.ctx.source.configService.getIntentGatewayV2Address(
-      hexToString(order.source)
+      normalizeStateMachineId(order.source)
     );
     if (isSameChain) {
       const data = encodeFunctionData({
@@ -15926,7 +16158,7 @@ var OrderCanceller = class {
       return;
     }
     const hyperbridge = indexerClient.hyperbridge;
-    const sourceStateMachine = hexToString(order.source);
+    const sourceStateMachine = normalizeStateMachineId(order.source);
     const sourceConsensusStateId = this.ctx.source.configService.getConsensusStateId(sourceStateMachine);
     let destIProof = await this.ctx.cancellationStorage.getItem(STORAGE_KEYS.destProof(orderId));
     if (!destIProof) {
@@ -16036,8 +16268,8 @@ var OrderCanceller = class {
    */
   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 destStateMachine = normalizeStateMachineId(order.destination);
+    const sourceStateMachine = normalizeStateMachineId(order.source);
     const destIntentGateway = this.ctx.dest.configService.getIntentGatewayV2Address(destStateMachine);
     const sourceIntentGateway = this.ctx.source.configService.getIntentGatewayV2Address(sourceStateMachine);
     const relayerFee = await this.estimateRelayerFee(sourceStateMachine, destStateMachine);
@@ -16058,7 +16290,8 @@ var OrderCanceller = class {
    * Async generator that cancels an order by initiating from the destination
    * chain and streaming status updates until the source-chain escrow is refunded.
    *
-   * Throws if called with a same-chain order (use source-side cancellation instead).
+   * Same-chain requests are handled by the top-level router and fall back to
+   * the direct source-side cancellation path.
    *
    * **Steps:**
    * 1. Yields `AWAITING_CANCEL_TRANSACTION` so the caller can sign and submit
@@ -16071,15 +16304,11 @@ var OrderCanceller = class {
    * @param order - The cross-chain order to cancel.
    * @param indexerClient - Used to stream POST request status updates.
    * @yields {@link CancelEvent} at each lifecycle stage.
-   * @throws If the order is same-chain, or if the cancel transaction does not
-   *   contain a `PostRequestEvent`.
+   * @throws If the cancel transaction does not contain a `PostRequestEvent`.
    */
   async *cancelOrderFromDest(order, indexerClient) {
     const orderId = order.id;
-    if (order.source === order.destination) {
-      throw new Error("Cannot cancel same-chain order from destination; use cancelOrder instead");
-    }
-    const destStateMachine = order.destination.startsWith("0x") ? hexToString(order.destination) : order.destination;
+    const destStateMachine = normalizeStateMachineId(order.destination);
     const intentGatewayAddress = this.ctx.dest.configService.getIntentGatewayV2Address(destStateMachine);
     let commitment = await this.ctx.cancellationStorage.getItem(
       STORAGE_KEYS.postCommitment(orderId)
@@ -16356,7 +16585,7 @@ var BidManager = class {
       throw new Error("No valid bids found");
     }
     const intentGatewayV2Address = this.ctx.dest.configService.getIntentGatewayV2Address(
-      hexToString(order.destination)
+      normalizeStateMachineId(order.destination)
     );
     const domainSeparator = CryptoUtils.getDomainSeparator(
       "IntentGateway",
@@ -16415,7 +16644,7 @@ var BidManager = class {
       signature: finalSignature
     };
     const entryPointAddress = this.ctx.dest.configService.getEntryPointV08Address(
-      hexToString(order.destination)
+      normalizeStateMachineId(order.destination)
     );
     BigInt(
       this.ctx.dest.client.chain?.id ?? Number.parseInt(this.ctx.dest.config.stateMachineId.split("-")[1])
@@ -18411,7 +18640,10 @@ var GasEstimator = class {
     const fillOptions = {
       relayerFee: crossChainFees.postRequestFee,
       nativeDispatchFee: crossChainFees.protocolFee,
-      outputs: order.output.assets
+      outputs: order.output.assets.map((asset) => ({
+        ...asset,
+        token: normalizeAddressForEvmBytes32(asset.token)
+      }))
     };
     const totalNativeValue = totalEthValue + fillOptions.nativeDispatchFee;
     const priorityFeeBumpPercent = params.maxPriorityFeePerGasBumpPercent ?? 8;
@@ -19063,12 +19295,18 @@ var IntentGateway = class _IntentGateway {
    * Delegates to {@link OrderCanceller.quoteCancelOrder}.
    *
    * @param order - The order to quote cancellation for.
-   * @param fromDest - If `true`, quotes the destination-initiated cancellation fee.
+   * @param options - Choose the initiation side. Defaults to source-side cancellation.
    * @returns `{ nativeValue }` — native token amount (wei) to send as `value`;
    *   `{ relayerFee }` — relayer incentive denominated in the chain's fee token.
    */
-  async quoteCancelOrder(order, fromDest = false) {
-    return this.orderCanceller.quoteCancelOrder(order, fromDest);
+  async quoteCancelOrder(order, options = {}) {
+    return this.orderCanceller.quoteCancelOrder(order, options);
+  }
+  async quoteCancelOrderFromSource(order) {
+    return this.orderCanceller.quoteCancelOrder(order, { from: "source" });
+  }
+  async quoteCancelOrderFromDest(order) {
+    return this.orderCanceller.quoteCancelOrder(order, { from: "destination" });
   }
   /**
    * Async generator that cancels an order and streams status events until
@@ -19078,12 +19316,17 @@ var IntentGateway = class _IntentGateway {
    *
    * @param order - The order to cancel.
    * @param indexerClient - Indexer client used for ISMP request status streaming.
-   * @param fromDest - If `true`, initiates cancellation from the destination chain.
-   *   Defaults to `false` (source-side cancellation).
+   * @param options - Choose the initiation side. Defaults to source-side cancellation.
    * @yields {@link CancelEvent} objects describing each cancellation stage.
    */
-  async *cancelOrder(order, indexerClient, fromDest = false) {
-    yield* this.orderCanceller.cancelOrder(order, indexerClient, fromDest);
+  async *cancelOrder(order, indexerClient, options = {}) {
+    yield* this.orderCanceller.cancelOrder(order, indexerClient, options);
+  }
+  async *cancelOrderFromSource(order, indexerClient) {
+    yield* this.orderCanceller.cancelOrder(order, indexerClient, { from: "source" });
+  }
+  async *cancelOrderFromDest(order, indexerClient) {
+    yield* this.orderCanceller.cancelOrder(order, indexerClient, { from: "destination" });
   }
   /**
    * Constructs a signed `PackedUserOperation` for a solver to submit as a bid.
@@ -19264,7 +19507,7 @@ var TokenGateway = class {
    * @returns The TokenGateway contract address
    */
   getTokenGatewayAddress(chain) {
-    const chainStr = typeof chain === "string" ? chain : new TextDecoder().decode(chain);
+    const chainStr = normalizeStateMachineId(typeof chain === "string" ? chain : new TextDecoder().decode(chain));
     return this.source.configService.getTokenGatewayAddress(chainStr);
   }
   /**
@@ -19307,10 +19550,13 @@ var TokenGateway = class {
    */
   async quoteNative(params) {
     const dataHex = params.data ? typeof params.data === "string" ? params.data : toHex(params.data) : "0x";
+    const destChainId = normalizeStateMachineId(
+      typeof params.dest === "string" ? params.dest : new TextDecoder().decode(params.dest)
+    );
+    const recipient = normalizeAddressForStateMachine(params.to, destChainId);
     const sourceTokenGatewayAddress = this.getTokenGatewayAddress(this.source.config.stateMachineId);
     const destTokenGatewayAddress = this.getTokenGatewayAddress(params.dest);
     let relayerFee = 0n;
-    const destChainId = typeof params.dest === "string" ? params.dest : new TextDecoder().decode(params.dest);
     const isEvmDest = destChainId.startsWith("EVM-") && this.dest instanceof EvmChain;
     if (isEvmDest) {
       const randomHex = "0x" + Array.from({ length: 191 * 2 }, () => Math.floor(Math.random() * 16).toString(16)).join("");
@@ -19337,7 +19583,7 @@ var TokenGateway = class {
         // Use the calculated relayer fee (0 for non-EVM destinations)
         params.assetId,
         params.redeem,
-        params.to,
+        recipient,
         dataHex
       ]
     );
@@ -19521,17 +19767,14 @@ async function fetchLocalAssetId(params) {
 }
 async function teleport(teleport_param) {
   const { params, apiPromise, extrinsics = [] } = teleport_param;
-  const substrateComplianceAddr = (address, stateMachine) => {
-    if (stateMachine.startsWith("EVM-")) return pad(address, { size: 32, dir: "left" });
-    return address;
-  };
   const assetId = keccakAsU8a(params.symbol);
   const scaleEncodedAssetId = await fetchLocalAssetId({ api: apiPromise, assetId });
   if (scaleEncodedAssetId === null) {
     throw new Error("Unknown asset id provided");
   }
-  const destination = convertStateMachineIdToEnum(params.destination);
-  const recipient = hexToBytes(substrateComplianceAddr(params.recipient, params.destination));
+  const destinationStateMachine = normalizeStateMachineId(params.destination);
+  const destination = convertStateMachineIdToEnum(destinationStateMachine);
+  const recipient = hexToBytes(normalizeAddressForStateMachine(params.recipient, destinationStateMachine));
   const teleportParams = {
     destination,
     recepient: Array.from(recipient),
@@ -19784,6 +20027,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, IntentGateway, ABI7 as IntentGatewayV2ABI, IntentOrderStatus, IntentsCoprocessor, IsmpClient, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, OrderStatusChecker, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, 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, __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, pharosAtlantic, pharosMainnet, polkadotAssetHubPaseo, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, 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, IntentGateway, ABI7 as IntentGatewayV2ABI, IntentOrderStatus, IntentsCoprocessor, IsmpClient, MOCK_ADDRESS, ORDER_V2_PARAM_TYPE, OrderStatus, OrderStatusChecker, PACKED_USEROP_TYPEHASH, PLACE_ORDER_SELECTOR, 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, __test, adjustDecimals, bytes20ToBytes32, bytes32ToBytes20, calculateAllowanceMappingLocation, calculateBalanceMappingLocation, chainConfigs, constructRedeemEscrowRequestBody, constructRefundEscrowRequestBody, convertCodecToIGetRequest, convertCodecToIProof, convertIGetRequestToCodec, convertIProofToCodec, convertStateIdToStateMachineId, convertStateMachineEnumToString, convertStateMachineIdToEnum, createEvmChain, createQueryClient, decodeUserOpScale, encodeERC7821ExecuteBatch, encodeISMPMessage, encodeStateMachineId, encodeUserOpScale, encodeWithdrawalRequest, estimateGasForPost, fetchPrice, fetchSourceProof, generateRootWithProof, getChainId, getConfigByStateMachineId, getContractCallInput, getGasPriceFromEtherscan, getOrFetchStorageSlot, getOrderPlacedFromTx, getPostRequestEventFromTx, getPostResponseEventFromTx, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, getViemChain, hexToString, hyperbridgeAddress, maxBigInt, normalizeAddressForEvmBytes32, normalizeAddressForStateMachine, normalizeEvmChainId, normalizeStateMachineId, orderCommitment, parseStateMachineId, pharosAtlantic, pharosMainnet, polkadotAssetHubPaseo, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, quoteUniswap, requestCommitmentKey, responseCommitmentKey, retryPromise, teleport, teleportDot, transformOrderForContract, tronChainIds, tronNile };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map