@sodax/sdk 0.0.1-rc.23 → 0.0.1-rc.25

package/dist/index.mjs

@@ -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: "",
@@ -7162,7 +7164,7 @@ var getAllLegacybnUSDTokens = () => {
 var hubAssets = {
   [SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[SONIC_MAINNET_CHAIN_ID].nativeToken]: {
-      asset: spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
+      asset: spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.S.address,
       decimal: 18,
       symbol: "S",
       name: "Sonic",
@@ -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.
@@ -10044,7 +10200,7 @@ var SonicSpokeService = class _SonicSpokeService {
         params.data
       )[0]
     );
-    if (params.token === spokeProvider.chainConfig.nativeToken) {
+    if (params.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
       const wrapCall = {
         address: spokeProvider.chainConfig.addresses.wrappedSonic,
         value: params.amount,
@@ -10078,7 +10234,7 @@ var SonicSpokeService = class _SonicSpokeService {
       from: params.from,
       to: spokeProvider.chainConfig.addresses.walletRouter,
       data: txData,
-      value: params.token === spokeProvider.chainConfig.nativeToken ? params.amount : 0n
+      value: params.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? params.amount : 0n
     };
     if (raw) {
       return rawTx;
@@ -10293,12 +10449,16 @@ var SonicSpokeService = class _SonicSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
-  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService) {
-    const userRouter = await _SonicSpokeService.getUserRouter(from, spokeProvider);
+  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService, userRouterAddress) {
+    const userRouter = userRouterAddress ?? await _SonicSpokeService.getUserRouter(from, spokeProvider);
+    let token = withdrawInfo.token;
+    if (withdrawInfo.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
+      token = spokeProvider.chainConfig.addresses.wrappedSonic;
+    }
     const withdrawCall = moneyMarketService.buildWithdrawData(
       userRouter,
       from,
-      withdrawInfo.token,
+      token,
       amount,
       spokeProvider.chainConfig.chain.id
     );
@@ -10316,17 +10476,6 @@ var SonicSpokeService = class _SonicSpokeService {
       ],
       withdrawCall
     )[0];
-    const transferFromCall = Erc20Service.encodeTransferFrom(
-      withdrawInfo.aTokenAddress,
-      from,
-      userRouter,
-      withdrawInfo.aTokenAmount
-    );
-    calls.unshift({
-      address: transferFromCall.address,
-      value: transferFromCall.value,
-      data: transferFromCall.data
-    });
     return encodeContractCalls(calls);
   }
 };
@@ -10453,9 +10602,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() {
   }
   /**
@@ -10509,14 +10656,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,
@@ -10525,6 +10757,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof EvmSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return EvmSpokeService.deposit(
         params,
         spokeProvider,
@@ -10533,14 +10766,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,
@@ -10549,6 +10779,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof SuiSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return SuiSpokeService.deposit(
         params,
         spokeProvider,
@@ -10557,6 +10788,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof SolanaSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return SolanaSpokeService.deposit(
         params,
         spokeProvider,
@@ -10565,6 +10797,7 @@ var SpokeService = class {
       );
     }
     if (spokeProvider instanceof StellarSpokeProvider) {
+      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return StellarSpokeService.deposit(
         params,
         spokeProvider,
@@ -10574,6 +10807,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.
@@ -10612,14 +10899,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,
@@ -10629,12 +10918,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,
@@ -10644,10 +10936,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(
@@ -10799,8 +11108,11 @@ 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(
       inputToken,
@@ -11352,13 +11664,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
     });
   }
   /**
@@ -11407,14 +11721,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;
@@ -11702,7 +12018,8 @@ var SolverService = class {
         },
         creatorHubWalletAddress,
         this.config,
-        fee
+        fee,
+        this.hubProvider
       );
       const txResult = await SpokeService.deposit(
         {
@@ -13832,7 +14149,7 @@ function calculateAllUserIncentives({
       (reserve2) => reserve2.underlyingAsset === userIncentive.underlyingAsset
     );
     const userReserve = userReserves.find(
-      (userReserve2) => userReserve2.reserve.underlyingAsset === userIncentive.underlyingAsset
+      (userReserve2) => userReserve2.reserve.underlyingAsset.toLowerCase() === userIncentive.underlyingAsset.toLowerCase()
     );
     if (reserve) {
       const reserveRewards = calculateUserReserveIncentives({
@@ -14847,7 +15164,11 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesData(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
+    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
+    );
     return this.uiPoolDataProviderService.getUserReservesData(hubWalletAddress);
   }
   /**
@@ -14878,7 +15199,11 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesHumanized(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
+    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
+    );
     return this.uiPoolDataProviderService.getUserReservesHumanized(hubWalletAddress);
   }
   /**
@@ -15616,13 +15941,31 @@ var MoneyMarketService = class _MoneyMarketService {
       spokeProvider,
       this.hubProvider
     );
-    const data = this.buildWithdrawData(
-      hubWallet,
-      encodedAddress,
-      params.token,
-      params.amount,
-      spokeProvider.chainConfig.chain.id
-    );
+    let data;
+    if (spokeProvider instanceof SonicSpokeProvider) {
+      const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
+        params.token,
+        params.amount,
+        spokeProvider,
+        this.data
+      );
+      data = await SonicSpokeService.buildWithdrawData(
+        walletAddress,
+        withdrawInfo,
+        params.amount,
+        spokeProvider,
+        this,
+        hubWallet
+      );
+    } else {
+      data = this.buildWithdrawData(
+        hubWallet,
+        encodedAddress,
+        params.token,
+        params.amount,
+        spokeProvider.chainConfig.chain.id
+      );
+    }
     const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
     return {
       ok: true,
@@ -15786,9 +16129,14 @@ var MoneyMarketService = class _MoneyMarketService {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const lendingPool = this.config.lendingPool;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
     calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, amount);
@@ -15818,10 +16166,15 @@ var MoneyMarketService = class _MoneyMarketService {
     );
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     const feeAmount = calculateFeeAmount(amount, this.config.partnerFee);
     const calls = [];
     if (bnUSDVault && bnUSD && bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
@@ -15942,10 +16295,15 @@ var MoneyMarketService = class _MoneyMarketService {
     if (!assetConfig) {
       throw new Error("[buildRepayData] Hub asset not found");
     }
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
     calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, amount);