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

package/dist/index.cjs

@@ -1,22 +1,22 @@
 'use strict';
 
 var viem = require('viem');
-var invariant11 = require('tiny-invariant');
-var bcs = require('@mysten/sui/bcs');
-var web3_js = require('@solana/web3.js');
-var stellarSdk = require('@stellar/stellar-sdk');
 var chains = require('viem/chains');
 var types = require('@sodax/types');
 var sdkTs = require('@injectivelabs/sdk-ts');
 var networks = require('@injectivelabs/networks');
 var IconSdkRaw = require('icon-sdk-js');
+var stellarSdk = require('@stellar/stellar-sdk');
+var bcs = require('@mysten/sui/bcs');
 var client = require('@mysten/sui/client');
 var transactions = require('@mysten/sui/transactions');
+var web3_js = require('@solana/web3.js');
 var coreProtoTs = require('@injectivelabs/core-proto-ts');
 var rlp = require('rlp');
 var splToken = require('@solana/spl-token');
 var anchor = require('@coral-xyz/anchor');
 var BN = require('bn.js');
+var invariant11 = require('tiny-invariant');
 var BigNumber4 = require('bignumber.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -39,11 +39,11 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var invariant11__default = /*#__PURE__*/_interopDefault(invariant11);
 var IconSdkRaw__namespace = /*#__PURE__*/_interopNamespace(IconSdkRaw);
 var rlp__namespace = /*#__PURE__*/_interopNamespace(rlp);
 var anchor__namespace = /*#__PURE__*/_interopNamespace(anchor);
 var BN__default = /*#__PURE__*/_interopDefault(BN);
+var invariant11__default = /*#__PURE__*/_interopDefault(invariant11);
 var BigNumber4__default = /*#__PURE__*/_interopDefault(BigNumber4);
 
 // src/abis/asset-manager.abi.ts
@@ -6132,107 +6132,6 @@ function encodeContractCalls(calls) {
 async function waitForTransactionReceipt(hash, provider) {
   return provider.waitForTransactionReceipt(hash);
 }
-async function retry(action, retryCount = DEFAULT_MAX_RETRY, delayMs = DEFAULT_RETRY_DELAY_MS) {
-  do {
-    try {
-      return await action(retryCount);
-    } catch (e) {
-      retryCount--;
-      if (retryCount <= 0) {
-        console.error(`Failed to perform operation even after ${DEFAULT_MAX_RETRY} attempts.. Throwing origin error..`);
-        throw e;
-      }
-    }
-    await new Promise((resolve) => setTimeout(resolve, delayMs));
-  } while (retryCount > 0);
-  throw new Error(`Retry exceeded MAX_RETRY_DEFAULT=${DEFAULT_MAX_RETRY}`);
-}
-function getRandomBytes(length) {
-  const array = new Uint8Array(length);
-  for (let i = 0; i < length; i++) {
-    array[i] = Math.floor(Math.random() * 256);
-  }
-  return array;
-}
-function randomUint256() {
-  const bytes = getRandomBytes(32);
-  let hex = "";
-  for (const byte of bytes) {
-    hex += byte.toString(16).padStart(2, "0") ?? "";
-  }
-  return BigInt(`0x${hex}`);
-}
-function calculatePercentageFeeAmount(amount, percentage) {
-  return amount * BigInt(percentage) / FEE_PERCENTAGE_SCALE;
-}
-function calculateFeeAmount(inputAmount, fee) {
-  if (!fee) {
-    return 0n;
-  }
-  invariant11__default.default(inputAmount > 0n, "Input amount must be greater than 0");
-  let feeAmount = 0n;
-  if (isPartnerFeeAmount(fee)) {
-    invariant11__default.default(
-      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)) {
-    invariant11__default.default(
-      fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
-      `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
-    );
-    feeAmount = calculatePercentageFeeAmount(inputAmount, fee.percentage);
-  }
-  return feeAmount;
-}
-function adjustAmountByFee(amount, fee, quoteType) {
-  invariant11__default.default(amount > 0n, "Amount must be greater than 0");
-  invariant11__default.default(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
-  if (quoteType === "exact_input") {
-    return amount - calculateFeeAmount(amount, fee);
-  }
-  if (quoteType === "exact_output") {
-    return amount + calculateFeeAmount(amount, fee);
-  }
-  throw new Error("Invalid quote type");
-}
-function BigIntToHex(value) {
-  return `0x${value.toString(16)}`;
-}
-function encodeAddress(spokeChainId, address) {
-  switch (spokeChainId) {
-    case "0xa86a.avax":
-    case "0x2105.base":
-    case "0xa.optimism":
-    case "0x38.bsc":
-    case "0x89.polygon":
-    case "0xa4b1.arbitrum":
-    case "sonic":
-      return address;
-    case "injective-1":
-      return viem.toHex(Buffer.from(address, "utf-8"));
-    case "0x1.icon":
-      return viem.toHex(Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex"));
-    case "sui":
-      return viem.toHex(bcs.bcs.Address.serialize(address).toBytes());
-    case "solana":
-      return viem.toHex(Buffer.from(new web3_js.PublicKey(address).toBytes()));
-    case "stellar":
-      return `0x${stellarSdk.Address.fromString(address).toScVal().toXDR("hex")}`;
-    default:
-      return address;
-  }
-}
-function hexToBigInt(hex) {
-  const trimmed = hex.trim().toLowerCase();
-  const isValid = /^(0x)?[0-9a-f]+$/.test(trimmed);
-  if (!isValid) {
-    throw new Error(`Invalid hex string: "${hex}"`);
-  }
-  const normalized = trimmed.startsWith("0x") ? trimmed : `0x${trimmed}`;
-  return BigInt(normalized);
-}
 var DEFAULT_MAX_RETRY = 3;
 var DEFAULT_RELAY_TX_TIMEOUT = 6e4;
 var DEFAULT_RETRY_DELAY_MS = 2e3;
@@ -6241,6 +6140,7 @@ var MAX_UINT256 = (1n << 256n) - 1n;
 var FEE_PERCENTAGE_SCALE = 10000n;
 var STELLAR_PRIORITY_FEE = "10000";
 var STELLAR_DEFAULT_TX_TIMEOUT_SECONDS = 100;
+var DEFAULT_DEADLINE_OFFSET = 300n;
 var VAULT_TOKEN_DECIMALS = 18;
 var INTENT_RELAY_CHAIN_IDS = {
   AVAX: 6n,
@@ -7937,651 +7837,248 @@ var isNativeToken = (chainId, token) => {
   }
   return token.address.toLowerCase() === spokeChainConfig[chainId].nativeToken.toLowerCase();
 };
-var Erc20Service = class {
-  constructor() {
+var InjectiveSpokeProvider = class {
+  walletProvider;
+  chainConfig;
+  chainGrpcWasmApi;
+  txClient;
+  constructor(conf, walletProvider) {
+    this.chainConfig = conf;
+    this.walletProvider = walletProvider;
+    const endpoints = networks.getNetworkEndpoints(networks.Network.Mainnet);
+    this.chainGrpcWasmApi = new sdkTs.ChainGrpcWasmApi(endpoints.grpc);
+    this.txClient = new sdkTs.TxGrpcApi(endpoints.grpc);
   }
-  /**
-   * Check if spender has enough ERC20 allowance for given amount
-   * @param token - ERC20 token address
-   * @param amount - Amount to check allowance for
-   * @param owner - User wallet address
-   * @param spender - Spender address
-   * @param spokeProvider - EVM Spoke provider
-   * @return - True if spender is allowed to spend amount on behalf of owner
-   */
-  static async isAllowanceValid(token, amount, owner, spender, spokeProvider) {
-    try {
-      if (token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
-        return {
-          ok: true,
-          value: true
-        };
-      }
-      const allowedAmount = await spokeProvider.publicClient.readContract({
-        address: token,
-        abi: viem.erc20Abi,
-        functionName: "allowance",
-        args: [owner, spender]
-      });
-      return {
-        ok: true,
-        value: allowedAmount >= amount
-      };
-    } catch (e) {
-      return {
-        ok: false,
-        error: e
-      };
-    }
+  // Query Methods
+  async getState() {
+    return this.chainGrpcWasmApi.fetchSmartContractState(
+      this.chainConfig.addresses.assetManager,
+      sdkTs.toBase64({
+        get_state: {}
+      })
+    );
   }
-  /**
-   * Approve ERC20 amount spending
-   * @param token - ERC20 token address
-   * @param amount - Amount to approve
-   * @param spender - Spender address
-   * @param provider - EVM Provider
-   */
-  static async approve(token, amount, spender, spokeProvider, raw) {
-    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const rawTx = {
-      from: walletAddress,
-      to: token,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: viem.erc20Abi,
-        functionName: "approve",
-        args: [spender, amount]
+  async getBalance(token) {
+    return this.chainGrpcWasmApi.fetchSmartContractState(
+      this.chainConfig.addresses.assetManager,
+      sdkTs.toBase64({
+        get_balance: { denom: token }
       })
+    );
+  }
+  // Execute Methods (requires SigningCosmWasmClient)
+  /**
+   * Deposit tokens including native token to Injective Asset Manager.
+   **/
+  static async deposit(sender, token_address, to, amount, data = "0x", spokeProvider, raw) {
+    const toBytes = viem.fromHex(to, "bytes");
+    const dataBytes = viem.fromHex(data, "bytes");
+    const msg = {
+      transfer: {
+        token: token_address,
+        to: Array.from(toBytes),
+        amount,
+        data: Array.from(dataBytes)
+      }
     };
+    const funds = [{ amount, denom: token_address }];
     if (raw) {
-      return rawTx;
+      return await spokeProvider.walletProvider.getRawTransaction(
+        spokeProvider.chainConfig.networkId,
+        spokeProvider.chainConfig.prefix,
+        sender,
+        spokeProvider.chainConfig.addresses.assetManager,
+        msg
+      );
     }
-    return spokeProvider.walletProvider.sendTransaction(rawTx);
+    const res = await spokeProvider.walletProvider.execute(
+      sender,
+      spokeProvider.chainConfig.addresses.assetManager,
+      msg,
+      funds
+    );
+    return res.transactionHash;
   }
-  /**
-   * Encodes a transfer transaction for a token.
-   * @param token - The address of the token.
-   * @param to - The address to transfer the token to.
-   * @param amount - The amount of the token to transfer.
-   * @returns The encoded contract call.
-   */
-  static encodeTransfer(token, to, amount) {
-    return {
-      address: token,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: viem.erc20Abi,
-        functionName: "transfer",
-        args: [to, amount]
-      })
+  async receiveMessage(senderAddress, srcChainId, srcAddress, connSn, payload, signatures) {
+    const msg = {
+      recv_message: {
+        src_chain_id: srcChainId,
+        src_address: srcAddress,
+        conn_sn: connSn,
+        payload,
+        signatures
+      }
     };
+    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
   }
-  /**
-   * Encodes a transferFrom transaction for a token.
-   * @param token - The address of the token.
-   * @param from - The address to transfer the token from.
-   * @param to - The address to transfer the token to.
-   * @param amount - The amount of the token to transfer.
-   * @returns The encoded contract call.
-   */
-  static encodeTransferFrom(token, from, to, amount) {
-    return {
-      address: token,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: viem.erc20Abi,
-        functionName: "transferFrom",
-        args: [from, to, amount]
-      })
+  async setRateLimit(senderAddress, rateLimit) {
+    const msg = {
+      set_rate_limit: {
+        rate_limit: rateLimit
+      }
     };
+    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
   }
-  /**
-   * Encodes an approval transaction for a token.
-   * @param token - The address of the token.
-   * @param to - The address to approve the token to.
-   * @param amount - The amount of the token to approve.
-   * @returns The encoded contract call.
-   */
-  static encodeApprove(token, to, amount) {
-    return {
-      address: token,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: viem.erc20Abi,
-        functionName: "approve",
-        args: [to, amount]
-      })
+  async setConnection(senderAddress, connection) {
+    const msg = {
+      set_connection: {
+        connection
+      }
     };
+    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
   }
-};
-var EvmVaultTokenService = class {
-  constructor() {
-  }
-  /**
-   * Fetches token information for a specific token in the vault.
-   * @param vault - The address of the vault.
-   * @param token - The address of the token.
-   * @param publicClient - PublicClient<HttpTransport>
-   * @returns Token information as a TokenInfo object.
-   */
-  static async getTokenInfo(vault, token, publicClient) {
-    const [decimals, depositFee, withdrawalFee, maxDeposit, isSupported] = await publicClient.readContract({
-      address: vault,
-      abi: vaultTokenAbi,
-      functionName: "tokenInfo",
-      args: [token]
-    });
-    return { decimals, depositFee, withdrawalFee, maxDeposit, isSupported };
-  }
-  /**
-   * Retrieves the reserves of the vault.
-   * @param vault - The address of the vault.
-   * @param publicClient - PublicClient<HttpTransport>
-   * @returns An object containing tokens and their balances.
-   */
-  static async getVaultReserves(vault, publicClient) {
-    const [tokens, balances] = await publicClient.readContract({
-      address: vault,
-      abi: vaultTokenAbi,
-      functionName: "getVaultReserves",
-      args: []
-    });
-    return {
-      tokens,
-      balances
+  async setOwner(senderAddress, owner) {
+    const msg = {
+      set_owner: {
+        owner
+      }
     };
+    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
   }
-  /**
-   * Retrieves all token information for the vault.
-   * @param vault - The address of the vault.
-   * @param publicClient - PublicClient<HttpTransport>
-   * @returns A promise that resolves to an object containing tokens, their infos, and reserves.
-   */
-  async getAllTokenInfo(vault, publicClient) {
-    const [tokens, infos, reserves] = await publicClient.readContract({
-      address: vault,
-      abi: vaultTokenAbi,
-      functionName: "getAllTokenInfo",
-      args: []
-    });
-    return {
-      tokens,
-      infos,
-      reserves
+  async send_message(sender, dst_chain_id, dst_address, payload, raw) {
+    const msg = {
+      send_message: {
+        dst_chain_id: Number.parseInt(dst_chain_id),
+        dst_address: Array.from(viem.fromHex(dst_address, "bytes")),
+        payload: Array.from(viem.fromHex(payload, "bytes"))
+      }
     };
+    if (raw) {
+      return await this.walletProvider.getRawTransaction(
+        this.chainConfig.networkId,
+        this.chainConfig.prefix,
+        sender,
+        this.chainConfig.addresses.connection,
+        msg
+      );
+    }
+    const res = await this.walletProvider.execute(sender, this.chainConfig.addresses.connection, msg);
+    return res.transactionHash;
   }
-  /**
-   * Deposits a specified amount of a token into the vault.
-   * @param vault - The address of the vault.
-   * @param token - The address of the token to deposit.
-   * @param amount - The amount of the token to deposit.
-   * @param walletProvider - IEvmWalletProvider
-   * @returns Transaction hash
-   */
-  static async deposit(vault, token, amount, walletProvider) {
-    const from = await walletProvider.getWalletAddress();
-    return walletProvider.sendTransaction({
-      from,
-      to: vault,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: vaultTokenAbi,
-        functionName: "deposit",
-        args: [token, amount]
-      })
-    });
-  }
-  /**
-   * Withdraws a specified amount of a token from the vault.
-   * @param vault - The address of the vault.
-   * @param token - The address of the token to withdraw.
-   * @param amount - The amount of the token to withdraw.
-   * @param provider - EvmWalletProvider
-   * @returns Transaction hash
-   */
-  static async withdraw(vault, token, amount, provider) {
-    const from = await provider.getWalletAddress();
-    return provider.sendTransaction({
-      from,
-      to: vault,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: vaultTokenAbi,
-        functionName: "withdraw",
-        args: [token, amount]
-      })
-    });
-  }
-  /**
-   * Encodes the deposit transaction data for the vault.
-   * @param vault - The address of the vault.
-   * @param token - The address of the token to deposit.
-   * @param amount - The amount of the token to deposit.
-   * @returns The encoded contract call data.
-   */
-  static encodeDeposit(vault, token, amount) {
-    return {
-      address: vault,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: vaultTokenAbi,
-        functionName: "deposit",
-        args: [token, amount]
-      })
-    };
+  // Helper Methods
+  static stringToUint8Array(str) {
+    return new TextEncoder().encode(str);
   }
-  /**
-   * Encodes the withdraw transaction data for the vault.
-   * @param vault - The address of the vault.
-   * @param token - The address of the token to withdraw.
-   * @param amount - The amount of the token to withdraw.
-   * @returns The encoded contract call data.
-   */
-  static encodeWithdraw(vault, token, amount) {
-    return {
-      address: vault,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: vaultTokenAbi,
-        functionName: "withdraw",
-        args: [token, amount]
-      })
-    };
+  static uint8ArrayToString(arr) {
+    return new TextDecoder().decode(arr);
   }
-  /**
-   * Translates token amounts from their native decimals to 18 decimals
-   * @param decimals - The number of decimals of the token
-   * @param amount - The amount to translate
-   * @returns The translated amount
-   */
-  static translateIncomingDecimals(decimals, amount) {
-    if (decimals <= 18) {
-      return amount * BigInt(10 ** (18 - decimals));
-    }
-    return amount / BigInt(10 ** (decimals - 18));
+  static toBigIntString(num) {
+    return num.toString();
   }
-  /**
-   * Translates token amounts from 18 decimals back to their native decimals
-   * @param decimals - The number of decimals of the token
-   * @param amount - The amount to translate
-   * @returns The translated amount
-   */
-  static translateOutgoingDecimals(decimals, amount) {
-    if (decimals <= 18) {
-      return amount / BigInt(10 ** (18 - decimals));
-    }
-    return amount * BigInt(10 ** (decimals - 18));
+};
+var IconSdk = "default" in IconSdkRaw__namespace.default ? IconSdkRaw__namespace.default : IconSdkRaw__namespace;
+var IconSpokeProvider = class {
+  walletProvider;
+  chainConfig;
+  iconService;
+  debugRpcUrl;
+  constructor(walletProvider, chainConfig, rpcUrl = "https://ctz.solidwallet.io/api/v3", debugRpcUrl = "https://ctz.solidwallet.io/api/v3d") {
+    this.walletProvider = walletProvider;
+    this.chainConfig = chainConfig;
+    this.iconService = new IconSdk.IconService(new IconSdk.IconService.HttpProvider(rpcUrl));
+    this.debugRpcUrl = debugRpcUrl;
   }
 };
 
-// src/services/hub/EvmAssetManagerService.ts
-var EvmAssetManagerService = class _EvmAssetManagerService {
-  constructor() {
+// src/entities/icon/utils.ts
+function getIconAddressBytes(address) {
+  return `0x${Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex").toString("hex")}`;
+}
+
+// src/entities/Providers.ts
+var EvmHubProvider = class {
+  publicClient;
+  chainConfig;
+  constructor(config) {
+    if (config) {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http(config.hubRpcUrl),
+        chain: getEvmViemChain(config.chainConfig.chain.id)
+      });
+      this.chainConfig = config.chainConfig;
+    } else {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http("https://rpc.soniclabs.com"),
+        chain: getEvmViemChain(types.SONIC_MAINNET_CHAIN_ID)
+      });
+      this.chainConfig = getHubChainConfig(types.SONIC_MAINNET_CHAIN_ID);
+    }
   }
-  /**
-   * Get asset information for a given asset address
-   * @param asset - The address of the asset contract
-   * @param assetManager - The address of the asset manager contract
-   * @param client - The Viem public client
-   * @returns Object containing chainID and spoke address for the asset
-   */
-  static async getAssetInfo(asset, assetManager, client) {
-    const [chainId, spokeAddress] = await client.readContract({
-      address: assetManager,
-      abi: assetManagerAbi,
-      functionName: "assetInfo",
-      args: [asset]
-    });
-    return {
-      chainId,
-      spokeAddress
-    };
-  }
-  /**
-   * Encodes a transfer transaction for an asset.
-   * @param token - The address of the token.
-   * @param to - The address to transfer the token to.
-   * @param amount - The amount of the token to transfer.
-   * @param assetManager
-   * @returns The encoded contract call.
-   */
-  static encodeTransfer(token, to, amount, assetManager) {
-    return {
-      address: assetManager,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: assetManagerAbi,
-        functionName: "transfer",
-        args: [token, to, amount, "0x"]
-      })
-    };
-  }
-  /**
-   * Constructs the data for depositing tokens to the spoke chain.
-   * @param {EvmDepositToDataParams} params - The address of the token to deposit.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @returns {Hex} Encoded contract calls for the deposit transaction.
-   * @throws Will throw an error if the asset or vault address is not found.
-   */
-  static depositToData(params, spokeChainId) {
-    const calls = [];
-    const assetConfig = getHubAssetInfo(spokeChainId, params.token);
-    if (!assetConfig) {
-      throw new Error("[depositToData] Hub asset not found");
+};
+var SonicSpokeProvider = class {
+  walletProvider;
+  chainConfig;
+  publicClient;
+  constructor(walletProvider, chainConfig, rpcUrl) {
+    this.walletProvider = walletProvider;
+    this.chainConfig = chainConfig;
+    if (rpcUrl) {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http(rpcUrl),
+        chain: getEvmViemChain(chainConfig.chain.id)
+      });
+    } else {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http(getEvmViemChain(chainConfig.chain.id).rpcUrls.default.http[0]),
+        chain: getEvmViemChain(chainConfig.chain.id)
+      });
     }
