@sodax/sdk 0.0.1-rc.24 → 0.0.1-rc.26

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { getAbiItem, encodeAbiParameters, parseAbiParameters, toHex, erc20Abi as erc20Abi$1, encodeFunctionData, fromHex, createPublicClient, http, decodeAbiParameters, encodePacked, parseEventLogs, keccak256, isAddress } from 'viem';
-import invariant10 from 'tiny-invariant';
+import invariant11 from 'tiny-invariant';
 import { bcs } from '@mysten/sui/bcs';
 import { PublicKey, Connection, VersionedTransaction, SystemProgram, ComputeBudgetProgram } from '@solana/web3.js';
 import { SorobanRpc, Address, Horizon, Contract, TransactionBuilder, BASE_FEE, nativeToScVal, TimeoutInfinite, rpc, scValToBigInt, Operation, Account, FeeBumpTransaction } from '@stellar/stellar-sdk';
@@ -6141,16 +6141,16 @@ function calculateFeeAmount(inputAmount, fee) {
   if (!fee) {
     return 0n;
   }
-  invariant10(inputAmount > 0n, "Input amount must be greater than 0");
+  invariant11(inputAmount > 0n, "Input amount must be greater than 0");
   let feeAmount = 0n;
   if (isPartnerFeeAmount(fee)) {
-    invariant10(
+    invariant11(
       fee.amount >= 0 && fee.amount <= inputAmount,
       `Fee amount must be greater than 0 and less than or equal to the input amount: ${fee.amount}`
     );
     feeAmount = fee.amount;
   } else if (isPartnerFeePercentage(fee)) {
-    invariant10(
+    invariant11(
       fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
       `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
     );
@@ -6159,8 +6159,8 @@ function calculateFeeAmount(inputAmount, fee) {
   return feeAmount;
 }
 function adjustAmountByFee(amount, fee, quoteType) {
-  invariant10(amount > 0n, "Amount must be greater than 0");
-  invariant10(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
+  invariant11(amount > 0n, "Amount must be greater than 0");
+  invariant11(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
   if (quoteType === "exact_input") {
     return amount - calculateFeeAmount(amount, fee);
   }
@@ -6303,6 +6303,7 @@ var hubChainConfig = {
       sodaToken: "0x7c7d53eecda37a87ce0d5bf8e0b24512a48dc963"
     },
     nativeToken: "0x0000000000000000000000000000000000000000",
+    wrappedNativeToken: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
     supportedTokens: []
   }
 };
@@ -6799,6 +6800,7 @@ var spokeChainConfig = {
   [SUI_MAINNET_CHAIN_ID]: {
     addresses: {
       connection: "0xf3b1e696a66d02cb776dc15aae73c68bc8f03adcb6ba0ec7f6332d9d90a6a3d2::connectionv3::0x3ee76d13909ac58ae13baab4c9be5a5142818d9a387aed641825e5d4356969bf",
+      assetManagerId: "0xa17a409164d1676db71b411ab50813ba2c7dd547d2df538c699049566f1ff922::asset_manager::0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
       assetManager: "0x897f911a4b7691870a1a2513af7e85fdee8de275615c77068fd8b90b8e78c678::asset_manager::0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
       xTokenManager: "",
       rateLimit: "",
@@ -9222,6 +9224,32 @@ var EvmSpokeService = class _EvmSpokeService {
       args: [token]
     });
   }
+  /**
+   * Generate simulation parameters for deposit from EvmSpokeDepositParams.
+   * @param {EvmSpokeDepositParams} params - The deposit parameters.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      params.from,
+      hubProvider
+    );
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: encodeAddress(
+        spokeProvider.chainConfig.chain.id,
+        spokeProvider.chainConfig.addresses.assetManager
+      )
+    };
+  }
   /**
    * Calls a contract on the spoke chain using the user's wallet.
    * @param {HubAddress} from - The address of the user on the hub chain.
@@ -9344,6 +9372,32 @@ var InjectiveSpokeService = class _InjectiveSpokeService {
       raw
     );
   }
+  /**
+   * Generate simulation parameters for deposit from InjectiveSpokeDepositParams.
+   * @param {InjectiveSpokeDepositParams} params - The deposit parameters.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      toHex(Buffer.from(params.from, "utf-8")),
+      hubProvider
+    );
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: encodeAddress(
+        spokeProvider.chainConfig.chain.id,
+        spokeProvider.chainConfig.addresses.assetManager
+      )
+    };
+  }
   /**
    * Get the balance of the token that deposited in the spoke chain Asset Manager.
    * @param {Address} token - The address of the token to get the balance of.
@@ -9481,6 +9535,32 @@ var IconSpokeService = class _IconSpokeService {
     const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
     return _IconSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
   }
+  /**
+   * Generate simulation parameters for deposit from IconSpokeDepositParams.
+   * @param {IconSpokeDepositParams} params - The deposit parameters.
+   * @param {IconSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      getIconAddressBytes(params.from),
+      hubProvider
+    );
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: encodeAddress(
+        spokeProvider.chainConfig.chain.id,
+        spokeProvider.chainConfig.addresses.assetManager
+      )
+    };
+  }
   /**
    * Transfers tokens to the hub chain.
    */
@@ -9681,6 +9761,32 @@ var SolanaSpokeService = class _SolanaSpokeService {
     const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
     return _SolanaSpokeService.call(BigInt(relayId), from, keccak256(payload), spokeProvider, raw);
   }
+  /**
+   * Generate simulation parameters for deposit from SolanaSpokeDepositParams.
+   * @param {SolanaSpokeDepositParams} params - The deposit parameters.
+   * @param {SolanaSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      hubProvider
+    );
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: encodeAddress(
+        spokeProvider.chainConfig.chain.id,
+        spokeProvider.chainConfig.addresses.assetManager
+      )
+    };
+  }
   static async transfer({ token, recipient, amount, data }, spokeProvider, raw) {
     let depositInstruction;
     const amountBN = new BN(amount);
@@ -9849,6 +9955,32 @@ var StellarSpokeService = class _StellarSpokeService {
   static async getDeposit(token, spokeProvider) {
     return BigInt(await spokeProvider.getBalance(token));
   }
+  /**
+   * Generate simulation parameters for deposit from StellarSpokeDepositParams.
+   * @param {StellarSpokeDepositParams} params - The deposit parameters.
+   * @param {StellarSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      params.from,
+      hubProvider
+    );
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      from: params.from,
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: encodeAddress(
+        spokeProvider.chainConfig.chain.id,
+        spokeProvider.chainConfig.addresses.assetManager
+      )
+    };
+  }
   /**
    * Calls a contract on the spoke chain using the user's wallet.
    * @param from - The address of the user on the hub chain.
@@ -9931,6 +10063,30 @@ var SuiSpokeService = class _SuiSpokeService {
   static async getDeposit(token, spokeProvider) {
     return spokeProvider.getBalance(token);
   }
+  /**
+   * Generate simulation parameters for deposit from SuiSpokeDepositParams.
+   * @param {SuiSpokeDepositParams} params - The deposit parameters.
+   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<DepositSimulationParams>} The simulation parameters.
+   */
+  static async getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      params.from,
+      hubProvider
+    );
+    const encoder = new TextEncoder();
+    return {
+      spokeChainID: spokeProvider.chainConfig.chain.id,
+      token: toHex(encoder.encode(params.token)),
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
+      to,
+      amount: params.amount,
+      data: params.data,
+      srcAddress: toHex(encoder.encode(spokeProvider.chainConfig.addresses.assetManagerId))
+    };
+  }
   /**
    * Calls a contract on the spoke chain using the user's wallet.
    * @param {HubAddress} from - The address of the user on the spoke chain.
@@ -10085,6 +10241,58 @@ var SonicSpokeService = class _SonicSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
+  static async createSwapIntent(createIntentParams, creatorHubWalletAddress, solverConfig2, fee, spokeProvider, hubProvider, raw) {
+    let inputToken = getHubAssetInfo(createIntentParams.srcChain, createIntentParams.inputToken)?.asset;
+    if (createIntentParams.srcChain === hubProvider.chainConfig.chain.id && createIntentParams.inputToken.toLowerCase() === hubProvider.chainConfig.nativeToken.toLowerCase()) {
+      inputToken = hubProvider.chainConfig.nativeToken;
+    }
+    const outputToken = getHubAssetInfo(createIntentParams.dstChain, createIntentParams.outputToken)?.asset;
+    invariant11(
+      inputToken,
+      `hub asset not found for spoke chain token (intent.inputToken): ${createIntentParams.inputToken}`
+    );
+    invariant11(
+      outputToken,
+      `hub asset not found for spoke chain token (intent.outputToken): ${createIntentParams.outputToken}`
+    );
+    const [feeData, feeAmount] = EvmSolverService.createIntentFeeData(fee, createIntentParams.inputAmount);
+    const intentsContract = solverConfig2.intentsContract;
+    const intent = {
+      ...createIntentParams,
+      inputToken,
+      outputToken,
+      inputAmount: createIntentParams.inputAmount - feeAmount,
+      srcChain: getIntentRelayChainId(createIntentParams.srcChain),
+      dstChain: getIntentRelayChainId(createIntentParams.dstChain),
+      srcAddress: encodeAddress(createIntentParams.srcChain, createIntentParams.srcAddress),
+      dstAddress: encodeAddress(createIntentParams.dstChain, createIntentParams.dstAddress),
+      intentId: randomUint256(),
+      creator: creatorHubWalletAddress,
+      data: feeData
+      // fee amount will be deducted from the input amount
+    };
+    const txData = EvmSolverService.encodeCreateIntent(intent, intentsContract);
+    const rawTx = {
+      from: await spokeProvider.walletProvider.getWalletAddress(),
+      to: txData.address,
+      data: txData.data,
+      value: createIntentParams.inputToken.toLowerCase() === hubProvider.chainConfig.nativeToken.toLowerCase() ? createIntentParams.inputAmount : 0n
+    };
+    if (raw) {
+      return [
+        rawTx,
+        intent,
+        feeAmount,
+        txData.data
+      ];
+    }
+    return [
+      await spokeProvider.walletProvider.sendTransaction(rawTx),
+      intent,
+      feeAmount,
+      txData.data
+    ];
+  }
   /**
    * Get the balance of the token in the spoke chain.
    * @param {Address} token - The address of the token to get the balance of.
@@ -10446,9 +10654,7 @@ function isBalnMigrateParams(value) {
 function isIcxCreateRevertMigrationParams(value) {
   return typeof value === "object" && value !== null && "amount" in value && "to" in value;
 }
-
-// src/services/spoke/SpokeService.ts
-var SpokeService = class {
+var SpokeService = class _SpokeService {
   constructor() {
   }
   /**
@@ -10502,14 +10708,99 @@ var SpokeService = class {
     }
     throw new Error("Invalid spoke provider");
   }
+  /**
+  
+  * Encodes transfer data using RLP encoding to match Solidity Transfer struct.
+   * @param {Hex} token - The token contract address.
+   * @param {Hex} from - The sender address.
+   * @param {Hex} to - The recipient address.
+   * @param {bigint} amount - The transfer amount.
+   * @param {Hex} data - The encoded data payload.
+   * @returns {Promise<Hex>} A promise that resolves to the RLP encoded transfer data.
+   */
+  static encodeTransfer(token, from, to, amount, data) {
+    const rlpInput = [
+      token,
+      // token (bytes)
+      from,
+      // from (bytes)
+      to,
+      // to (bytes)
+      amount,
+      // amount (uint256)
+      data
+      // data (bytes)
+    ];
+    const rlpEncodedData = rlp.encode(rlpInput);
+    return `0x${Buffer.from(rlpEncodedData).toString("hex")}`;
+  }
+  static async simulateDeposit(params, hubProvider) {
+    const chainId = getIntentRelayChainId(params.spokeChainID);
+    const hubAssetManager = hubProvider.chainConfig.addresses.assetManager;
+    const payload = _SpokeService.encodeTransfer(params.token, params.from, params.to, params.amount, params.data);
+    return _SpokeService.simulateRecvMessage(
+      { target: hubAssetManager, srcChainId: chainId, srcAddress: params.srcAddress, payload },
+      hubProvider
+    );
+  }
+  /**
+   * Simulates receiving a message without signature verification.
+   * This function calls simulateRecvMessage which always reverts with 'Simulation completed'.
+   * @param {bigint} srcChainId - The chain ID of the originating chain.
+   * @param {Hex} srcAddress - The address of the sender on the originating chain.
+   * @param {Hex} payload - The encoded payload containing call data (from encodeTransfer).
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Promise<{ success: boolean; error?: string }>} Result of the simulation.
+   */
+  static async simulateRecvMessage(params, hubProvider) {
+    try {
+      const result = await hubProvider.publicClient.call({
+        to: params.target,
+        data: encodeFunctionData({
+          abi: [
+            {
+              name: "simulateRecvMessage",
+              type: "function",
+              stateMutability: "nonpayable",
+              inputs: [
+                { name: "srcChainId", type: "uint256" },
+                { name: "srcAddress", type: "bytes" },
+                { name: "payload", type: "bytes" }
+              ],
+              outputs: []
+            }
+          ],
+          functionName: "simulateRecvMessage",
+          args: [params.srcChainId, params.srcAddress, params.payload]
+        })
+      });
+      console.warn("simulateRecvMessage did not revert as expected", { result });
+      return {
+        success: false,
+        error: 'Function should have reverted with "Simulation completed"'
+      };
+    } catch (error) {
+      if (error instanceof Error && error.message?.includes("Simulation completed")) {
+        console.warn("simulateRecvMessage completed successfully with expected revert");
+        return { success: true };
+      }
+      console.error("simulateRecvMessage failed with unexpected error:", error);
+      return {
+        success: false,
+        error: error instanceof Error ? error.message || "Unknown simulation error" : "Unknown simulation error"
+      };
+    }
+  }
   /**
    * Deposit tokens to the spoke chain.
    * @param {GetSpokeDepositParamsType<T extends SpokeProvider>} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
    * @param {SpokeProvider} spokeProvider - The provider for the spoke chain.
    * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @param {boolean} raw - Whether to return raw transaction data.
+   * @param {boolean} skipSimulation - Whether to skip deposit simulation (optional, defaults to false).
    * @returns {Promise<Hash>} A promise that resolves to the transaction hash.
    */
-  static async deposit(params, spokeProvider, hubProvider, raw) {
+  static async deposit(params, spokeProvider, hubProvider, raw, skipSimulation = false) {
     if (spokeProvider instanceof SonicSpokeProvider) {
       return SonicSpokeService.deposit(
         params,
@@ -10518,6 +10809,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof EvmSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return EvmSpokeService.deposit(
         params,
         spokeProvider,
@@ -10526,14 +10818,11 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof InjectiveSpokeProvider) {
-      return InjectiveSpokeService.deposit(
-        params,
-        spokeProvider,
-        hubProvider,
-        raw
-      );
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
+      return InjectiveSpokeService.deposit(params, spokeProvider, hubProvider, raw);
     }
     if (spokeProvider instanceof IconSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return IconSpokeService.deposit(
         params,
         spokeProvider,
@@ -10542,6 +10831,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof SuiSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return SuiSpokeService.deposit(
         params,
         spokeProvider,
@@ -10550,6 +10840,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof SolanaSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return SolanaSpokeService.deposit(
         params,
         spokeProvider,
@@ -10558,6 +10849,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof StellarSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return StellarSpokeService.deposit(
         params,
         spokeProvider,
@@ -10567,6 +10859,60 @@ var SpokeService = class {
     }
     throw new Error("Invalid spoke provider");
   }
+  static getSimulateDepositParams(params, spokeProvider, hubProvider) {
+    if (spokeProvider instanceof EvmSpokeProvider) {
+      return EvmSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    if (spokeProvider instanceof InjectiveSpokeProvider) {
+      return InjectiveSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    if (spokeProvider instanceof IconSpokeProvider) {
+      return IconSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    if (spokeProvider instanceof SuiSpokeProvider) {
+      return SuiSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    if (spokeProvider instanceof SolanaSpokeProvider) {
+      return SolanaSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    if (spokeProvider instanceof StellarSpokeProvider) {
+      return StellarSpokeService.getSimulateDepositParams(
+        params,
+        spokeProvider,
+        hubProvider
+      );
+    }
+    throw new Error("Invalid spoke provider");
+  }
+  static async verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation) {
+    if (!skipSimulation) {
+      const simulationParams = await _SpokeService.getSimulateDepositParams(params, spokeProvider, hubProvider);
+      const result = await _SpokeService.simulateDeposit(simulationParams, hubProvider);
+      if (!result.success) {
+        throw new Error("Simulation failed", { cause: result });
+      }
+    }
+  }
   /**
    * Get the balance of the token in the spoke chain.
    * @param {Address} token - The address of the token to get the balance of.
@@ -10605,14 +10951,16 @@ var SpokeService = class {
    * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
    * @returns {Promise<Hash>} A promise that resolves to the transaction hash.
    */
-  static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
+  static async callWallet(from, payload, spokeProvider, hubProvider, raw, skipSimulation = false) {
     if (isSonicSpokeProvider(spokeProvider)) {
       return await SonicSpokeService.callWallet(payload, spokeProvider, raw);
     }
     if (isEvmSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await EvmSpokeService.callWallet(from, payload, spokeProvider, hubProvider);
     }
     if (isInjectiveSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await InjectiveSpokeService.callWallet(
         from,
         payload,
@@ -10622,12 +10970,15 @@ var SpokeService = class {
       );
     }
     if (isIconSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await IconSpokeService.callWallet(from, payload, spokeProvider, hubProvider, raw);
     }
     if (isSuiSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await SuiSpokeService.callWallet(from, payload, spokeProvider, hubProvider, raw);
     }
     if (isSolanaSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await SolanaSpokeService.callWallet(
         from,
         payload,
@@ -10637,10 +10988,27 @@ var SpokeService = class {
       );
     }
     if (isStellarSpokeProvider(spokeProvider)) {
+      await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await StellarSpokeService.callWallet(from, payload, spokeProvider, hubProvider);
     }
     throw new Error("Invalid spoke provider");
   }
+  static async verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation) {
+    if (!skipSimulation) {
+      const result = await _SpokeService.simulateRecvMessage(
+        {
+          target: from,
+          srcChainId: getIntentRelayChainId(spokeProvider.chainConfig.chain.id),
+          srcAddress: await spokeProvider.walletProvider.getWalletAddressBytes(),
+          payload
+        },
+        hubProvider
+      );
+      if (!result.success) {
+        throw new Error("Simulation failed", { cause: result });
+      }
+    }
+  }
 };
 async function postRequest(payload, apiUrl) {
   const response = await retry(
@@ -10655,19 +11023,19 @@ async function postRequest(payload, apiUrl) {
   return response.json();
 }
 async function submitTransaction(payload, apiUrl) {
-  invariant10(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant10(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant11(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant11(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
   return postRequest(payload, apiUrl);
 }
 async function getTransactionPackets(payload, apiUrl) {
-  invariant10(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant10(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant11(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant11(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
   return postRequest(payload, apiUrl);
 }
 async function getPacket(payload, apiUrl) {
-  invariant10(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant10(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
-  invariant10(payload.params.conn_sn.length > 0, "Invalid input parameters. conn_sn empty");
+  invariant11(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant11(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant11(payload.params.conn_sn.length > 0, "Invalid input parameters. conn_sn empty");
   return postRequest(payload, apiUrl);
 }
 async function waitUntilIntentExecuted(payload) {
@@ -10792,14 +11160,17 @@ var EvmSolverService = class _EvmSolverService {
    * @param {PartnerFee} fee - The partner fee configuration
    * @returns {Promise<[Hex, Intent, bigint]>} The encoded contract call, intent and fee amount
    */
-  static constructCreateIntentData(createIntentParams, creatorHubWalletAddress, solverConfig2, fee) {
-    const inputToken = getHubAssetInfo(createIntentParams.srcChain, createIntentParams.inputToken)?.asset;
+  static constructCreateIntentData(createIntentParams, creatorHubWalletAddress, solverConfig2, fee, hubProvider) {
+    let inputToken = getHubAssetInfo(createIntentParams.srcChain, createIntentParams.inputToken)?.asset;
+    if (createIntentParams.srcChain === hubProvider.chainConfig.chain.id && createIntentParams.inputToken.toLowerCase() === hubProvider.chainConfig.nativeToken.toLowerCase()) {
+      inputToken = hubProvider.chainConfig.wrappedNativeToken;
+    }
     const outputToken = getHubAssetInfo(createIntentParams.dstChain, createIntentParams.outputToken)?.asset;
-    invariant10(
+    invariant11(
       inputToken,
       `hub asset not found for spoke chain token (intent.inputToken): ${createIntentParams.inputToken}`
     );
-    invariant10(
+    invariant11(
       outputToken,
       `hub asset not found for spoke chain token (intent.outputToken): ${createIntentParams.outputToken}`
     );
@@ -10831,7 +11202,7 @@ var EvmSolverService = class _EvmSolverService {
    * @returns A tuple containing [encoded fee data, fee amount]. Fee amount will be 0n if no fee.
    */
   static createIntentFeeData(fee, inputAmount) {
-    invariant10(inputAmount > 0n, "Input amount must be greater than 0");
+    invariant11(inputAmount > 0n, "Input amount must be greater than 0");
     if (!fee) {
       return ["0x", 0n];
     }
@@ -10839,7 +11210,7 @@ var EvmSolverService = class _EvmSolverService {
     if (isPartnerFeeAmount(fee)) {
       feeAmount = fee.amount;
     } else if (isPartnerFeePercentage(fee)) {
-      invariant10(
+      invariant11(
         fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
         `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
       );
@@ -10966,23 +11337,23 @@ var SolverApiService = class {
    * }
    */
   static async getQuote(payload, config) {
-    invariant10(payload.token_src.length > 0, "Empty token_src");
-    invariant10(payload.token_src_blockchain_id.length > 0, "Empty token_src_blockchain_id");
-    invariant10(payload.token_dst.length > 0, "Empty token_dst");
-    invariant10(payload.token_dst_blockchain_id.length > 0, "Empty token_dst_blockchain_id");
-    invariant10(payload.amount > 0n, "amount must be greater than 0");
-    invariant10(
+    invariant11(payload.token_src.length > 0, "Empty token_src");
+    invariant11(payload.token_src_blockchain_id.length > 0, "Empty token_src_blockchain_id");
+    invariant11(payload.token_dst.length > 0, "Empty token_dst");
+    invariant11(payload.token_dst_blockchain_id.length > 0, "Empty token_dst_blockchain_id");
+    invariant11(payload.amount > 0n, "amount must be greater than 0");
+    invariant11(
       isValidOriginalAssetAddress(payload.token_src_blockchain_id, payload.token_src),
       "unsupported token_src for src chain"
     );
-    invariant10(
+    invariant11(
       isValidOriginalAssetAddress(payload.token_dst_blockchain_id, payload.token_dst),
       "unsupported token_dst for dst chain"
     );
     const tokenSrc = getHubAssetInfo(payload.token_src_blockchain_id, payload.token_src)?.asset;
     const tokenDst = getHubAssetInfo(payload.token_dst_blockchain_id, payload.token_dst)?.asset;
-    invariant10(tokenSrc, "hub asset not found for token_src");
-    invariant10(tokenDst, "hub asset not found for token_dst");
+    invariant11(tokenSrc, "hub asset not found for token_src");
+    invariant11(tokenDst, "hub asset not found for token_dst");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/quote`, {
         method: "POST",
@@ -11077,7 +11448,7 @@ var SolverApiService = class {
     }
   }
   static async getStatus(request, config) {
-    invariant10(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
+    invariant11(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/status`, {
         method: "POST",
@@ -11345,13 +11716,15 @@ var SolverService = class {
     intentParams: params,
     spokeProvider,
     fee = this.config.partnerFee,
-    timeout = DEFAULT_RELAY_TX_TIMEOUT
+    timeout = DEFAULT_RELAY_TX_TIMEOUT,
+    skipSimulation = false
   }) {
     return this.createAndSubmitIntent({
       intentParams: params,
       spokeProvider,
       fee,
-      timeout
+      timeout,
+      skipSimulation
     });
   }
   /**
@@ -11400,14 +11773,16 @@ var SolverService = class {
     intentParams: params,
     spokeProvider,
     fee = this.config.partnerFee,
-    timeout = DEFAULT_RELAY_TX_TIMEOUT
+    timeout = DEFAULT_RELAY_TX_TIMEOUT,
+    skipSimulation = false
   }) {
     try {
       const createIntentResult = await this.createIntent({
         intentParams: params,
         spokeProvider,
         fee,
-        raw: false
+        raw: false,
+        skipSimulation
       });
       if (!createIntentResult.ok) {
         return createIntentResult;
@@ -11534,13 +11909,23 @@ var SolverService = class {
     spokeProvider
   }) {
     try {
-      if (spokeProvider instanceof EvmSpokeProvider || spokeProvider instanceof SonicSpokeProvider) {
+      if (spokeProvider instanceof EvmSpokeProvider) {
+        const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+        return await Erc20Service.isAllowanceValid(
+          params.inputToken,
+          params.inputAmount,
+          walletAddress,
+          spokeProvider.chainConfig.addresses.assetManager,
+          spokeProvider
+        );
+      }
+      if (spokeProvider instanceof SonicSpokeProvider) {
         const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
         return await Erc20Service.isAllowanceValid(
           params.inputToken,
           params.inputAmount,
           walletAddress,
-          spokeProvider instanceof EvmSpokeProvider ? spokeProvider.chainConfig.addresses.assetManager : spokeProvider.chainConfig.addresses.walletRouter,
+          getSolverConfig(SONIC_MAINNET_CHAIN_ID).intentsContract,
           spokeProvider
         );
       }
@@ -11599,7 +11984,7 @@ var SolverService = class {
     raw
   }) {
     try {
-      if (spokeProvider instanceof EvmSpokeProvider || spokeProvider instanceof SonicSpokeProvider) {
+      if (spokeProvider instanceof EvmSpokeProvider) {
         const result = await Erc20Service.approve(
           params.inputToken,
           params.inputAmount,
@@ -11612,6 +11997,19 @@ var SolverService = class {
           value: result
         };
       }
+      if (spokeProvider instanceof SonicSpokeProvider) {
+        const result = await Erc20Service.approve(
+          params.inputToken,
+          params.inputAmount,
+          getSolverConfig(SONIC_MAINNET_CHAIN_ID).intentsContract,
+          spokeProvider,
+          raw
+        );
+        return {
+          ok: true,
+          value: result
+        };
+      }
       return {
         ok: false,
         error: new Error("Approve only supported for EVM spoke chains")
@@ -11671,48 +12069,70 @@ var SolverService = class {
     fee = this.config.partnerFee,
     raw
   }) {
-    invariant10(
+    invariant11(
       isValidOriginalAssetAddress(params.srcChain, params.inputToken),
       `Unsupported spoke chain token (params.srcChain): ${params.srcChain}, params.inputToken): ${params.inputToken}`
     );
-    invariant10(
+    invariant11(
       isValidOriginalAssetAddress(params.dstChain, params.outputToken),
       `Unsupported spoke chain token (params.dstChain): ${params.dstChain}, params.outputToken): ${params.outputToken}`
     );
-    invariant10(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
-    invariant10(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
+    invariant11(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
+    invariant11(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
     try {
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      invariant10(
+      invariant11(
         params.srcAddress.toLowerCase() === walletAddress.toLowerCase(),
         "srcAddress must be the same as wallet address"
       );
       const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
-      const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
-        {
-          ...params,
-          srcAddress: walletAddress
-        },
-        creatorHubWalletAddress,
-        this.config,
-        fee
-      );
-      const txResult = await SpokeService.deposit(
-        {
-          from: walletAddress,
-          to: creatorHubWalletAddress,
-          token: params.inputToken,
-          amount: params.inputAmount,
-          data
-        },
-        spokeProvider,
-        this.hubProvider,
-        raw
-      );
-      return {
-        ok: true,
-        value: [txResult, { ...intent, feeAmount }, data]
-      };
+      if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
+        const [txResult, intent, feeAmount, data] = await SonicSpokeService.createSwapIntent(
+          params,
+          creatorHubWalletAddress,
+          this.config,
+          fee,
+          spokeProvider,
+          this.hubProvider,
+          raw
+        );
+        return {
+          ok: true,
+          value: [
+            txResult,
+            { ...intent, feeAmount },
+            data
+          ]
+        };
+      }
+      {
+        const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
+          {
+            ...params,
+            srcAddress: walletAddress
+          },
+          creatorHubWalletAddress,
+          this.config,
+          fee,
+          this.hubProvider
+        );
+        const txResult = await SpokeService.deposit(
+          {
+            from: walletAddress,
+            to: creatorHubWalletAddress,
+            token: params.inputToken,
+            amount: params.inputAmount,
+            data
+          },
+          spokeProvider,
+          this.hubProvider,
+          raw
+        );
+        return {
+          ok: true,
+          value: [txResult, { ...intent, feeAmount }, data]
+        };
+      }
     } catch (error) {
       return {
         ok: false,
@@ -11735,8 +12155,8 @@ var SolverService = class {
    */
   async cancelIntent(intent, spokeProvider, raw) {
     try {
-      invariant10(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
-      invariant10(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
+      invariant11(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
+      invariant11(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const calls = [];
@@ -12248,7 +12668,7 @@ var IcxMigrationService = class {
   migrateData(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(ICON_MAINNET_CHAIN_ID, params.address);
-    invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${params.address}`);
+    invariant11(assetConfig, `hub asset not found for spoke chain token (token): ${params.address}`);
     calls.push(
       Erc20Service.encodeApprove(assetConfig.asset, this.hubProvider.chainConfig.addresses.icxMigration, params.amount)
     );
@@ -12264,7 +12684,7 @@ var IcxMigrationService = class {
   revertMigration(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(ICON_MAINNET_CHAIN_ID, params.wICX);
-    invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${params.wICX}`);
+    invariant11(assetConfig, `hub asset not found for spoke chain token (token): ${params.wICX}`);
     calls.push(
       Erc20Service.encodeApprove(
         this.hubProvider.chainConfig.addresses.sodaToken,
@@ -12360,9 +12780,9 @@ var MigrationService = class {
   async isAllowanceValid(params, action, spokeProvider) {
     try {
       if (action === "migrate") {
-        invariant10(params.amount > 0n, "Amount must be greater than 0");
-        invariant10(isAddress(params.to) || isIconAddress(params.to), "To address is required");
-        invariant10(
+        invariant11(params.amount > 0n, "Amount must be greater than 0");
+        invariant11(isAddress(params.to) || isIconAddress(params.to), "To address is required");
+        invariant11(
           isIcxMigrateParams(params) || isBalnMigrateParams(params) || isUnifiedBnUSDMigrateParams(params),
           "Invalid params"
         );
@@ -12388,9 +12808,9 @@ var MigrationService = class {
         };
       }
       if (action === "revert") {
-        invariant10(params.amount > 0n, "Amount must be greater than 0");
-        invariant10(params.to.length > 0, "To address is required");
-        invariant10(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant11(params.amount > 0n, "Amount must be greater than 0");
+        invariant11(params.to.length > 0, "To address is required");
+        invariant11(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
           const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
@@ -12446,9 +12866,9 @@ var MigrationService = class {
   async approve(params, action, spokeProvider, raw) {
     try {
       if (action === "migrate") {
-        invariant10(params.amount > 0n, "Amount must be greater than 0");
-        invariant10(params.to.length > 0, "To address is required");
-        invariant10(isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant11(params.amount > 0n, "Amount must be greater than 0");
+        invariant11(params.to.length > 0, "To address is required");
+        invariant11(isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
           const evmSpokeProvider = spokeProvider;
           const result = await Erc20Service.approve(
@@ -12469,9 +12889,9 @@ var MigrationService = class {
         };
       }
       if (action === "revert") {
-        invariant10(params.amount > 0n, "Amount must be greater than 0");
-        invariant10(params.to.length > 0, "To address is required");
-        invariant10(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant11(params.amount > 0n, "Amount must be greater than 0");
+        invariant11(params.to.length > 0, "To address is required");
+        invariant11(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
           const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
@@ -12883,13 +13303,13 @@ var MigrationService = class {
   async createMigratebnUSDIntent(params, spokeProvider, unchecked = false, raw) {
     try {
       if (!unchecked) {
-        invariant10(isValidSpokeChainId(params.srcChainId), "Invalid spoke source chain ID");
-        invariant10(isValidSpokeChainId(params.dstChainId), "Invalid spoke destination chain ID");
-        invariant10(params.srcbnUSD.length > 0, "Legacy bnUSD token address is required");
-        invariant10(params.dstbnUSD.length > 0, "New bnUSD token address is required");
-        invariant10(params.amount > 0, "Amount must be greater than 0");
-        invariant10(params.to.length > 0, "Recipient address is required");
-        invariant10(
+        invariant11(isValidSpokeChainId(params.srcChainId), "Invalid spoke source chain ID");
+        invariant11(isValidSpokeChainId(params.dstChainId), "Invalid spoke destination chain ID");
+        invariant11(params.srcbnUSD.length > 0, "Legacy bnUSD token address is required");
+        invariant11(params.dstbnUSD.length > 0, "New bnUSD token address is required");
+        invariant11(params.amount > 0, "Amount must be greater than 0");
+        invariant11(params.to.length > 0, "Recipient address is required");
+        invariant11(
           !(isLegacybnUSDToken(params.srcbnUSD) && isLegacybnUSDToken(params.dstbnUSD)),
           "srcbnUSD and dstbnUSD cannot both be legacy bnUSD tokens"
         );
@@ -12897,11 +13317,11 @@ var MigrationService = class {
       let migrationData;
       if (isLegacybnUSDToken(params.srcbnUSD)) {
         if (!unchecked) {
-          invariant10(
+          invariant11(
             isLegacybnUSDChainId(params.srcChainId),
             "srcChainId must be a legacy bnUSD chain (icon, sui, stellar) if srcbnUSD is a legacy bnUSD token"
           );
-          invariant10(
+          invariant11(
             isNewbnUSDChainId(params.dstChainId),
             "dstChainId must be a new bnUSD chain (all spoke chains besides Icon) if dstbnUSD is a legacy bnUSD token"
           );
@@ -12916,15 +13336,15 @@ var MigrationService = class {
         });
       } else if (isLegacybnUSDToken(params.dstbnUSD)) {
         if (!unchecked) {
-          invariant10(
+          invariant11(
             isLegacybnUSDChainId(params.dstChainId),
             "dstChainId must be a legacy bnUSD chain (sui, stellar, icon) if dstbnUSD is a legacy bnUSD token"
           );
-          invariant10(
+          invariant11(
             isNewbnUSDToken(params.srcbnUSD),
             "srcbnUSD must be a new bnUSD token if dstbnUSD is a legacy bnUSD token"
           );
-          invariant10(
+          invariant11(
             isNewbnUSDChainId(params.srcChainId),
             "srcChainId must be a new bnUSD chain (all spoke chains besides Icon) if srcbnUSD is a new bnUSD token"
           );
@@ -12997,13 +13417,13 @@ var MigrationService = class {
    */
   async createMigrateIcxToSodaIntent(params, spokeProvider, raw) {
     try {
-      invariant10(params.amount > 0, "Amount must be greater than 0");
-      invariant10(isAddress(params.to), "Recipient address is required");
-      invariant10(
+      invariant11(params.amount > 0, "Amount must be greater than 0");
+      invariant11(isAddress(params.to), "Recipient address is required");
+      invariant11(
         params.address.toLowerCase() === spokeProvider.chainConfig.addresses.wICX.toLowerCase() || params.address.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase(),
         "Token must be wICX or native ICX token"
       );
-      invariant10(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
+      invariant11(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
       const availableAmount = await this.icxMigration.getAvailableAmount();
       if (availableAmount < params.amount) {
         throw new Error(
@@ -13115,7 +13535,7 @@ var BnUSDMigrationService = class {
   migrateData(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(params.srcChainId, params.legacybnUSD);
-    invariant10(assetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
+    invariant11(assetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
     const bnUSDVault = getMoneyMarketConfig(SONIC_MAINNET_CHAIN_ID).bnUSDVault;
     calls.push(Erc20Service.encodeApprove(assetConfig.asset, assetConfig.vault, params.amount));
     calls.push(EvmVaultTokenService.encodeDeposit(assetConfig.vault, assetConfig.asset, params.amount));
@@ -13127,7 +13547,7 @@ var BnUSDMigrationService = class {
       return encodeContractCalls(calls);
     }
     const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.newbnUSD);
-    invariant10(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
+    invariant11(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
       dstAssetConfig.decimal,
@@ -13160,14 +13580,14 @@ var BnUSDMigrationService = class {
     let decimals = 18;
     if (params.newbnUSD.toLowerCase() !== bnUSDVault.toLowerCase()) {
       const assetConfig = getHubAssetInfo(params.srcChainId, params.newbnUSD);
-      invariant10(assetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
+      invariant11(assetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
       decimals = assetConfig.decimal;
       calls.push(Erc20Service.encodeApprove(assetConfig.asset, bnUSDVault, params.amount));
       calls.push(EvmVaultTokenService.encodeDeposit(bnUSDVault, assetConfig.asset, params.amount));
     }
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(decimals, params.amount);
     const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.legacybnUSD);
-    invariant10(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.legacybnUSD}`);
+    invariant11(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.legacybnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.vault, translatedAmount));
     calls.push(EvmVaultTokenService.encodeWithdraw(dstAssetConfig.vault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
@@ -13250,7 +13670,7 @@ var BalnSwapService = class {
    */
   async swapData(balnToken, params) {
     const assetConfig = getHubAssetInfo(ICON_MAINNET_CHAIN_ID, balnToken);
-    invariant10(assetConfig, `hub asset not found for baln token: ${balnToken}`);
+    invariant11(assetConfig, `hub asset not found for baln token: ${balnToken}`);
     const calls = [];
     calls.push(
       Erc20Service.encodeApprove(assetConfig.asset, this.hubProvider.chainConfig.addresses.balnSwap, params.amount)
@@ -15014,9 +15434,9 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async isAllowanceValid(params, spokeProvider) {
     try {
-      invariant10(params.amount > 0n, "Amount must be greater than 0");
-      invariant10(params.token.length > 0, "Token is required");
-      invariant10(
+      invariant11(params.amount > 0n, "Amount must be greater than 0");
+      invariant11(params.token.length > 0, "Token is required");
+      invariant11(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
@@ -15111,19 +15531,19 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async approve(params, spokeProvider, raw) {
     try {
-      invariant10(params.amount > 0n, "Amount must be greater than 0");
-      invariant10(params.token.length > 0, "Token is required");
-      invariant10(
+      invariant11(params.amount > 0n, "Amount must be greater than 0");
+      invariant11(params.token.length > 0, "Token is required");
+      invariant11(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       if (spokeProvider instanceof EvmSpokeProvider) {
-        invariant10(
+        invariant11(
           params.action === "supply" || params.action === "repay",
           "Invalid action (only supply and repay are supported on evm)"
         );
-        invariant10(isAddress(params.token), "Invalid token address");
+        invariant11(isAddress(params.token), "Invalid token address");
         const result = await Erc20Service.approve(
           params.token,
           params.amount,
@@ -15137,11 +15557,11 @@ var MoneyMarketService = class _MoneyMarketService {
         };
       }
       if (spokeProvider instanceof SonicSpokeProvider && spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
-        invariant10(
+        invariant11(
           params.action === "withdraw" || params.action === "borrow" || params.action === "supply" || params.action === "repay",
           "Invalid action (only withdraw, borrow, supply and repay are supported on sonic)"
         );
-        invariant10(isAddress(params.token), "Invalid token address");
+        invariant11(isAddress(params.token), "Invalid token address");
         if (params.action === "withdraw") {
           const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
             params.token,
@@ -15313,10 +15733,10 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async createSupplyIntent(params, spokeProvider, raw) {
     try {
-      invariant10(params.action === "supply", "Invalid action");
-      invariant10(params.token.length > 0, "Token is required");
-      invariant10(params.amount > 0n, "Amount must be greater than 0");
-      invariant10(
+      invariant11(params.action === "supply", "Invalid action");
+      invariant11(params.token.length > 0, "Token is required");
+      invariant11(params.amount > 0n, "Amount must be greater than 0");
+      invariant11(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
@@ -15468,10 +15888,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createBorrowIntent(params, spokeProvider, raw) {
-    invariant10(params.action === "borrow", "Invalid action");
-    invariant10(params.token.length > 0, "Token is required");
-    invariant10(params.amount > 0n, "Amount must be greater than 0");
-    invariant10(
+    invariant11(params.action === "borrow", "Invalid action");
+    invariant11(params.token.length > 0, "Token is required");
+    invariant11(params.amount > 0n, "Amount must be greater than 0");
+    invariant11(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -15603,10 +16023,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createWithdrawIntent(params, spokeProvider, raw) {
-    invariant10(params.action === "withdraw", "Invalid action");
-    invariant10(params.token.length > 0, "Token is required");
-    invariant10(params.amount > 0n, "Amount must be greater than 0");
-    invariant10(
+    invariant11(params.action === "withdraw", "Invalid action");
+    invariant11(params.token.length > 0, "Token is required");
+    invariant11(params.amount > 0n, "Amount must be greater than 0");
+    invariant11(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -15758,10 +16178,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createRepayIntent(params, spokeProvider, raw) {
-    invariant10(params.action === "repay", "Invalid action");
-    invariant10(params.token.length > 0, "Token is required");
-    invariant10(params.amount > 0n, "Amount must be greater than 0");
-    invariant10(
+    invariant11(params.action === "repay", "Invalid action");
+    invariant11(params.token.length > 0, "Token is required");
+    invariant11(params.amount > 0n, "Amount must be greater than 0");
+    invariant11(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -15804,7 +16224,7 @@ var MoneyMarketService = class _MoneyMarketService {
   buildSupplyData(token, to, amount, spokeChainId) {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
-    invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
+    invariant11(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
     let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const lendingPool = this.config.lendingPool;
@@ -15835,13 +16255,13 @@ var MoneyMarketService = class _MoneyMarketService {
    * @returns {Hex} The transaction data.
    */
   buildBorrowData(from, to, token, amount, spokeChainId) {
-    invariant10(isValidSpokeChainId(spokeChainId), `Invalid spokeChainId: ${spokeChainId}`);
-    invariant10(
+    invariant11(isValidSpokeChainId(spokeChainId), `Invalid spokeChainId: ${spokeChainId}`);
+    invariant11(
       isValidOriginalAssetAddress(spokeChainId, token),
       `Unsupported spoke chain (${spokeChainId}) token: ${token}`
     );
     const assetConfig = getHubAssetInfo(spokeChainId, token);
-    invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
+    invariant11(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
     let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;