-    const assetAddress = assetConfig.asset;
-    const vaultAddress = assetConfig.vault;
-    calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, params.amount));
-    calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, params.amount));
-    const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, params.amount);
-    calls.push(Erc20Service.encodeTransfer(vaultAddress, params.to, translatedAmount));
-    return encodeContractCalls(calls);
   }
-  /**
-   * Withdraw tokens from the spoke chain.
-   * @param {EvmWithdrawAssetDataParams} params - Parameters for the withdrawal.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @returns {Hex} Encoded contract calls for the withdrawal transaction.
-   * @throws Will throw an error if the asset address is not found.
-   */
-  static withdrawAssetData(params, hubProvider, spokeChainId) {
-    const calls = [];
-    const assetConfig = getHubAssetInfo(spokeChainId, params.token);
-    if (!assetConfig) {
-      throw new Error("[withdrawAssetData] Hub asset not found");
+};
+var EvmSpokeProvider = class {
+  walletProvider;
+  chainConfig;
+  publicClient;
+  constructor(walletProvider, chainConfig, rpcUrl) {
+    this.walletProvider = walletProvider;
+    this.chainConfig = chainConfig;
+    if (rpcUrl) {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http(rpcUrl),
+        chain: getEvmViemChain(chainConfig.chain.id)
+      });
+    } else {
+      this.publicClient = viem.createPublicClient({
+        transport: viem.http(getEvmViemChain(chainConfig.chain.id).rpcUrls.default.http[0]),
+        chain: getEvmViemChain(chainConfig.chain.id)
+      });
     }
-    const assetAddress = assetConfig.asset;
-    calls.push(
-      _EvmAssetManagerService.encodeTransfer(
-        assetAddress,
-        params.to,
-        params.amount,
-        hubProvider.chainConfig.addresses.assetManager
-      )
-    );
-    return encodeContractCalls(calls);
-  }
-  /**
-   * Get asset address for a given chain ID and spoke address
-   * @param chainId Chain ID where the asset exists
-   * @param spokeAddress Address of the asset on the spoke chain
-   * @param assetManager Address of the asset manager contract
-   * @param client The Viem public client
-   * @returns The asset's address on the hub chain
-   */
-  async getAssetAddress(chainId, spokeAddress, assetManager, client) {
-    return client.readContract({
-      address: assetManager,
-      abi: assetManagerAbi,
-      functionName: "assets",
-      args: [chainId, spokeAddress]
-    });
   }
 };
-
-// src/services/hub/EvmWalletAbstraction.ts
-var EvmWalletAbstraction = class {
-  constructor() {
+var CustomStellarAccount = class {
+  accountId;
+  sequenceNumber;
+  startingSequenceNumber;
+  constructor({ account_id, sequence }) {
+    this.accountId = account_id;
+    this.sequenceNumber = BigInt(sequence);
+    this.startingSequenceNumber = BigInt(sequence);
   }
-  /**
-   * Get the hub wallet address for a given spoke chain and address.
-   * @param chainId - The spoke chain ID.
-   * @param address - The address on the spoke chain.
-   * @param hubProvider - The hub provider.
-   * @returns The hub wallet address.
-   */
-  static async getUserHubWalletAddress(chainId, address, hubProvider) {
-    return hubProvider.publicClient.readContract({
-      address: hubProvider.chainConfig.addresses.hubWallet,
-      abi: walletFactoryAbi,
-      functionName: "getDeployedAddress",
-      args: [BigInt(getIntentRelayChainId(chainId)), address]
-    });
+  getSequenceNumber() {
+    return this.sequenceNumber;
   }
-};
-var InjectiveSpokeProvider = class {
-  walletProvider;
-  chainConfig;
-  chainGrpcWasmApi;
-  txClient;
-  constructor(conf, walletProvider) {
-    this.chainConfig = conf;
-    this.walletProvider = walletProvider;
-    const endpoints = networks.getNetworkEndpoints(networks.Network.Mainnet);
-    this.chainGrpcWasmApi = new sdkTs.ChainGrpcWasmApi(endpoints.grpc);
-    this.txClient = new sdkTs.TxGrpcApi(endpoints.grpc);
+  getStartingSequenceNumber() {
+    return this.startingSequenceNumber;
   }
-  // Query Methods
-  async getState() {
-    return this.chainGrpcWasmApi.fetchSmartContractState(
-      this.chainConfig.addresses.assetManager,
-      sdkTs.toBase64({
-        get_state: {}
-      })
-    );
+  getAccountId() {
+    return this.accountId;
   }
-  async getBalance(token) {
-    return this.chainGrpcWasmApi.fetchSmartContractState(
-      this.chainConfig.addresses.assetManager,
-      sdkTs.toBase64({
-        get_balance: { denom: token }
-      })
-    );
+  getAccountClone() {
+    return new stellarSdk.Account(this.accountId, this.sequenceNumber.toString());
   }
-  // Execute Methods (requires SigningCosmWasmClient)
-  /**
-   * Deposit tokens including native token to Injective Asset Manager.
-   **/
-  static async deposit(sender, token_address, to, amount, data = "0x", spokeProvider, raw) {
-    const toBytes = viem.fromHex(to, "bytes");
-    const dataBytes = viem.fromHex(data, "bytes");
-    const msg = {
-      transfer: {
-        token: token_address,
-        to: Array.from(toBytes),
-        amount,
-        data: Array.from(dataBytes)
-      }
-    };
-    const funds = [{ amount, denom: token_address }];
-    if (raw) {
-      return await spokeProvider.walletProvider.getRawTransaction(
-        spokeProvider.chainConfig.networkId,
-        spokeProvider.chainConfig.prefix,
-        sender,
-        spokeProvider.chainConfig.addresses.assetManager,
-        msg
-      );
+  incrementSequenceNumber() {
+    this.sequenceNumber++;
+  }
+  decrementSequenceNumber() {
+    if (this.sequenceNumber > this.startingSequenceNumber) {
+      this.sequenceNumber--;
     }
-    const res = await spokeProvider.walletProvider.execute(
-      sender,
-      spokeProvider.chainConfig.addresses.assetManager,
-      msg,
-      funds
+    throw new Error(
+      `Sequence number cannot be decremented below the starting sequence number: ${this.startingSequenceNumber}`
     );
-    return res.transactionHash;
-  }
-  async receiveMessage(senderAddress, srcChainId, srcAddress, connSn, payload, signatures) {
-    const msg = {
-      recv_message: {
-        src_chain_id: srcChainId,
-        src_address: srcAddress,
-        conn_sn: connSn,
-        payload,
-        signatures
-      }
-    };
-    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
   }
-  async setRateLimit(senderAddress, rateLimit) {
-    const msg = {
-      set_rate_limit: {
-        rate_limit: rateLimit
-      }
-    };
-    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
-  }
-  async setConnection(senderAddress, connection) {
-    const msg = {
-      set_connection: {
-        connection
-      }
-    };
-    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
-  }
-  async setOwner(senderAddress, owner) {
-    const msg = {
-      set_owner: {
-        owner
-      }
-    };
-    return await this.walletProvider.execute(senderAddress, this.chainConfig.addresses.assetManager, msg);
-  }
-  async send_message(sender, dst_chain_id, dst_address, payload, raw) {
-    const msg = {
-      send_message: {
-        dst_chain_id: Number.parseInt(dst_chain_id),
-        dst_address: Array.from(viem.fromHex(dst_address, "bytes")),
-        payload: Array.from(viem.fromHex(payload, "bytes"))
-      }
-    };
-    if (raw) {
-      return await this.walletProvider.getRawTransaction(
-        this.chainConfig.networkId,
-        this.chainConfig.prefix,
-        sender,
-        this.chainConfig.addresses.connection,
-        msg
-      );
-    }
-    const res = await this.walletProvider.execute(sender, this.chainConfig.addresses.connection, msg);
-    return res.transactionHash;
-  }
-  // Helper Methods
-  static stringToUint8Array(str) {
-    return new TextEncoder().encode(str);
-  }
-  static uint8ArrayToString(arr) {
-    return new TextDecoder().decode(arr);
-  }
-  static toBigIntString(num) {
-    return num.toString();
-  }
-};
-var IconSdk = "default" in IconSdkRaw__namespace.default ? IconSdkRaw__namespace.default : IconSdkRaw__namespace;
-var IconSpokeProvider = class {
-  walletProvider;
-  chainConfig;
-  iconService;
-  debugRpcUrl;
-  constructor(walletProvider, chainConfig, rpcUrl = "https://ctz.solidwallet.io/api/v3", debugRpcUrl = "https://ctz.solidwallet.io/api/v3d") {
-    this.walletProvider = walletProvider;
-    this.chainConfig = chainConfig;
-    this.iconService = new IconSdk.IconService(new IconSdk.IconService.HttpProvider(rpcUrl));
-    this.debugRpcUrl = debugRpcUrl;
-  }
-};
-
-// src/entities/icon/utils.ts
-function getIconAddressBytes(address) {
-  return `0x${Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex").toString("hex")}`;
-}
-
-// src/entities/Providers.ts
-var EvmHubProvider = class {
-  publicClient;
-  chainConfig;
-  constructor(config) {
-    if (config) {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http(config.hubRpcUrl),
-        chain: getEvmViemChain(config.chainConfig.chain.id)
-      });
-      this.chainConfig = config.chainConfig;
-    } else {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http("https://rpc.soniclabs.com"),
-        chain: getEvmViemChain(types.SONIC_MAINNET_CHAIN_ID)
-      });
-      this.chainConfig = getHubChainConfig(types.SONIC_MAINNET_CHAIN_ID);
-    }
-  }
-};
-var SonicSpokeProvider = class {
-  walletProvider;
-  chainConfig;
-  publicClient;
-  constructor(walletProvider, chainConfig, rpcUrl) {
-    this.walletProvider = walletProvider;
-    this.chainConfig = chainConfig;
-    if (rpcUrl) {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http(rpcUrl),
-        chain: getEvmViemChain(chainConfig.chain.id)
-      });
-    } else {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http(getEvmViemChain(chainConfig.chain.id).rpcUrls.default.http[0]),
-        chain: getEvmViemChain(chainConfig.chain.id)
-      });
-    }
-  }
-};
-var EvmSpokeProvider = class {
-  walletProvider;
-  chainConfig;
-  publicClient;
-  constructor(walletProvider, chainConfig, rpcUrl) {
-    this.walletProvider = walletProvider;
-    this.chainConfig = chainConfig;
-    if (rpcUrl) {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http(rpcUrl),
-        chain: getEvmViemChain(chainConfig.chain.id)
-      });
-    } else {
-      this.publicClient = viem.createPublicClient({
-        transport: viem.http(getEvmViemChain(chainConfig.chain.id).rpcUrls.default.http[0]),
-        chain: getEvmViemChain(chainConfig.chain.id)
-      });
-    }
-  }
-};
-var CustomStellarAccount = class {
-  accountId;
-  sequenceNumber;
-  startingSequenceNumber;
-  constructor({ account_id, sequence }) {
-    this.accountId = account_id;
-    this.sequenceNumber = BigInt(sequence);
-    this.startingSequenceNumber = BigInt(sequence);
-  }
-  getSequenceNumber() {
-    return this.sequenceNumber;
-  }
-  getStartingSequenceNumber() {
-    return this.startingSequenceNumber;
-  }
-  getAccountId() {
-    return this.accountId;
-  }
-  getAccountClone() {
-    return new stellarSdk.Account(this.accountId, this.sequenceNumber.toString());
-  }
-  incrementSequenceNumber() {
-    this.sequenceNumber++;
-  }
-  decrementSequenceNumber() {
-    if (this.sequenceNumber > this.startingSequenceNumber) {
-      this.sequenceNumber--;
-    }
-    throw new Error(
-      `Sequence number cannot be decremented below the starting sequence number: ${this.startingSequenceNumber}`
-    );
-  }
-  resetSequenceNumber() {
-    this.sequenceNumber = this.startingSequenceNumber;
+  resetSequenceNumber() {
+    this.sequenceNumber = this.startingSequenceNumber;
   }
 };
 var CustomSorobanServer = class extends stellarSdk.SorobanRpc.Server {
@@ -9178,8 +8675,411 @@ function requestJsonRpc(rawTransaction, id = 99999) {
         }
       })
     );
-  });
-}
+  });
+}
+var Erc20Service = class {
+  constructor() {
+  }
+  /**
+   * Check if spender has enough ERC20 allowance for given amount
+   * @param token - ERC20 token address
+   * @param amount - Amount to check allowance for
+   * @param owner - User wallet address
+   * @param spender - Spender address
+   * @param spokeProvider - EVM Spoke provider
+   * @return - True if spender is allowed to spend amount on behalf of owner
+   */
+  static async isAllowanceValid(token, amount, owner, spender, spokeProvider) {
+    try {
+      if (token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
+        return {
+          ok: true,
+          value: true
+        };
+      }
+      const allowedAmount = await spokeProvider.publicClient.readContract({
+        address: token,
+        abi: viem.erc20Abi,
+        functionName: "allowance",
+        args: [owner, spender]
+      });
+      return {
+        ok: true,
+        value: allowedAmount >= amount
+      };
+    } catch (e) {
+      return {
+        ok: false,
+        error: e
+      };
+    }
+  }
+  /**
+   * Approve ERC20 amount spending
+   * @param token - ERC20 token address
+   * @param amount - Amount to approve
+   * @param spender - Spender address
+   * @param provider - EVM Provider
+   */
+  static async approve(token, amount, spender, spokeProvider, raw) {
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const rawTx = {
+      from: walletAddress,
+      to: token,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: viem.erc20Abi,
+        functionName: "approve",
+        args: [spender, amount]
+      })
+    };
+    if (raw) {
+      return rawTx;
+    }
+    return spokeProvider.walletProvider.sendTransaction(rawTx);
+  }
+  /**
+   * Encodes a transfer transaction for a token.
+   * @param token - The address of the token.
+   * @param to - The address to transfer the token to.
+   * @param amount - The amount of the token to transfer.
+   * @returns The encoded contract call.
+   */
+  static encodeTransfer(token, to, amount) {
+    return {
+      address: token,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: viem.erc20Abi,
+        functionName: "transfer",
+        args: [to, amount]
+      })
+    };
+  }
+  /**
+   * Encodes a transferFrom transaction for a token.
+   * @param token - The address of the token.
+   * @param from - The address to transfer the token from.
+   * @param to - The address to transfer the token to.
+   * @param amount - The amount of the token to transfer.
+   * @returns The encoded contract call.
+   */
+  static encodeTransferFrom(token, from, to, amount) {
+    return {
+      address: token,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: viem.erc20Abi,
+        functionName: "transferFrom",
+        args: [from, to, amount]
+      })
+    };
+  }
+  /**
+   * Encodes an approval transaction for a token.
+   * @param token - The address of the token.
+   * @param to - The address to approve the token to.
+   * @param amount - The amount of the token to approve.
+   * @returns The encoded contract call.
+   */
+  static encodeApprove(token, to, amount) {
+    return {
+      address: token,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: viem.erc20Abi,
+        functionName: "approve",
+        args: [to, amount]
+      })
+    };
+  }
+};
+var EvmVaultTokenService = class {
+  constructor() {
+  }
+  /**
+   * Fetches token information for a specific token in the vault.
+   * @param vault - The address of the vault.
+   * @param token - The address of the token.
+   * @param publicClient - PublicClient<HttpTransport>
+   * @returns Token information as a TokenInfo object.
+   */
+  static async getTokenInfo(vault, token, publicClient) {
+    const [decimals, depositFee, withdrawalFee, maxDeposit, isSupported] = await publicClient.readContract({
+      address: vault,
+      abi: vaultTokenAbi,
+      functionName: "tokenInfo",
+      args: [token]
+    });
+    return { decimals, depositFee, withdrawalFee, maxDeposit, isSupported };
+  }
+  /**
+   * Retrieves the reserves of the vault.
+   * @param vault - The address of the vault.
+   * @param publicClient - PublicClient<HttpTransport>
+   * @returns An object containing tokens and their balances.
+   */
+  static async getVaultReserves(vault, publicClient) {
+    const [tokens, balances] = await publicClient.readContract({
+      address: vault,
+      abi: vaultTokenAbi,
+      functionName: "getVaultReserves",
+      args: []
+    });
+    return {
+      tokens,
+      balances
+    };
+  }
+  /**
+   * Retrieves all token information for the vault.
+   * @param vault - The address of the vault.
+   * @param publicClient - PublicClient<HttpTransport>
+   * @returns A promise that resolves to an object containing tokens, their infos, and reserves.
+   */
+  async getAllTokenInfo(vault, publicClient) {
+    const [tokens, infos, reserves] = await publicClient.readContract({
+      address: vault,
+      abi: vaultTokenAbi,
+      functionName: "getAllTokenInfo",
+      args: []
+    });
+    return {
+      tokens,
+      infos,
+      reserves
+    };
+  }
+  /**
+   * Deposits a specified amount of a token into the vault.
+   * @param vault - The address of the vault.
+   * @param token - The address of the token to deposit.
+   * @param amount - The amount of the token to deposit.
+   * @param walletProvider - IEvmWalletProvider
+   * @returns Transaction hash
+   */
+  static async deposit(vault, token, amount, walletProvider) {
+    const from = await walletProvider.getWalletAddress();
+    return walletProvider.sendTransaction({
+      from,
+      to: vault,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: vaultTokenAbi,
+        functionName: "deposit",
+        args: [token, amount]
+      })
+    });
+  }
+  /**
+   * Withdraws a specified amount of a token from the vault.
+   * @param vault - The address of the vault.
+   * @param token - The address of the token to withdraw.
+   * @param amount - The amount of the token to withdraw.
+   * @param provider - EvmWalletProvider
+   * @returns Transaction hash
+   */
+  static async withdraw(vault, token, amount, provider) {
+    const from = await provider.getWalletAddress();
+    return provider.sendTransaction({
+      from,
+      to: vault,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: vaultTokenAbi,
+        functionName: "withdraw",
+        args: [token, amount]
+      })
+    });
+  }
+  /**
+   * Encodes the deposit transaction data for the vault.
+   * @param vault - The address of the vault.
+   * @param token - The address of the token to deposit.
+   * @param amount - The amount of the token to deposit.
+   * @returns The encoded contract call data.
+   */
+  static encodeDeposit(vault, token, amount) {
+    return {
+      address: vault,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: vaultTokenAbi,
+        functionName: "deposit",
+        args: [token, amount]
+      })
+    };
+  }
+  /**
+   * Encodes the withdraw transaction data for the vault.
+   * @param vault - The address of the vault.
+   * @param token - The address of the token to withdraw.
+   * @param amount - The amount of the token to withdraw.
+   * @returns The encoded contract call data.
+   */
+  static encodeWithdraw(vault, token, amount) {
+    return {
+      address: vault,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: vaultTokenAbi,
+        functionName: "withdraw",
+        args: [token, amount]
+      })
+    };
+  }
+  /**
+   * Translates token amounts from their native decimals to 18 decimals
+   * @param decimals - The number of decimals of the token
+   * @param amount - The amount to translate
+   * @returns The translated amount
+   */
+  static translateIncomingDecimals(decimals, amount) {
+    if (decimals <= 18) {
+      return amount * BigInt(10 ** (18 - decimals));
+    }
+    return amount / BigInt(10 ** (decimals - 18));
+  }
+  /**
+   * Translates token amounts from 18 decimals back to their native decimals
+   * @param decimals - The number of decimals of the token
+   * @param amount - The amount to translate
+   * @returns The translated amount
+   */
+  static translateOutgoingDecimals(decimals, amount) {
+    if (decimals <= 18) {
+      return amount / BigInt(10 ** (18 - decimals));
+    }
+    return amount * BigInt(10 ** (decimals - 18));
+  }
+};
+
+// src/services/hub/EvmAssetManagerService.ts
+var EvmAssetManagerService = class _EvmAssetManagerService {
+  constructor() {
+  }
+  /**
+   * Get asset information for a given asset address
+   * @param asset - The address of the asset contract
+   * @param assetManager - The address of the asset manager contract
+   * @param client - The Viem public client
+   * @returns Object containing chainID and spoke address for the asset
+   */
+  static async getAssetInfo(asset, assetManager, client) {
+    const [chainId, spokeAddress] = await client.readContract({
+      address: assetManager,
+      abi: assetManagerAbi,
+      functionName: "assetInfo",
+      args: [asset]
+    });
+    return {
+      chainId,
+      spokeAddress
+    };
+  }
+  /**
+   * Encodes a transfer transaction for an asset.
+   * @param token - The address of the token.
+   * @param to - The address to transfer the token to.
+   * @param amount - The amount of the token to transfer.
+   * @param assetManager
+   * @returns The encoded contract call.
+   */
+  static encodeTransfer(token, to, amount, assetManager) {
+    return {
+      address: assetManager,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: assetManagerAbi,
+        functionName: "transfer",
+        args: [token, to, amount, "0x"]
+      })
+    };
+  }
+  /**
+   * Constructs the data for depositing tokens to the spoke chain.
+   * @param {EvmDepositToDataParams} params - The address of the token to deposit.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @returns {Hex} Encoded contract calls for the deposit transaction.
+   * @throws Will throw an error if the asset or vault address is not found.
+   */
+  static depositToData(params, spokeChainId) {
+    const calls = [];
+    const assetConfig = getHubAssetInfo(spokeChainId, params.token);
+    if (!assetConfig) {
+      throw new Error("[depositToData] Hub asset not found");
+    }
+    const assetAddress = assetConfig.asset;
+    const vaultAddress = assetConfig.vault;
+    calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, params.amount));
+    calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, params.amount));
+    const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, params.amount);
+    calls.push(Erc20Service.encodeTransfer(vaultAddress, params.to, translatedAmount));
+    return encodeContractCalls(calls);
+  }
+  /**
+   * Withdraw tokens from the spoke chain.
+   * @param {EvmWithdrawAssetDataParams} params - Parameters for the withdrawal.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {Hex} Encoded contract calls for the withdrawal transaction.
+   * @throws Will throw an error if the asset address is not found.
+   */
+  static withdrawAssetData(params, hubProvider, spokeChainId) {
+    const calls = [];
+    const assetConfig = getHubAssetInfo(spokeChainId, params.token);
+    if (!assetConfig) {
+      throw new Error("[withdrawAssetData] Hub asset not found");
+    }
+    const assetAddress = assetConfig.asset;
+    calls.push(
+      _EvmAssetManagerService.encodeTransfer(
+        assetAddress,
+        params.to,
+        params.amount,
+        hubProvider.chainConfig.addresses.assetManager
+      )
+    );
+    return encodeContractCalls(calls);
+  }
+  /**
+   * Get asset address for a given chain ID and spoke address
+   * @param chainId Chain ID where the asset exists
+   * @param spokeAddress Address of the asset on the spoke chain
+   * @param assetManager Address of the asset manager contract
+   * @param client The Viem public client
+   * @returns The asset's address on the hub chain
+   */
+  async getAssetAddress(chainId, spokeAddress, assetManager, client) {
+    return client.readContract({
+      address: assetManager,
+      abi: assetManagerAbi,
+      functionName: "assets",
+      args: [chainId, spokeAddress]
+    });
+  }
+};
+
+// src/services/hub/EvmWalletAbstraction.ts
+var EvmWalletAbstraction = class {
+  constructor() {
+  }
+  /**
+   * Get the hub wallet address for a given spoke chain and address.
+   * @param chainId - The spoke chain ID.
+   * @param address - The address on the spoke chain.
+   * @param hubProvider - The hub provider.
+   * @returns The hub wallet address.
+   */
+  static async getUserHubWalletAddress(chainId, address, hubProvider) {
+    return hubProvider.publicClient.readContract({
+      address: hubProvider.chainConfig.addresses.hubWallet,
+      abi: walletFactoryAbi,
+      functionName: "getDeployedAddress",
+      args: [BigInt(getIntentRelayChainId(chainId)), address]
+    });
+  }
+};
 var EvmSpokeService = class _EvmSpokeService {
   constructor() {
   }
@@ -9576,9 +9476,10 @@ var IconSpokeService = class _IconSpokeService {
       getIconAddressBytes(params.from),
       hubProvider
     );
+    const token = isNativeToken(spokeProvider.chainConfig.chain.id, params.token) ? spokeProvider.chainConfig.addresses.wICX : params.token;
     return {
       spokeChainID: spokeProvider.chainConfig.chain.id,
-      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      token: encodeAddress(spokeProvider.chainConfig.chain.id, token),
       from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
       to,
       amount: params.amount,
@@ -9999,7 +9900,7 @@ var StellarSpokeService = class _StellarSpokeService {
     return {
       spokeChainID: spokeProvider.chainConfig.chain.id,
       token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
-      from: params.from,
+      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
       to,
       amount: params.amount,
       data: params.data,
@@ -10211,6 +10112,7 @@ var SonicSpokeService = class _SonicSpokeService {
    * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash
    */
   static async deposit(params, spokeProvider, raw) {
+    invariant11__default.default(spokeProvider instanceof SonicSpokeProvider, "[SonicSpokeService] invalid spoke provider");
     const userHubAddress = params.to ?? await _SonicSpokeService.getUserRouter(params.from, spokeProvider);
     const calls = Array.from(
       viem.decodeAbiParameters(
@@ -10265,7 +10167,7 @@ var SonicSpokeService = class _SonicSpokeService {
       value: params.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? params.amount : 0n
     };
     if (raw) {
-      return rawTx;
+      return Promise.resolve(rawTx);
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
@@ -10342,6 +10244,7 @@ var SonicSpokeService = class _SonicSpokeService {
    * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash
    */
   static async callWallet(payload, spokeProvider, raw) {
+    invariant11__default.default(spokeProvider instanceof SonicSpokeProvider, "[SonicSpokeService] invalid spoke provider");
     const calls = viem.decodeAbiParameters(
       [
         {
@@ -10376,7 +10279,7 @@ var SonicSpokeService = class _SonicSpokeService {
     if (raw) {
       return rawTx;
     }
-    return spokeProvider.walletProvider.sendTransaction(rawTx);
+    return await spokeProvider.walletProvider.sendTransaction(rawTx);
   }
   /**
    * Get withdraw information for a given token
@@ -10981,7 +10884,11 @@ var SpokeService = class _SpokeService {
    */
   static async callWallet(from, payload, spokeProvider, hubProvider, raw, skipSimulation = false) {
     if (isSonicSpokeProvider(spokeProvider)) {
-      return await SonicSpokeService.callWallet(payload, spokeProvider, raw);
+      return await SonicSpokeService.callWallet(
+        payload,
+        spokeProvider,
+        raw
+      );
     }
     if (isEvmSpokeProvider(spokeProvider)) {
       await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
@@ -12113,7 +12020,7 @@ var SolverService = class {
         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 creatorHubWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
       if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
         const [txResult, intent, feeAmount, data] = await SonicSpokeService.createSwapIntent(
           params,
@@ -12186,7 +12093,7 @@ var SolverService = class {
       invariant11__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
       invariant11__default.default(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 creatorHubWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
       const calls = [];
       const intentsContract = this.config.intentsContract;
       calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
@@ -12225,6 +12132,19 @@ var SolverService = class {
   getIntentHash(intent) {
     return EvmSolverService.getIntentHash(intent);
   }
+  /**
+   * Gets the deadline for a swap by querying hub chain block timestamp and adding the deadline offset
+   * @param {bigint} deadline (default: 5 minutes) - The deadline offset in seconds for the swap to be cancelled
+   * @returns {bigint} The deadline for the swap as a sum of hub chain block timestamp and deadline offset
+   */
+  async getSwapDeadline(deadline = DEFAULT_DEADLINE_OFFSET) {
+    invariant11__default.default(deadline > 0n, "Deadline must be greater than 0");
+    const block = await this.hubProvider.publicClient.getBlock({
+      includeTransactions: false,
+      blockTag: "latest"
+    });
+    return block.timestamp + deadline;
+  }
 };
 
 // src/abis/icxSwap.abi.ts
@@ -13902,8 +13822,6 @@ var Sodax = class {
 
 // src/services/hub/WalletAbstractionService.ts
 var WalletAbstractionService = class {
-  constructor() {
-  }
   /**
    * Gets the hub wallet address for a user based on their spoke chain address.
    * @param address - The user's address on the spoke chain
@@ -13911,14 +13829,14 @@ var WalletAbstractionService = class {
    * @param hubProvider - The provider for interacting with the hub chain
    * @returns The user's hub wallet address
    */
-  static async getUserHubWalletAddress(address, spokeProvider, hubProvider) {
+  static async getUserAbstractedWalletAddress(address, spokeProvider, hubProvider) {
     const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, address);
     if (spokeProvider.chainConfig.chain.id === hubProvider.chainConfig.chain.id) {
       if (spokeProvider instanceof SonicSpokeProvider) {
         return SonicSpokeService.getUserRouter(encodedAddress, spokeProvider);
       }
       throw new Error(
-        "[WalletAbstractionService.getUserHubWalletAddress] Invalid spoke provider. Sonic spoke provider is required."
+        "[getUserHubWalletAddress] Invalid spoke provider for matching hub id. Sonic spoke provider is required."
       );
     }
     return EvmWalletAbstraction.getUserHubWalletAddress(
@@ -13928,6 +13846,111 @@ var WalletAbstractionService = class {
     );
   }
 };
+async function retry(action, retryCount = DEFAULT_MAX_RETRY, delayMs = DEFAULT_RETRY_DELAY_MS) {
+  do {
+    try {
+      return await action(retryCount);
+    } catch (e) {
+      retryCount--;
+      if (retryCount <= 0) {
+        console.error(`Failed to perform operation even after ${DEFAULT_MAX_RETRY} attempts.. Throwing origin error..`);
+        throw e;
+      }
+    }
+    await new Promise((resolve) => setTimeout(resolve, delayMs));
+  } while (retryCount > 0);
+  throw new Error(`Retry exceeded MAX_RETRY_DEFAULT=${DEFAULT_MAX_RETRY}`);
+}
+function getRandomBytes(length) {
+  const array = new Uint8Array(length);
+  for (let i = 0; i < length; i++) {
+    array[i] = Math.floor(Math.random() * 256);
+  }
+  return array;
+}
+function randomUint256() {
+  const bytes = getRandomBytes(32);
+  let hex = "";
+  for (const byte of bytes) {
+    hex += byte.toString(16).padStart(2, "0") ?? "";
+  }
+  return BigInt(`0x${hex}`);
+}
+function calculatePercentageFeeAmount(amount, percentage) {
+  return amount * BigInt(percentage) / FEE_PERCENTAGE_SCALE;
+}
+function calculateFeeAmount(inputAmount, fee) {
+  if (!fee) {
+    return 0n;
+  }
+  invariant11__default.default(inputAmount > 0n, "Input amount must be greater than 0");
+  let feeAmount = 0n;
+  if (isPartnerFeeAmount(fee)) {
+    invariant11__default.default(
+      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)) {
+    invariant11__default.default(
+      fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
+      `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
+    );
+    feeAmount = calculatePercentageFeeAmount(inputAmount, fee.percentage);
+  }
+  return feeAmount;
+}
+function adjustAmountByFee(amount, fee, quoteType) {
+  invariant11__default.default(amount > 0n, "Amount must be greater than 0");
+  invariant11__default.default(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
+  if (quoteType === "exact_input") {
+    return amount - calculateFeeAmount(amount, fee);
+  }
+  if (quoteType === "exact_output") {
+    return amount + calculateFeeAmount(amount, fee);
+  }
+  throw new Error("Invalid quote type");
+}
+function BigIntToHex(value) {
+  return `0x${value.toString(16)}`;
+}
+function encodeAddress(spokeChainId, address) {
+  switch (spokeChainId) {
+    case "0xa86a.avax":
+    case "0x2105.base":
+    case "0xa.optimism":
+    case "0x38.bsc":
+    case "0x89.polygon":
+    case "0xa4b1.arbitrum":
+    case "sonic":
+      return address;
+    case "injective-1":
+      return viem.toHex(Buffer.from(address, "utf-8"));
+    case "0x1.icon":
+      return viem.toHex(Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex"));
+    case "sui":
+      return viem.toHex(bcs.bcs.Address.serialize(address).toBytes());
+    case "solana":
+      return viem.toHex(Buffer.from(new web3_js.PublicKey(address).toBytes()));
+    case "stellar":
+      return `0x${stellarSdk.Address.fromString(address).toScVal().toXDR("hex")}`;
+    default:
+      return address;
+  }
+}
+function hexToBigInt(hex) {
+  const trimmed = hex.trim().toLowerCase();
+  const isValid = /^(0x)?[0-9a-f]+$/.test(trimmed);
+  if (!isValid) {
+    throw new Error(`Invalid hex string: "${hex}"`);
+  }
+  const normalized = trimmed.startsWith("0x") ? trimmed : `0x${trimmed}`;
+  return BigInt(normalized);
+}
+async function deriveUserWalletAddress(spokeProvider, hubProvider, walletAddress) {
+  const address = walletAddress ?? await spokeProvider.walletProvider.getWalletAddress();
+  return spokeProvider.chainConfig.chain.id === hubProvider.chainConfig.chain.id ? address : await WalletAbstractionService.getUserAbstractedWalletAddress(address, spokeProvider, hubProvider);
+}
 var BigNumberZeroDecimal = BigNumber4.BigNumber.clone({
   DECIMAL_PLACES: 0,
   ROUNDING_MODE: BigNumber4.BigNumber.ROUND_DOWN
@@ -15288,11 +15311,7 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesData(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
-      walletAddress,
-      spokeProvider,
-      this.hubProvider
-    );
+    const hubWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
     return this.uiPoolDataProviderService.getUserReservesData(hubWalletAddress);
   }
   /**
@@ -15323,11 +15342,7 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesHumanized(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
-      walletAddress,
-      spokeProvider,
-      this.hubProvider
-    );
+    const hubWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
     return this.uiPoolDataProviderService.getUserReservesHumanized(hubWalletAddress);
   }
   /**
@@ -15769,34 +15784,44 @@ var MoneyMarketService = class _MoneyMarketService {
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-        walletAddress,
-        spokeProvider,
-        this.hubProvider
-      );
+      const abstractedWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
       const data = this.buildSupplyData(
         params.token,
-        hubWallet,
+        abstractedWalletAddress,
         params.amount,
         spokeProvider.chainConfig.chain.id
       );
-      const txResult = await SpokeService.deposit(
-        {
-          from: walletAddress,
-          to: hubWallet,
-          token: params.token,
-          amount: params.amount,
-          data
-        },
-        spokeProvider,
-        this.hubProvider,
-        raw
-      );
+      let txResult;
+      if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id && spokeProvider instanceof SonicSpokeProvider) {
+        txResult = await SonicSpokeService.deposit(
+          {
+            from: walletAddress,
+            token: params.token,
+            amount: params.amount,
+            data
+          },
+          spokeProvider,
+          raw
+        );
+      } else {
+        txResult = await SpokeService.deposit(
+          {
+            from: walletAddress,
+            to: abstractedWalletAddress,
+            token: params.token,
+            amount: params.amount,
+            data
+          },
+          spokeProvider,
+          this.hubProvider,
+          raw
+        );
+      }
       return {
         ok: true,
         value: txResult,
         data: {
-          address: hubWallet,
+          address: abstractedWalletAddress,
           payload: data
         }
       };
@@ -15925,11 +15950,7 @@ var MoneyMarketService = class _MoneyMarketService {
     );
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
-    const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      walletAddress,
-      spokeProvider,
-      this.hubProvider
-    );
+    const hubWallet = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
     const data = this.buildBorrowData(
       hubWallet,
       encodedAddress,
@@ -15937,7 +15958,12 @@ var MoneyMarketService = class _MoneyMarketService {
       params.amount,
       spokeProvider.chainConfig.chain.id
     );
-    const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
+    let txResult;
+    if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
+      txResult = await SonicSpokeService.callWallet(data, spokeProvider);
+    } else {
+      txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
+    }
     return {
       ok: true,
       value: txResult,
@@ -16060,11 +16086,7 @@ var MoneyMarketService = class _MoneyMarketService {
     );
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
-    const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      walletAddress,
-      spokeProvider,
-      this.hubProvider
-    );
+    const hubWallet = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
     let data;
     if (spokeProvider instanceof SonicSpokeProvider) {
       const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
@@ -16090,7 +16112,7 @@ var MoneyMarketService = class _MoneyMarketService {
         spokeProvider.chainConfig.chain.id
       );
     }
-    const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
+    const txResult = spokeProvider instanceof SonicSpokeProvider ? await SonicSpokeService.callWallet(data, spokeProvider, raw) : await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
     return {
       ok: true,
       value: txResult,
@@ -16214,24 +16236,34 @@ var MoneyMarketService = class _MoneyMarketService {
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      walletAddress,
-      spokeProvider,
-      this.hubProvider
-    );
+    const hubWallet = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
     const data = this.buildRepayData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
-    const txResult = await SpokeService.deposit(
-      {
-        from: walletAddress,
-        to: hubWallet,
-        token: params.token,
-        amount: params.amount,
-        data
-      },
-      spokeProvider,
-      this.hubProvider,
-      raw
-    );
+    let txResult;
+    if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id && spokeProvider instanceof SonicSpokeProvider) {
+      txResult = await SonicSpokeService.deposit(
+        {
+          from: walletAddress,
+          token: params.token,
+          amount: params.amount,
+          data
+        },
+        spokeProvider,
+        raw
+      );
+    } else {
+      txResult = await SpokeService.deposit(
+        {
+          from: walletAddress,
+          to: hubWallet,
+          token: params.token,
+          amount: params.amount,
+          data
+        },
+        spokeProvider,
+        this.hubProvider,
+        raw
+      );
+    }
     return {
       ok: true,
       value: txResult,
@@ -16618,6 +16650,7 @@ exports.BigIntToHex = BigIntToHex;
 exports.BigNumberZeroDecimal = BigNumberZeroDecimal;
 exports.BnUSDMigrationService = BnUSDMigrationService;
 exports.ChainIdToIntentRelayChainId = ChainIdToIntentRelayChainId;
+exports.DEFAULT_DEADLINE_OFFSET = DEFAULT_DEADLINE_OFFSET;
 exports.DEFAULT_MAX_RETRY = DEFAULT_MAX_RETRY;
 exports.DEFAULT_RELAYER_API_ENDPOINT = DEFAULT_RELAYER_API_ENDPOINT;
 exports.DEFAULT_RELAY_TX_TIMEOUT = DEFAULT_RELAY_TX_TIMEOUT;
@@ -16694,6 +16727,7 @@ exports.calculateLinearInterest = calculateLinearInterest;
 exports.calculatePercentageFeeAmount = calculatePercentageFeeAmount;
 exports.chainIdToHubAssetsMap = chainIdToHubAssetsMap;
 exports.connectionAbi = connectionAbi;
+exports.deriveUserWalletAddress = deriveUserWalletAddress;
 exports.encodeAddress = encodeAddress;
 exports.encodeContractCalls = encodeContractCalls;
 exports.erc20Abi = erc20Abi;