@sodax/sdk 0.0.1-rc.30 → 0.0.1-rc.32

package/dist/index.cjs

@@ -16,7 +16,7 @@ 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 invariant12 = require('tiny-invariant');
 var BigNumber4 = require('bignumber.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -43,7 +43,7 @@ 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 invariant12__default = /*#__PURE__*/_interopDefault(invariant12);
 var BigNumber4__default = /*#__PURE__*/_interopDefault(BigNumber4);
 
 // src/abis/asset-manager.abi.ts
@@ -6133,7 +6133,7 @@ async function waitForTransactionReceipt(hash, provider) {
   return provider.waitForTransactionReceipt(hash);
 }
 var DEFAULT_MAX_RETRY = 3;
-var DEFAULT_RELAY_TX_TIMEOUT = 6e4;
+var DEFAULT_RELAY_TX_TIMEOUT = 12e4;
 var DEFAULT_RETRY_DELAY_MS = 2e3;
 var ICON_TX_RESULT_WAIT_MAX_RETRY = 10;
 var MAX_UINT256 = (1n << 256n) - 1n;
@@ -6215,6 +6215,155 @@ function getEvmViemChain(id) {
       throw new Error(`Unsupported EVM chain ID: ${id}`);
   }
 }
+var HubVaultSymbols = [
+  "sodaAVAX",
+  "sodaBNB",
+  "sodaETH",
+  "sodaBTC",
+  "sodaSUI",
+  "sodaINJ",
+  "sodaXLM",
+  "sodaSOL",
+  "sodaSODA",
+  "sodaUSDT",
+  "sodaUSDC",
+  "bnUSD",
+  "sodaPOL",
+  "sodaNIBI",
+  "sodaS",
+  "IbnUSD"
+];
+var SodaTokens = {
+  sodaBNB: {
+    symbol: "sodaBNB",
+    name: "Soda BNB",
+    decimals: 18,
+    address: "0x40Cd41b35DB9e5109ae7E54b44De8625dB320E6b",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaAVAX: {
+    symbol: "sodaAVAX",
+    name: "Soda AVAX",
+    decimals: 18,
+    address: "0x14238D267557E9d799016ad635B53CD15935d290",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaETH: {
+    symbol: "sodaETH",
+    name: "Soda ETH",
+    decimals: 18,
+    address: "0x4effB5813271699683C25c734F4daBc45B363709",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaBTC: {
+    symbol: "sodaBTC",
+    name: "Soda BTC",
+    decimals: 18,
+    address: "0x7A1A5555842Ad2D0eD274d09b5c4406a95799D5d",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaSOL: {
+    symbol: "sodaSOL",
+    name: "Soda SOL",
+    decimals: 18,
+    address: "0xdEa692287E2cE8Cb08FA52917Be0F16b1DACDC87",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaXLM: {
+    symbol: "sodaXLM",
+    name: "Soda XLM",
+    decimals: 18,
+    address: "0x6BC8C37cba91F76E68C9e6d689A9C21E4d32079B",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaINJ: {
+    symbol: "sodaINJ",
+    name: "Soda INJ",
+    decimals: 18,
+    address: "0x1f22279C89B213944b7Ea41daCB0a868DdCDFd13",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaNIBI: {
+    symbol: "sodaNIBI",
+    name: "Soda NIBI",
+    decimals: 18,
+    address: "0xc6c85287a8b173A509C2F198bB719A8a5a2d0C68",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaSUI: {
+    symbol: "sodaSUI",
+    name: "Soda SUI",
+    decimals: 18,
+    address: "0xdc5B4b00F98347E95b9F94911213DAB4C687e1e3",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  bnUSD: {
+    symbol: "bnUSD",
+    name: "Balanced Dollar",
+    decimals: 18,
+    address: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaUSDC: {
+    symbol: "sodaUSDC",
+    name: "Soda USDC",
+    decimals: 18,
+    address: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaUSDT: {
+    symbol: "sodaUSDT",
+    name: "Soda USDT",
+    decimals: 18,
+    address: "0xbDf1F453FCB61424011BBDDCB96cFDB30f3Fe876",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  IbnUSD: {
+    symbol: "IbnUSD",
+    name: "ICON bnUSD (Migration)",
+    decimals: 18,
+    address: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaS: {
+    symbol: "sodaS",
+    name: "Soda S",
+    decimals: 18,
+    address: "0x62ecc3Eeb80a162c57624B3fF80313FE69f5203e",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaPOL: {
+    symbol: "sodaPOL",
+    name: "Soda POL",
+    decimals: 18,
+    address: "0x208ED38f4783328aA9eBFeC360D32e7520A9B779",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  },
+  sodaSODA: {
+    symbol: "sodaSODA",
+    name: "Soda SODA",
+    decimals: 18,
+    address: "0x21685E341DE7844135329914Be6Bd8D16982d834",
+    xChainId: types.SONIC_MAINNET_CHAIN_ID
+  }
+};
+var SodaTokensAsHubAssets = Object.values(SodaTokens).reduce(
+  (acc, token) => {
+    acc[token.address] = {
+      asset: token.address,
+      decimal: token.decimals,
+      symbol: token.symbol,
+      name: token.name,
+      vault: token.address
+    };
+    return acc;
+  },
+  {}
+);
+var SodaVaultTokensSet = new Set(Object.values(SodaTokens).map((token) => token.address.toLowerCase()));
+var isSodaVaultToken = (address) => {
+  return SodaVaultTokensSet.has(address.toLowerCase());
+};
 var hubChainConfig = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     chain: {
@@ -6254,44 +6403,45 @@ var spokeChainConfig = {
         symbol: "S",
         name: "Sonic",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
-      },
-      bnUSD: {
-        symbol: "bnUSD",
-        name: "bnUSD",
-        decimals: 18,
-        address: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
       },
       WETH: {
         symbol: "WETH",
         name: "Wrapped Ether",
         decimals: 18,
-        address: "0x50c42dEAcD8Fc9773493ED674b675bE577f2634b"
+        address: "0x50c42dEAcD8Fc9773493ED674b675bE577f2634b",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894"
+        address: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
       },
       USDT: {
         symbol: "USDT",
         name: "Tether USD",
         decimals: 6,
-        address: "0x6047828dc181963ba44974801FF68e538dA5eaF9"
+        address: "0x6047828dc181963ba44974801FF68e538dA5eaF9",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
       },
       wS: {
         symbol: "wS",
         name: "Wrapped Sonic",
         decimals: 18,
-        address: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38"
+        address: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
       },
       SODA: {
         symbol: "SODA",
         name: "SODAX",
         decimals: 18,
-        address: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963"
-      }
+        address: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963",
+        xChainId: types.SONIC_MAINNET_CHAIN_ID
+      },
+      ...SodaTokens
     }
   },
   [types.SOLANA_MAINNET_CHAIN_ID]: {
@@ -6310,19 +6460,22 @@ var spokeChainConfig = {
         symbol: "SOL",
         name: "Solana",
         decimals: 9,
-        address: "11111111111111111111111111111111"
+        address: "11111111111111111111111111111111",
+        xChainId: types.SOLANA_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 9,
-        address: "3rSPCLNEF7Quw4wX8S1NyKivELoyij8eYA2gJwBgt4V5"
+        address: "3rSPCLNEF7Quw4wX8S1NyKivELoyij8eYA2gJwBgt4V5",
+        xChainId: types.SOLANA_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v"
+        address: "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+        xChainId: types.SOLANA_MAINNET_CHAIN_ID
       }
     },
     gasPrice: "500000",
@@ -6346,25 +6499,29 @@ var spokeChainConfig = {
         symbol: "AVAX",
         name: "Avalanche",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.AVALANCHE_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0x6958a4CBFe11406E2a1c1d3a71A1971aD8B3b92F"
+        address: "0x6958a4CBFe11406E2a1c1d3a71A1971aD8B3b92F",
+        xChainId: types.AVALANCHE_MAINNET_CHAIN_ID
       },
       USDT: {
         symbol: "USDT",
         name: "Tether USD",
         decimals: 6,
-        address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7"
+        address: "0x9702230A8Ea53601f5cD2dc00fDBc13d4dF4A8c7",
+        xChainId: types.AVALANCHE_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E"
+        address: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+        xChainId: types.AVALANCHE_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6385,13 +6542,15 @@ var spokeChainConfig = {
         symbol: "NIBI",
         name: "Nibiru",
         decimals: 6,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.NIBIRU_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0x043fb7e23350Dd5b77dE5E228B528763DEcb9131"
+        address: "0x043fb7e23350Dd5b77dE5E228B528763DEcb9131",
+        xChainId: types.NIBIRU_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6412,49 +6571,57 @@ var spokeChainConfig = {
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0xA256dd181C3f6E5eC68C6869f5D50a712d47212e"
+        address: "0xA256dd181C3f6E5eC68C6869f5D50a712d47212e",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       wstETH: {
         symbol: "wstETH",
         name: "Wrapped stETH",
         decimals: 18,
-        address: "0x5979D7b546E38E414F7E9822514be443A4800529"
+        address: "0x5979D7b546E38E414F7E9822514be443A4800529",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       weETH: {
         symbol: "weETH",
         name: "Wrapped eETH",
         decimals: 18,
-        address: "0x35751007a407ca6FEFfE80b3cB397736D2cf4dbe"
+        address: "0x35751007a407ca6FEFfE80b3cB397736D2cf4dbe",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       tBTC: {
         symbol: "tBTC",
         name: "Arbitrum tBTC v2",
         decimals: 18,
-        address: "0x6c84a8f1c29108F47a79964b5Fe888D4f4D0dE40"
+        address: "0x6c84a8f1c29108F47a79964b5Fe888D4f4D0dE40",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       WBTC: {
         symbol: "WBTC",
         name: "Wrapped BTC",
         decimals: 8,
-        address: "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f"
+        address: "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin (USDC)",
         decimals: 6,
-        address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
+        address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       },
       USDT: {
         symbol: "USDT",
         name: "TetherToken",
         decimals: 6,
-        address: "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9"
+        address: "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9",
+        xChainId: types.ARBITRUM_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6475,37 +6642,43 @@ var spokeChainConfig = {
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0xAcfab3F31C0a18559D78556BBf297EC29c6cf8aa"
+        address: "0xAcfab3F31C0a18559D78556BBf297EC29c6cf8aa",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       },
       weETH: {
         symbol: "weETH",
         name: "Wrapped eETH",
         decimals: 18,
-        address: "0x04c0599ae5a44757c0af6f9ec3b93da8976c150a"
+        address: "0x04c0599ae5a44757c0af6f9ec3b93da8976c150a",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+        address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       },
       wstETH: {
         symbol: "wstETH",
         name: "Wrapped stETH",
         decimals: 18,
-        address: "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452"
+        address: "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       },
       cbBTC: {
         symbol: "cbBTC",
         name: "Coinbase Wrapped BTC",
         decimals: 8,
-        address: "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf"
+        address: "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf",
+        xChainId: types.BASE_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6526,37 +6699,43 @@ var spokeChainConfig = {
         symbol: "ETH",
         name: "Ethereum",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0xF4f7dC27c17470a26d0de9039Cf0EA5045F100E8"
+        address: "0xF4f7dC27c17470a26d0de9039Cf0EA5045F100E8",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85"
+        address: "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       },
       wstETH: {
         symbol: "wstETH",
         name: "Wrapped stETH",
         decimals: 18,
-        address: "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb"
+        address: "0x1F32b1c2345538c0c6f582fCB022739c4A194Ebb",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       },
       weETH: {
         symbol: "weETH",
         name: "Wrapped eETH",
         decimals: 18,
-        address: "0x5A7fACB970D094B6C7FF1df0eA68D99E6e73CBFF"
+        address: "0x5A7fACB970D094B6C7FF1df0eA68D99E6e73CBFF",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       },
       USDT: {
         symbol: "USDT",
         name: "Tether USD",
         decimals: 6,
-        address: "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58"
+        address: "0x94b008aA00579c1307B0EF2c499aD98a8ce58e58",
+        xChainId: types.OPTIMISM_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6577,31 +6756,36 @@ var spokeChainConfig = {
         symbol: "BNB",
         name: "BNB",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.BSC_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0x8428FedC020737a5A2291F46cB1B80613eD71638"
+        address: "0x8428FedC020737a5A2291F46cB1B80613eD71638",
+        xChainId: types.BSC_MAINNET_CHAIN_ID
       },
       ETHB: {
         symbol: "ETHB",
         name: "Ethereum BSC",
         decimals: 18,
-        address: "0x2170Ed0880ac9A755fd29B2688956BD959F933F8"
+        address: "0x2170Ed0880ac9A755fd29B2688956BD959F933F8",
+        xChainId: types.BSC_MAINNET_CHAIN_ID
       },
       BTCB: {
         symbol: "BTCB",
         name: "Bitcoin BSC",
         decimals: 18,
-        address: "0x7130d2A12B9BCbFAe4f2634d864A1Ee1Ce3Ead9c"
+        address: "0x7130d2A12B9BCbFAe4f2634d864A1Ee1Ce3Ead9c",
+        xChainId: types.BSC_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 18,
-        address: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d"
+        address: "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
+        xChainId: types.BSC_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6622,19 +6806,22 @@ var spokeChainConfig = {
         symbol: "POL",
         name: "Polygon",
         decimals: 18,
-        address: "0x0000000000000000000000000000000000000000"
+        address: "0x0000000000000000000000000000000000000000",
+        xChainId: types.POLYGON_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "0x39E77f86C1B1f3fbAb362A82b49D2E86C09659B4"
+        address: "0x39E77f86C1B1f3fbAb362A82b49D2E86C09659B4",
+        xChainId: types.POLYGON_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359"
+        address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+        xChainId: types.POLYGON_MAINNET_CHAIN_ID
       }
     }
   },
@@ -6659,19 +6846,22 @@ var spokeChainConfig = {
         symbol: "INJ",
         name: "Injective",
         decimals: 18,
-        address: "inj"
+        address: "inj",
+        xChainId: types.INJECTIVE_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
-        address: "factory/inj1d036ftaatxpkqsu9hja8r24rv3v33chz3appxp/bnUSD"
+        address: "factory/inj1d036ftaatxpkqsu9hja8r24rv3v33chz3appxp/bnUSD",
+        xChainId: types.INJECTIVE_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "ibc/2CBC2EA121AE42563B08028466F37B600F2D7D4282342DE938283CC3FB2BC00E"
+        address: "ibc/2CBC2EA121AE42563B08028466F37B600F2D7D4282342DE938283CC3FB2BC00E",
+        xChainId: types.INJECTIVE_MAINNET_CHAIN_ID
       }
     },
     gasPrice: "500000000inj",
@@ -6694,25 +6884,29 @@ var spokeChainConfig = {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 7,
-        address: "CD6YBFFWMU2UJHX2NGRJ7RN76IJVTCC7MRA46DUBXNB7E6W7H7JRJ2CX"
+        address: "CD6YBFFWMU2UJHX2NGRJ7RN76IJVTCC7MRA46DUBXNB7E6W7H7JRJ2CX",
+        xChainId: types.STELLAR_MAINNET_CHAIN_ID
       },
       XLM: {
         symbol: "XLM",
         name: "Stellar Lumens",
         decimals: 7,
-        address: "CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA"
+        address: "CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA",
+        xChainId: types.STELLAR_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 7,
-        address: "CCW67TSZV3SSS2HXMBQ5JFGCKJNXKZM7UQUWUZPUTHXSTZLEO7SJMI75"
+        address: "CCW67TSZV3SSS2HXMBQ5JFGCKJNXKZM7UQUWUZPUTHXSTZLEO7SJMI75",
+        xChainId: types.STELLAR_MAINNET_CHAIN_ID
       },
       legacybnUSD: {
-        symbol: "bnUSD",
+        symbol: "bnUSD (legacy)",
         name: "legacybnUSD",
         decimals: 18,
-        address: "CCT4ZYIYZ3TUO2AWQFEOFGBZ6HQP3GW5TA37CK7CRZVFRDXYTHTYX7KP"
+        address: "CCT4ZYIYZ3TUO2AWQFEOFGBZ6HQP3GW5TA37CK7CRZVFRDXYTHTYX7KP",
+        xChainId: types.STELLAR_MAINNET_CHAIN_ID
       }
     },
     nativeToken: "CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA",
@@ -6728,8 +6922,8 @@ var spokeChainConfig = {
   [types.SUI_MAINNET_CHAIN_ID]: {
     addresses: {
       connection: "0xf3b1e696a66d02cb776dc15aae73c68bc8f03adcb6ba0ec7f6332d9d90a6a3d2::connectionv3::0x3ee76d13909ac58ae13baab4c9be5a5142818d9a387aed641825e5d4356969bf",
-      assetManagerId: "0x71535403c625ebf004135f52c8691cb0b740f801f19beb43791cb2cecc6f37ae::asset_manager::0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
-      assetManager: "0x897f911a4b7691870a1a2513af7e85fdee8de275615c77068fd8b90b8e78c678::asset_manager::0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
+      assetManagerConfigId: "0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
+      originalAssetManager: "0xa17a409164d1676db71b411ab50813ba2c7dd547d2df538c699049566f1ff922::asset_manager::0xcb7346339340b7f8dea40fcafb70721dc2fcfa7e8626a89fd954d46c1f928b61",
       xTokenManager: "",
       rateLimit: "",
       testToken: ""
@@ -6739,61 +6933,71 @@ var spokeChainConfig = {
         symbol: "SUI",
         name: "SUI",
         decimals: 9,
-        address: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI"
+        address: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       bnUSD: {
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 9,
-        address: "0xff4de2b2b57dd7611d2812d231a467d007b702a101fd5c7ad3b278257cddb507::bnusd::BNUSD"
+        address: "0xff4de2b2b57dd7611d2812d231a467d007b702a101fd5c7ad3b278257cddb507::bnusd::BNUSD",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       USDC: {
         symbol: "USDC",
         name: "USD Coin",
         decimals: 6,
-        address: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
+        address: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       legacybnUSD: {
-        symbol: "bnUSD",
+        symbol: "bnUSD (legacy)",
         name: "legacybnUSD",
         decimals: 9,
-        address: "0x03917a812fe4a6d6bc779c5ab53f8a80ba741f8af04121193fc44e0f662e2ceb::balanced_dollar::BALANCED_DOLLAR"
+        address: "0x03917a812fe4a6d6bc779c5ab53f8a80ba741f8af04121193fc44e0f662e2ceb::balanced_dollar::BALANCED_DOLLAR",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       afSUI: {
         symbol: "afSUI",
         name: "Aftermath Staked Sui",
         decimals: 9,
-        address: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
+        address: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       mSUI: {
         symbol: "mSUI",
         name: "Mirai Staked SUI",
         decimals: 9,
-        address: "0x922d15d7f55c13fd790f6e54397470ec592caa2b508df292a2e8553f3d3b274f::msui::MSUI"
+        address: "0x922d15d7f55c13fd790f6e54397470ec592caa2b508df292a2e8553f3d3b274f::msui::MSUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       haSUI: {
         symbol: "haSUI",
         name: "haSUI",
         decimals: 9,
-        address: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
+        address: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       vSUI: {
         symbol: "vSUI",
         name: "Volo Staked SUI",
         decimals: 9,
-        address: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT"
+        address: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       yapSUI: {
         symbol: "yapSUI",
         name: "Yap Staked SUI",
         decimals: 9,
-        address: "0x83f1bb8c91ecd1fd313344058b0eed94d63c54e41d8d1ae5bff1353443517d65::yap_sui::YAP_SUI"
+        address: "0x83f1bb8c91ecd1fd313344058b0eed94d63c54e41d8d1ae5bff1353443517d65::yap_sui::YAP_SUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       },
       trevinSUI: {
         symbol: "trevinSUI",
         name: "Trevin Staked SUI",
         decimals: 9,
-        address: "0x502867b177303bf1bf226245fcdd3403c177e78d175a55a56c0602c7ff51c7fa::trevin_sui::TREVIN_SUI"
+        address: "0x502867b177303bf1bf226245fcdd3403c177e78d175a55a56c0602c7ff51c7fa::trevin_sui::TREVIN_SUI",
+        xChainId: types.SUI_MAINNET_CHAIN_ID
       }
     },
     nativeToken: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
@@ -6814,7 +7018,7 @@ var spokeChainConfig = {
     },
     chain: {
       id: types.ICON_MAINNET_CHAIN_ID,
-      name: "ICON Mainnet",
+      name: "ICON",
       type: "ICON"
     },
     supportedTokens: {
@@ -6822,33 +7026,38 @@ var spokeChainConfig = {
         symbol: "ICX",
         name: "ICON",
         decimals: 18,
-        address: "cx0000000000000000000000000000000000000000"
+        address: "cx0000000000000000000000000000000000000000",
+        xChainId: types.ICON_MAINNET_CHAIN_ID
       },
       wICX: {
         symbol: "wICX",
         name: "Wrapped ICX",
         decimals: 18,
-        address: "cx3975b43d260fb8ec802cef6e60c2f4d07486f11d"
+        address: "cx3975b43d260fb8ec802cef6e60c2f4d07486f11d",
+        xChainId: types.ICON_MAINNET_CHAIN_ID
       },
       bnUSD: {
         // same as legacy
-        symbol: "bnUSD",
+        symbol: "bnUSD (legacy)",
         name: "bnUSD",
         decimals: 18,
-        address: "cx88fd7df7ddff82f7cc735c871dc519838cb235bb"
+        address: "cx88fd7df7ddff82f7cc735c871dc519838cb235bb",
+        xChainId: types.ICON_MAINNET_CHAIN_ID
       },
       legacybnUSD: {
         // duplicate of bnUSD  purely for consistency with other legacy tokens chains (sui, stellar)
-        symbol: "bnUSD",
+        symbol: "bnUSD (legacy)",
         name: "bnUSD",
         decimals: 18,
-        address: "cx88fd7df7ddff82f7cc735c871dc519838cb235bb"
+        address: "cx88fd7df7ddff82f7cc735c871dc519838cb235bb",
+        xChainId: types.ICON_MAINNET_CHAIN_ID
       },
       BALN: {
         symbol: "BALN",
         name: "BALN",
         decimals: 18,
-        address: "cxf61cd5a45dc9f91c15aa65831a30a90d59a09619"
+        address: "cxf61cd5a45dc9f91c15aa65831a30a90d59a09619",
+        xChainId: types.ICON_MAINNET_CHAIN_ID
       }
     },
     nativeToken: "cx0000000000000000000000000000000000000000",
@@ -6856,26 +7065,8 @@ var spokeChainConfig = {
     nid: "0x1"
   }
 };
-var HubVaultSymbols = [
-  "sodaAVAX",
-  "sodaBNB",
-  "sodaETH",
-  "sodaBTC",
-  "sodaSUI",
-  "sodaINJ",
-  "sodaXLM",
-  "sodaSOL",
-  "sodaSODA",
-  "sodaUSDT",
-  "sodaUSDC",
-  "bnUSD",
-  "sodaPOL",
-  "sodaNIBI",
-  "sodaS",
-  "IbnUSD"
-];
 var hubVaults = {
-  IbnUSD: {
+  [SodaTokens.IbnUSD.symbol]: {
     // ICON bnUSD (Migration) vault on Sonic contains legacy bnUSD tokens (stellar, sui, icon)
     address: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51",
     reserves: [
@@ -6885,28 +7076,28 @@ var hubVaults = {
       "0x1559B52d2e165da1505a542EA37C543c9137f52a"
     ]
   },
-  sodaS: {
+  [SodaTokens.sodaS.symbol]: {
     address: "0x62ecc3eeb80a162c57624b3ff80313fe69f5203e",
     reserves: [
       // hub asset addresses contained in the vault
       "0x039e2fb66102314ce7b64ce5ce3e5183bc94ad38"
     ]
   },
-  sodaNIBI: {
+  [SodaTokens.sodaNIBI.symbol]: {
     address: "0xc6c85287a8b173a509c2f198bb719a8a5a2d0c68",
     reserves: [
       // hub asset addresses contained in the vault
       "0xe0064414c2c1a636a9424c7a17d86fbf7fd3f190"
     ]
   },
-  sodaPOL: {
+  [SodaTokens.sodaPOL.symbol]: {
     address: "0x208ed38f4783328aa9ebfec360d32e7520a9b779",
     reserves: [
       // hub asset addresses contained in the vault
       "0x9ee17486571917837210824b0d4cadfe3b324d12"
     ]
   },
-  bnUSD: {
+  [SodaTokens.bnUSD.symbol]: {
     // new bnUSD vault on Sonic (also contains IbnUSD vault token as part of it)
     address: "0xe801ca34e19abcbfea12025378d19c4fbe250131",
     reserves: [
@@ -6925,19 +7116,33 @@ var hubVaults = {
       "0xdf23097b9aeb917bf8fb70e99b6c528fffa35364",
       "0x11b93c162aabffd026539bb3b9f9ec22c8b7ef8a",
       "0x69425ffb14704124a58d6f69d510f74a59d9a5bc",
-      "0x9d4b663eb075d2a1c7b8eaefb9eccc0510388b51"
+      "0x9d4b663eb075d2a1c7b8eaefb9eccc0510388b51",
+      "0xD1d14BF3324C901855A1f7d0d5CA4c8458D2a780"
     ]
   },
-  sodaSODA: {
+  [SodaTokens.sodaSODA.symbol]: {
     // SODA SODA vault
     address: "0x21685e341de7844135329914be6bd8d16982d834",
     reserves: [
       // hub asset addresses contained in the vault
-      "0x7c7d53eecda37a87ce0d5bf8e0b24512a48dc963"
+      "0x7c7d53eecda37a87ce0d5bf8e0b24512a48dc963",
       // SODA SODA hub asset
+      "0xf51d7082375cdca8C19C74e1A0c77dA482aFDa4e",
+      "0x93a367E5B37a1B9E8D04ef25a6Af40d181a3DfFF",
+      "0x17fF8Ad5EBe6CA8B15751067cD0c89f0E580CD17",
+      "0x4d12c72A8633588097D10e57b559ed642588e4C6",
+      "0x26cd76cB5622Dc8638670A16E0Da5a51394A8DB1",
+      "0x0eD0d274dC77ef460DC96b9fBaFF3EDB074e0471",
+      "0x8D78A620E009Ba751Eb40d77A5e9Db48A3F2016b",
+      "0x4Cf5Ce9594AEDdc5D3efe9d4Cdf0b944b4e73A53",
+      "0xD749B5FfFED7cEDaa3239abDd16D677179C29AEc",
+      "0x07Db7b1a96ebE474B20F52fF487cEE415adee79e",
+      "0x20Ce75CdcEe44B1308365447b91B9c26e2b71Ffd",
+      "0x5Db9CEc919f40C50809D9490DC3BbA4F05b0a1D7",
+      "0x655730024B673B3378CD6031B1Cd01eaE9afb138"
     ]
   },
-  sodaAVAX: {
+  [SodaTokens.sodaAVAX.symbol]: {
     // SODA AVAX vault
     address: "0x14238d267557e9d799016ad635b53cd15935d290",
     reserves: [
@@ -6946,7 +7151,7 @@ var hubVaults = {
       // AvalancheAVAX hub asset
     ]
   },
-  sodaBNB: {
+  [SodaTokens.sodaBNB.symbol]: {
     // SODA BNB vault
     address: "0x40cd41b35db9e5109ae7e54b44de8625db320e6b",
     reserves: [
@@ -6955,7 +7160,7 @@ var hubVaults = {
       // BSC BNB hub asset
     ]
   },
-  sodaETH: {
+  [SodaTokens.sodaETH.symbol]: {
     // SODA ETH vault
     address: "0x4effb5813271699683c25c734f4dabc45b363709",
     reserves: [
@@ -6972,7 +7177,7 @@ var hubVaults = {
       // Sonic WETH hub asset
     ]
   },
-  sodaBTC: {
+  [SodaTokens.sodaBTC.symbol]: {
     // SODA BTC vault
     address: "0x7a1a5555842ad2d0ed274d09b5c4406a95799d5d",
     reserves: [
@@ -6983,11 +7188,12 @@ var hubVaults = {
       // Arbitrum wBTC hub asset
       "0x96fc8540736f1598b7e235e6de8814062b3b5d3b",
       // Arbitrum tBTC hub asset,
-      "0xd8a24c71fea5bb81c66c01e532de7d9b11e13905"
+      "0xd8a24c71fea5bb81c66c01e532de7d9b11e13905",
       // BSC BTCB hub asset
+      "0x03E99853C6376b13a4c6e4d0A115F1639c9FA14e"
     ]
   },
-  sodaSUI: {
+  [SodaTokens.sodaSUI.symbol]: {
     // SODA SUI vault
     address: "0xdc5b4b00f98347e95b9f94911213dab4c687e1e3",
     reserves: [
@@ -6996,7 +7202,7 @@ var hubVaults = {
       // SUI SUI hub asset
     ]
   },
-  sodaINJ: {
+  [SodaTokens.sodaINJ.symbol]: {
     // SODA INJ vault
     address: "0x1f22279c89b213944b7ea41dacb0a868ddcdfd13",
     reserves: [
@@ -7005,7 +7211,7 @@ var hubVaults = {
       // Injective INJ hub asset
     ]
   },
-  sodaXLM: {
+  [SodaTokens.sodaXLM.symbol]: {
     // SODA XLM vault
     address: "0x6bc8c37cba91f76e68c9e6d689a9c21e4d32079b",
     reserves: [
@@ -7014,7 +7220,7 @@ var hubVaults = {
       // Stellar XLM hub asset
     ]
   },
-  sodaSOL: {
+  [SodaTokens.sodaSOL.symbol]: {
     // SODA SOL vault
     address: "0xdea692287e2ce8cb08fa52917be0f16b1dacdc87",
     reserves: [
@@ -7023,7 +7229,7 @@ var hubVaults = {
       // Solana SOL hub asset
     ]
   },
-  sodaUSDT: {
+  [SodaTokens.sodaUSDT.symbol]: {
     // SODA USDT vault
     address: "0xbdf1f453fcb61424011bbddcb96cfdb30f3fe876",
     reserves: [
@@ -7035,7 +7241,7 @@ var hubVaults = {
       // Sonic USDT
     ]
   },
-  sodaUSDC: {
+  [SodaTokens.sodaUSDC.symbol]: {
     address: "0xabbb91c0617090f0028bdc27597cd0d038f3a833",
     reserves: [
       "0x41abf4b1559ff709ef8150079bcb26db1fffd117",
@@ -7049,10 +7255,25 @@ var hubVaults = {
       "0x4bc1211faa06fb50ff61a70331f56167ae511057",
       "0x348007b53f25a9a857ab8ea81ec9e3ccbcf440f2",
       "0xc3f020057510ffe10ceb882e1b48238b43d78a5e",
-      "0x9d58508ad10d34048a11640735ca5075bba07b35"
+      "0x9d58508ad10d34048a11640735ca5075bba07b35",
+      "0xC1df02fb7b1b06bE886592C89F6955387998B2f7"
     ]
   }
 };
+var hubVaultTokensMap = new Map(
+  Object.entries(hubVaults).map(([symbol, vault]) => [
+    vault.address.toLowerCase(),
+    {
+      address: vault.address.toLowerCase(),
+      symbol,
+      name: symbol,
+      decimals: 18
+    }
+  ])
+);
+var getHubVaultTokenByAddress = (address) => {
+  return hubVaultTokensMap.get(address.toLowerCase());
+};
 var bnUSDLegacySpokeChainIds = [
   types.ICON_MAINNET_CHAIN_ID,
   types.SUI_MAINNET_CHAIN_ID,
@@ -7098,6 +7319,13 @@ var hubAssets = {
       name: "Sonic",
       vault: hubVaults.sodaS.address
     },
+    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].bnUSD]: {
+      asset: "0x289cDa1043b4Ce26BDCa3c12E534f56b24308A5B",
+      decimal: 18,
+      symbol: "bnUSD",
+      name: "bnUSD",
+      vault: hubVaults.bnUSD.address
+    },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address]: {
       asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
       decimal: 18,
@@ -7132,7 +7360,8 @@ var hubAssets = {
       symbol: "SODA",
       name: "SODA",
       vault: hubVaults.sodaSODA.address
-    }
+    },
+    ...SodaTokensAsHubAssets
   },
   [types.AVALANCHE_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].nativeToken]: {
@@ -7593,17 +7822,18 @@ var solverSupportedTokens = {
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH,
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT,
-    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.bnUSD
   ],
   [types.AVALANCHE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.AVAX,
     spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.USDT,
-    spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.USDC
-    // spokeChainConfig[AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.USDC,
+    spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.bnUSD
   ],
   [types.ARBITRUM_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.ETH,
-    // spokeChainConfig[ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.WBTC,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.weETH,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
@@ -7613,7 +7843,7 @@ var solverSupportedTokens = {
   ],
   [types.BASE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.ETH,
-    // spokeChainConfig[BASE_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.weETH,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.wstETH,
@@ -7621,7 +7851,7 @@ var solverSupportedTokens = {
   ],
   [types.OPTIMISM_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.ETH,
-    // spokeChainConfig[OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
     // spokeChainConfig[OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH, // NOTE: Not Implemented
@@ -7629,19 +7859,20 @@ var solverSupportedTokens = {
   ],
   [types.POLYGON_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.POLYGON_MAINNET_CHAIN_ID].supportedTokens.POL,
-    // spokeChainConfig[POLYGON_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.POLYGON_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
     spokeChainConfig[types.POLYGON_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.BSC_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.BNB,
     spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.ETHB,
     spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.BTCB,
-    // spokeChainConfig[BSC_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
     spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.SOLANA_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.SOL,
-    // spokeChainConfig[SOLANA_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    // NOTE: Not Implemented
     spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.ICON_MAINNET_CHAIN_ID]: [
@@ -7653,12 +7884,14 @@ var solverSupportedTokens = {
   ],
   [types.STELLAR_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.XLM,
-    // spokeChainConfig[STELLAR_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    // NOTE: Not Implemented
     spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.SUI_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.SUI,
-    // spokeChainConfig[SUI_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    // NOTE: Not Implemented
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.afSUI,
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.mSUI,
@@ -7668,9 +7901,9 @@ var solverSupportedTokens = {
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.trevinSUI
   ],
   [types.INJECTIVE_MAINNET_CHAIN_ID]: [
-    spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.INJ,
+    // spokeChainConfig[INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.INJ,
     // spokeChainConfig[INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
-    spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.USDC
+    // spokeChainConfig[INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.USDC,
   ],
   [types.NIBIRU_MAINNET_CHAIN_ID]: [
     // spokeChainConfig[NIBIRU_MAINNET_CHAIN_ID].supportedTokens.NIBI, // NOTE: Not Implemented
@@ -7802,11 +8035,30 @@ var chainIdToHubAssetsMap = new Map(
 var supportedHubAssets = new Set(
   Object.values(hubAssets).flatMap((assets) => Object.values(assets).map((info) => info.asset.toLowerCase()))
 );
+var supportedSodaAssets = new Set(
+  Object.values(hubAssets).flatMap((assets) => Object.values(assets).map((info) => info.vault.toLowerCase()))
+);
 var spokeChainIdsSet = new Set(types.SPOKE_CHAIN_IDS);
+var getOriginalAssetInfoFromVault = (chainId, vault) => {
+  const assets = hubAssets[chainId];
+  if (!assets) {
+    return [];
+  }
+  const vaultAddress = vault.toLowerCase();
+  const result = [];
+  for (const [spokeToken, info] of Object.entries(assets)) {
+    if (info.vault.toLowerCase() === vaultAddress) {
+      result.push(spokeToken);
+    }
+  }
+  return result;
+};
 var getHubAssetInfo = (chainId, asset) => originalAssetTohubAssetMap.get(chainId)?.get(asset.toLowerCase());
 var isValidOriginalAssetAddress = (chainId, asset) => originalAssetTohubAssetMap.get(chainId)?.has(asset.toLowerCase()) ?? false;
 var getOriginalAssetAddress = (chainId, hubAsset) => hubAssetToOriginalAssetMap.get(chainId)?.get(hubAsset.toLowerCase());
+var getOriginalTokenFromOriginalAssetAddress = (chainId, asset) => Object.values(spokeChainConfig[chainId].supportedTokens).find((t) => t.address.toLowerCase() === asset.toLowerCase()) ?? void 0;
 var isValidHubAsset = (hubAsset) => supportedHubAssets.has(hubAsset.toLowerCase());
+var isValidVault = (vault) => supportedSodaAssets.has(vault.toLowerCase());
 var isValidChainHubAsset = (chainId, hubAsset) => chainIdToHubAssetsMap.get(chainId)?.has(hubAsset.toLowerCase()) ?? false;
 var isValidSpokeChainId = (chainId) => spokeChainIdsSet.has(chainId);
 var isValidIntentRelayChainId = (chainId) => Object.values(INTENT_RELAY_CHAIN_IDS).some((id) => id === chainId);
@@ -7859,12 +8111,13 @@ var InjectiveSpokeProvider = class {
     );
   }
   async getBalance(token) {
-    return this.chainGrpcWasmApi.fetchSmartContractState(
+    const response = await this.chainGrpcWasmApi.fetchSmartContractState(
       this.chainConfig.addresses.assetManager,
       sdkTs.toBase64({
         get_balance: { denom: token }
       })
     );
+    return sdkTs.fromBase64(response.data);
   }
   // Execute Methods (requires SigningCosmWasmClient)
   /**
@@ -8402,341 +8655,66 @@ var StellarSpokeProvider = class {
     return viem.toHex(Buffer.from(stellaraddress, "hex"));
   }
 };
-var SuiSpokeProvider = class _SuiSpokeProvider {
-  walletProvider;
-  chainConfig;
-  publicClient;
-  constructor(config, wallet_provider) {
-    this.chainConfig = config;
-    this.walletProvider = wallet_provider;
-    this.publicClient = new client.SuiClient({ url: client.getFullnodeUrl("mainnet") });
-  }
-  async getBalance(token) {
-    const assetmanager = this.splitAddress(this.chainConfig.addresses.assetManager);
-    const tx = new transactions.Transaction();
-    const result = await this.walletProvider.viewContract(
-      tx,
-      assetmanager.packageId,
-      assetmanager.moduleId,
-      "get_token_balance",
-      [tx.object(assetmanager.stateId)],
-      [token]
-    );
-    if (!Array.isArray(result?.returnValues) || !Array.isArray(result.returnValues[0]) || result.returnValues[0][0] === void 0) {
-      throw new Error("Failed to get Balance");
-    }
-    const val = result.returnValues[0][0];
-    const str_u64 = bcs.bcs.U64.parse(Uint8Array.from(val));
-    return BigInt(str_u64);
+var Erc20Service = class {
+  constructor() {
   }
-  async transfer(token, amount, to, data, raw) {
-    const isNative2 = token.toLowerCase() === this.chainConfig.nativeToken.toLowerCase();
-    const tx = new transactions.Transaction();
-    const walletAddress = await this.walletProvider.getWalletAddressBytes();
-    const coin = isNative2 ? await this.getNativeCoin(tx, amount) : await this.getCoin(tx, token, amount, walletAddress);
-    const connection = this.splitAddress(this.chainConfig.addresses.connection);
-    const assetManager = this.splitAddress(this.chainConfig.addresses.assetManager);
-    tx.moveCall({
-      target: `${assetManager.packageId}::${assetManager.moduleId}::transfer`,
-      typeArguments: [token],
-      arguments: [
-        tx.object(assetManager.stateId),
-        tx.object(connection.stateId),
-        // Connection state object
-        coin,
-        tx.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(to)),
-        tx.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(data))
-      ]
-    });
-    if (raw) {
-      tx.setSender(walletAddress);
-      const transactionRaw = await tx.build({
-        client: this.publicClient,
-        onlyTransactionKind: true
+  /**
+   * 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]
       });
-      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
       return {
-        from: walletAddress,
-        to: `${assetManager.packageId}::${assetManager.moduleId}::transfer`,
-        value: amount,
-        data: transactionRawBase64String
+        ok: true,
+        value: allowedAmount >= amount
+      };
+    } catch (e) {
+      return {
+        ok: false,
+        error: e
       };
     }
-    return this.walletProvider.signAndExecuteTxn(tx);
   }
-  async getNativeCoin(tx, amount) {
-    const coin = tx.splitCoins(tx.gas, [tx.pure.u64(amount)])[0];
-    if (coin === void 0) {
-      return Promise.reject(Error("[SuiIntentService.getNativeCoin] coin undefined"));
+  /**
+   * 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 coin;
-  }
-  async getCoin(tx, coin, amount, address) {
-    const coins = await this.walletProvider.getCoins(address, coin);
-    const objects = [];
-    let totalAmount = BigInt(0);
-    for (const coin2 of coins.data) {
-      totalAmount += BigInt(coin2.balance);
-      objects.push(coin2.coinObjectId);
-      if (totalAmount >= amount) {
-        break;
-      }
-    }
-    const firstObject = objects[0];
-    if (!firstObject) {
-      throw new Error(`[SuiIntentService.getCoin] Coin=${coin} not found for address=${address} and amount=${amount}`);
-    }
-    if (objects.length > 1) {
-      tx.mergeCoins(firstObject, objects.slice(1));
-    }
-    if (totalAmount === amount) {
-      return tx.object(firstObject);
-    }
-    return tx.splitCoins(firstObject, [amount]);
-  }
-  splitAddress(address) {
-    const parts = address.split("::");
-    if (parts.length === 3) {
-      if (parts[0] && parts[1] && parts[2]) {
-        return { packageId: parts[0], moduleId: parts[1], stateId: parts[2] };
-      }
-      throw new Error("Invalid package address");
-    }
-    throw new Error("Invalid package address");
-  }
-  async sendMessage(dst_chain_id, dst_address, data, raw) {
-    const txb = new transactions.Transaction();
-    const connection = this.splitAddress(this.chainConfig.addresses.connection);
-    txb.moveCall({
-      target: `${connection.packageId}::${connection.moduleId}::send_message_ua`,
-      arguments: [
-        txb.object(connection.stateId),
-        txb.pure.u256(dst_chain_id),
-        txb.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(dst_address)),
-        txb.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(data))
-      ]
-    });
-    const walletAddress = await this.walletProvider.getWalletAddress();
-    if (raw) {
-      txb.setSender(walletAddress);
-      const transactionRaw = await txb.build({
-        client: this.publicClient,
-        onlyTransactionKind: true
-      });
-      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
-      return {
-        from: walletAddress,
-        to: `${connection.packageId}::${connection.moduleId}::send_message_ua`,
-        value: 0n,
-        data: transactionRawBase64String
-      };
-    }
-    return this.walletProvider.signAndExecuteTxn(txb);
-  }
-  async configureAssetManagerHub(hubNetworkId, hubAssetManager) {
-    const tx = new transactions.Transaction();
-    const assetmanager = this.splitAddress(this.chainConfig.addresses.assetManager);
-    tx.moveCall({
-      target: `${assetmanager.packageId}::${assetmanager.moduleId}::set_hub_details`,
-      arguments: [tx.object(assetmanager.stateId), tx.pure.u64(hubNetworkId), tx.pure.vector("u8", hubAssetManager)]
-    });
-    const result = await this.walletProvider.signAndExecuteTxn(tx);
-    return result;
-  }
-  async getWalletAddress() {
-    return this.walletProvider.getWalletAddress();
-  }
-  async getWalletAddressBytes() {
-    const address = await this.getWalletAddress();
-    return _SuiSpokeProvider.getAddressBCSBytes(address);
-  }
-  static getAddressBCSBytes(suiaddress) {
-    return viem.toHex(bcs.bcs.Address.serialize(suiaddress).toBytes());
-  }
-};
-
-// src/entities/solana/SolanaSpokeProvider.ts
-var SolanaSpokeProvider = class {
-  walletProvider;
-  chainConfig;
-  constructor(walletProvider, chainConfig) {
-    this.walletProvider = walletProvider;
-    this.chainConfig = chainConfig;
-  }
-};
-var solanaSpokeChainConfig = spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID];
-function getSolanaAddressBytes(address) {
-  return `0x${Buffer.from(address.toBytes()).toString("hex")}`;
-}
-function isNative(address) {
-  if (address.equals(new web3_js.PublicKey(solanaSpokeChainConfig.nativeToken))) {
-    return true;
-  }
-  return false;
-}
-function convertTransactionInstructionToRaw(instruction) {
-  return {
-    keys: instruction.keys.map((key) => ({
-      pubkey: key.pubkey.toBase58(),
-      isSigner: key.isSigner,
-      isWritable: key.isWritable
-    })),
-    programId: instruction.programId.toBase58(),
-    data: instruction.data
-  };
-}
-
-// src/entities/icon/HanaWalletConnector.ts
-function requestAddress() {
-  return new Promise((resolve) => {
-    const eventHandler = (event) => {
-      const customEvent = event;
-      const response = customEvent.detail;
-      if (isResponseAddressType(response)) {
-        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-        resolve({
-          ok: true,
-          value: response.payload
-        });
-      }
-    };
-    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.dispatchEvent(
-      new CustomEvent("ICONEX_RELAY_REQUEST", {
-        detail: {
-          type: "REQUEST_ADDRESS"
-        }
-      })
-    );
-  });
-}
-function requestSigning(from, hash) {
-  return new Promise((resolve, reject) => {
-    const signRequest = new CustomEvent("ICONEX_RELAY_REQUEST", {
-      detail: {
-        type: "REQUEST_SIGNING",
-        payload: {
-          from,
-          hash
-        }
-      }
-    });
-    const eventHandler = (event) => {
-      const customEvent = event;
-      const response = customEvent.detail;
-      if (isResponseSigningType(response)) {
-        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-        resolve({
-          ok: true,
-          value: response.payload
-        });
-      } else if (response.type === "CANCEL_SIGNING") {
-        reject(new Error("CANCEL_SIGNING"));
-      }
-    };
-    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.dispatchEvent(signRequest);
-  });
-}
-function requestJsonRpc(rawTransaction, id = 99999) {
-  return new Promise((resolve, reject) => {
-    const eventHandler = (event) => {
-      const customEvent = event;
-      const { type, payload } = customEvent.detail;
-      if (type === "RESPONSE_JSON-RPC") {
-        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-        if (isJsonRpcPayloadResponse(payload)) {
-          resolve({
-            ok: true,
-            value: payload
-          });
-        } else {
-          reject(new Error("Invalid payload response type (expected JsonRpcPayloadResponse)"));
-        }
-      } else if (type === "CANCEL_JSON-RPC") {
-        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-        reject(new Error("CANCEL_JSON-RPC"));
-      }
-    };
-    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
-    window.dispatchEvent(
-      new CustomEvent("ICONEX_RELAY_REQUEST", {
-        detail: {
-          type: "REQUEST_JSON-RPC",
-          payload: {
-            jsonrpc: "2.0",
-            method: "icx_sendTransaction",
-            params: rawTransaction,
-            id
-          }
-        }
-      })
-    );
-  });
-}
-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);
+    return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
   /**
    * Encodes a transfer transaction for a token.
@@ -9080,57 +9058,41 @@ var EvmWalletAbstraction = class {
     });
   }
 };
-var EvmSpokeService = class _EvmSpokeService {
+var SuiSpokeService = class _SuiSpokeService {
   constructor() {
   }
   /**
-   * Estimates the gas necessary to complete a transaction without submitting it to the network.
-   *
-   * - Docs: https://viem.sh/docs/actions/public/estimateGas
-   * - JSON-RPC Methods: [`eth_estimateGas`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_estimategas)
-   *
-   * @param {EvmRawTransaction} rawTx - The raw transaction to estimate the gas for.
-   * @param {EvmSpokeProvider} spokeProvider - The EVM spoke provider.
-   * @returns {Promise<bigint>} Estimated gas for the transaction.
-   *
-   * @example
-   *
-   * const rawTx: EvmRawTransaction = {
-   *   from: '0x1234...abcd', // sender address
-   *   to: '0xabcd...1234',   // recipient address
-   *   value: 1000000000000000000n, // 1 ETH in wei
-   *   data: '0x', // no calldata
-   * };
-   *
-   * // Assume spokeProvider is an initialized EvmSpokeProvider
-   * const estimatedGas = await EvmSpokeService.estimateGas(rawTx, spokeProvider);
-   * console.log(`Estimated gas: ${estimatedGas}`);
+   * Estimate the gas for a transaction.
+   * @param {SuiRawTransaction} rawTx - The raw transaction to estimate the gas for.
+   * @param {SuiSpokeProvider} spokeProvider - The spoke provider.
+   * @returns {Promise<bigint>} The estimated computation cost.
    */
   static async estimateGas(rawTx, spokeProvider) {
-    return spokeProvider.publicClient.estimateGas({
-      account: rawTx.from,
-      to: rawTx.to,
-      value: rawTx.value,
-      data: rawTx.data
+    const txb = transactions.Transaction.fromKind(rawTx.data);
+    const result = await spokeProvider.publicClient.devInspectTransactionBlock({
+      sender: rawTx.from,
+      transactionBlock: txb
     });
+    return result.effects.gasUsed;
   }
   /**
    * Deposit tokens to the spoke chain.
-   * @param {EvmSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {InjectiveSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
+   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
    * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
    */
   static async deposit(params, spokeProvider, hubProvider, raw) {
-    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+    const userWallet = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
       spokeProvider.chainConfig.chain.id,
       params.from,
       hubProvider
     );
-    return _EvmSpokeService.transfer(
+    return _SuiSpokeService.transfer(
       {
         token: params.token,
-        recipient: to,
+        recipient: userWallet,
         amount: params.amount,
         data: params.data
       },
@@ -9141,21 +9103,16 @@ var EvmSpokeService = class _EvmSpokeService {
   /**
    * Get the balance of the token in the spoke chain.
    * @param {Address} token - The address of the token to get the balance of.
-   * @param {EvmSpokeProvider} spokeProvider - The spoke provider.
+   * @param {SuiSpokeProvider} spokeProvider - The spoke provider.
    * @returns {Promise<bigint>} The balance of the token.
    */
   static async getDeposit(token, spokeProvider) {
-    return spokeProvider.publicClient.readContract({
-      address: token,
-      abi: erc20Abi,
-      functionName: "balanceOf",
-      args: [token]
-    });
+    return spokeProvider.getBalance(token);
   }
   /**
-   * Generate simulation parameters for deposit from EvmSpokeDepositParams.
-   * @param {EvmSpokeDepositParams} params - The deposit parameters.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * 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.
    */
@@ -9165,219 +9122,681 @@ var EvmSpokeService = class _EvmSpokeService {
       params.from,
       hubProvider
     );
+    const encoder = new TextEncoder();
     return {
       spokeChainID: spokeProvider.chainConfig.chain.id,
-      token: encodeAddress(spokeProvider.chainConfig.chain.id, params.token),
+      token: viem.toHex(encoder.encode(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
-      )
+      srcAddress: viem.toHex(encoder.encode(spokeProvider.chainConfig.addresses.originalAssetManager))
     };
   }
   /**
    * Calls a contract on the spoke chain using the user's wallet.
-   * @param {HubAddress} from - The address of the user on the hub chain.
+   * @param {HubAddress} from - The address of the user on the spoke chain.
    * @param {Hex} payload - The payload to send to the contract.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
    * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
    * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
    */
   static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
     const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
-    const result = await _EvmSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
-    return result;
-  }
-  /**
-   * Transfers tokens to the hub chain.
-   * @param {EvmTransferToHubParams} params - The parameters for the transfer, including:
-   *   - {Address} token: The address of the token to transfer (use address(0) for native token).
-   *   - {Address} recipient: The recipient address on the hub chain.
-   *   - {bigint} amount: The amount to transfer.
-   *   - {Hex} [data="0x"]: Additional data for the transfer.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
-   */
-  static async transfer({ token, recipient, amount, data = "0x" }, spokeProvider, raw) {
-    const txPayload = {
-      address: spokeProvider.chainConfig.addresses.assetManager,
-      value: token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? amount : void 0
-    };
-    const from = await spokeProvider.walletProvider.getWalletAddress();
-    const rawTx = {
-      from,
-      to: txPayload.address,
-      value: txPayload.value ?? 0n,
-      data: viem.encodeFunctionData({
-        abi: spokeAssetManagerAbi,
-        functionName: "transfer",
-        args: [token, recipient, amount, data]
-      })
-    };
-    if (raw) {
-      return rawTx;
-    }
-    return spokeProvider.walletProvider.sendTransaction(rawTx);
+    return _SuiSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
   }
   /**
-   * Sends a message to the hub chain.
-   * @param {bigint} dstChainId - The chain ID of the hub chain.
-   * @param {Address} dstAddress - The address on the hub chain.
-   * @param {Hex} payload - The payload to send.
-   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   * Fetch the asset manager config from the spoke chain.
+   * @param {SuiSpokeProvider} suiSpokeProvider - The spoke provider.
+   * @returns {Promise<string>} The asset manager config.
    */
-  static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
-    const txPayload = {
-      address: spokeProvider.chainConfig.addresses.connection};
-    const from = await spokeProvider.walletProvider.getWalletAddress();
-    const rawTx = {
-      from,
-      to: txPayload.address,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: connectionAbi,
-        functionName: "sendMessage",
-        args: [dstChainId, dstAddress, payload]
-      })
-    };
-    if (raw) {
-      return rawTx;
-    }
-    return spokeProvider.walletProvider.sendTransaction(rawTx);
-  }
-};
-var InjectiveSpokeService = class _InjectiveSpokeService {
-  constructor() {
+  static async fetchAssetManagerAddress(suiSpokeProvider) {
+    const latestPackageId = await _SuiSpokeService.fetchLatestAssetManagerPackageId(suiSpokeProvider);
+    return `${latestPackageId}::asset_manager::${suiSpokeProvider.chainConfig.addresses.assetManagerConfigId}`;
   }
   /**
-   * Estimate the gas for a transaction.
-   * @param {InjectiveRawTransaction} rawTx - The raw transaction to estimate the gas for.
-   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @returns {Promise<InjectiveGasEstimate>} The estimated gas for the transaction.
+   * Fetch the latest asset manager package id from the spoke chain.
+   * @param {SuiSpokeProvider} suiSpokeProvider - The spoke provider.
+   * @returns {Promise<string>} The latest asset manager package id.
    */
-  static async estimateGas(rawTx, spokeProvider) {
-    const txRaw = coreProtoTs.CosmosTxV1Beta1Tx.TxRaw.fromPartial({
-      bodyBytes: rawTx.signedDoc.bodyBytes,
-      authInfoBytes: rawTx.signedDoc.authInfoBytes,
-      signatures: []
-      // not required for simulation
+  static async fetchLatestAssetManagerPackageId(suiSpokeProvider) {
+    const configData = await suiSpokeProvider.publicClient.getObject({
+      id: suiSpokeProvider.chainConfig.addresses.assetManagerConfigId,
+      options: {
+        showContent: true
+      }
     });
-    const { gasInfo } = await spokeProvider.txClient.simulate(txRaw);
-    return {
-      gasWanted: gasInfo.gasWanted,
-      gasUsed: gasInfo.gasUsed
-    };
-  }
-  /**
-   * Deposit tokens to the spoke chain.
-   * @param {InjectiveSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
-   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
-   */
-  static async deposit(params, spokeProvider, hubProvider, raw) {
-    const userWallet = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      viem.toHex(Buffer.from(params.from, "utf-8")),
-      hubProvider
-    );
-    return _InjectiveSpokeService.transfer(
-      {
-        token: params.token,
-        recipient: userWallet,
-        amount: params.amount.toString(),
-        data: params.data
-      },
-      spokeProvider,
-      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,
-      viem.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.
-   * @param {InjectiveSpokeProvider} spokeProvider - The spoke provider.
-   * @returns {Promise<bigint>} The balance of the token.
-   */
-  static async getDeposit(token, spokeProvider) {
-    const bal = await spokeProvider.getBalance(token);
-    return BigInt(bal);
-  }
-  /**
-   * Calls a contract on the spoke chain using the user's wallet.
-   * @param {HubAddress} from - The address of the user on the hub chain.
-   * @param {Hex} payload - The payload to send to the contract.
-   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
-   */
-  static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
-    const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
-    return _InjectiveSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
+    if (configData.error) {
+      throw new Error(`Failed to fetch asset manager id. Details: ${JSON.stringify(configData.error)}`);
+    }
+    if (!configData.data) {
+      throw new Error("Asset manager id not found (no data)");
+    }
+    if (configData.data.content?.dataType !== "moveObject") {
+      throw new Error("Asset manager id not found (not a move object)");
+    }
+    if (!("latest_package_id" in configData.data.content.fields)) {
+      throw new Error("Asset manager id not found (no latest package id)");
+    }
+    const latestPackageId = configData.data.content.fields["latest_package_id"];
+    if (typeof latestPackageId !== "string") {
+      throw new Error("Asset manager id invalid (latest package id is not a string)");
+    }
+    if (!latestPackageId) {
+      throw new Error("Asset manager id not found (no latest package id)");
+    }
+    return latestPackageId.toString();
   }
   /**
    * Transfers tokens to the hub chain.
-   * @param {InjectiveTransferToHubParams} params - The parameters for the transfer, including:
+   * @param {SuiTransferToHubParams} params - The parameters for the transfer, including:
    *   - {string} token: The address of the token to transfer (use address(0) for native token).
    *   - {Uint8Array} recipient: The recipient address on the hub chain.
    *   - {string} amount: The amount to transfer.
    *   - {Uint8Array} [data=new Uint8Array([])]: Additional data for the transfer.
-   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
    * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
    */
   static async transfer({ token, recipient, amount, data = "0x" }, spokeProvider, raw) {
-    const sender = await spokeProvider.walletProvider.getWalletAddress();
-    return InjectiveSpokeProvider.deposit(sender, token, recipient, amount, data, spokeProvider, raw);
+    return spokeProvider.transfer(token, amount, viem.fromHex(recipient, "bytes"), viem.fromHex(data, "bytes"), raw);
   }
   /**
    * Sends a message to the hub chain.
    * @param {bigint} dstChainId - The chain ID of the hub chain.
-   * @param {Address} dstAddress - The address on the hub chain.
+   * @param {HubAddress} dstAddress - The address on the hub chain.
    * @param {Hex} payload - The payload to send.
-   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
    */
   static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
-    const sender = await spokeProvider.walletProvider.getWalletAddress();
-    return spokeProvider.send_message(sender, dstChainId.toString(), dstAddress, payload, raw);
+    return spokeProvider.sendMessage(dstChainId, viem.fromHex(dstAddress, "bytes"), viem.fromHex(payload, "bytes"), raw);
   }
 };
 
-// src/utils/icon-utils.ts
+// src/entities/sui/SuiSpokeProvider.ts
+var SuiSpokeProvider = class _SuiSpokeProvider {
+  walletProvider;
+  chainConfig;
+  publicClient;
+  assetManagerAddress;
+  constructor(config, wallet_provider) {
+    this.chainConfig = config;
+    this.walletProvider = wallet_provider;
+    this.publicClient = new client.SuiClient({ url: client.getFullnodeUrl("mainnet") });
+  }
+  async getBalance(token) {
+    const assetmanager = this.splitAddress(await this.getAssetManagerAddress());
+    const tx = new transactions.Transaction();
+    const result = await this.walletProvider.viewContract(
+      tx,
+      assetmanager.packageId,
+      assetmanager.moduleId,
+      "get_token_balance",
+      [tx.object(assetmanager.stateId)],
+      [token]
+    );
+    if (!Array.isArray(result?.returnValues) || !Array.isArray(result.returnValues[0]) || result.returnValues[0][0] === void 0) {
+      throw new Error("Failed to get Balance");
+    }
+    const val = result.returnValues[0][0];
+    const str_u64 = bcs.bcs.U64.parse(Uint8Array.from(val));
+    return BigInt(str_u64);
+  }
+  async transfer(token, amount, to, data, raw) {
+    const isNative2 = token.toLowerCase() === this.chainConfig.nativeToken.toLowerCase();
+    const tx = new transactions.Transaction();
+    const walletAddress = await this.walletProvider.getWalletAddressBytes();
+    const coin = isNative2 ? await this.getNativeCoin(tx, amount) : await this.getCoin(tx, token, amount, walletAddress);
+    const connection = this.splitAddress(this.chainConfig.addresses.connection);
+    const assetManager = this.splitAddress(await this.getAssetManagerAddress());
+    tx.moveCall({
+      target: `${assetManager.packageId}::${assetManager.moduleId}::transfer`,
+      typeArguments: [token],
+      arguments: [
+        tx.object(assetManager.stateId),
+        tx.object(connection.stateId),
+        // Connection state object
+        coin,
+        tx.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(to)),
+        tx.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(data))
+      ]
+    });
+    if (raw) {
+      tx.setSender(walletAddress);
+      const transactionRaw = await tx.build({
+        client: this.publicClient,
+        onlyTransactionKind: true
+      });
+      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
+      return {
+        from: walletAddress,
+        to: `${assetManager.packageId}::${assetManager.moduleId}::transfer`,
+        value: amount,
+        data: transactionRawBase64String
+      };
+    }
+    return this.walletProvider.signAndExecuteTxn(tx);
+  }
+  async getNativeCoin(tx, amount) {
+    const coin = tx.splitCoins(tx.gas, [tx.pure.u64(amount)])[0];
+    if (coin === void 0) {
+      return Promise.reject(Error("[SuiIntentService.getNativeCoin] coin undefined"));
+    }
+    return coin;
+  }
+  async getCoin(tx, coin, amount, address) {
+    const coins = await this.walletProvider.getCoins(address, coin);
+    const objects = [];
+    let totalAmount = BigInt(0);
+    for (const coin2 of coins.data) {
+      totalAmount += BigInt(coin2.balance);
+      objects.push(coin2.coinObjectId);
+      if (totalAmount >= amount) {
+        break;
+      }
+    }
+    const firstObject = objects[0];
+    if (!firstObject) {
+      throw new Error(`[SuiIntentService.getCoin] Coin=${coin} not found for address=${address} and amount=${amount}`);
+    }
+    if (objects.length > 1) {
+      tx.mergeCoins(firstObject, objects.slice(1));
+    }
+    if (totalAmount === amount) {
+      return tx.object(firstObject);
+    }
+    return tx.splitCoins(firstObject, [amount]);
+  }
+  splitAddress(address) {
+    const parts = address.split("::");
+    if (parts.length === 3) {
+      if (parts[0] && parts[1] && parts[2]) {
+        return { packageId: parts[0], moduleId: parts[1], stateId: parts[2] };
+      }
+      throw new Error("Invalid package address");
+    }
+    throw new Error("Invalid package address");
+  }
+  async sendMessage(dst_chain_id, dst_address, data, raw) {
+    const txb = new transactions.Transaction();
+    const connection = this.splitAddress(this.chainConfig.addresses.connection);
+    txb.moveCall({
+      target: `${connection.packageId}::${connection.moduleId}::send_message_ua`,
+      arguments: [
+        txb.object(connection.stateId),
+        txb.pure.u256(dst_chain_id),
+        txb.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(dst_address)),
+        txb.pure(bcs.bcs.vector(bcs.bcs.u8()).serialize(data))
+      ]
+    });
+    const walletAddress = await this.walletProvider.getWalletAddress();
+    if (raw) {
+      txb.setSender(walletAddress);
+      const transactionRaw = await txb.build({
+        client: this.publicClient,
+        onlyTransactionKind: true
+      });
+      const transactionRawBase64String = Buffer.from(transactionRaw).toString("base64");
+      return {
+        from: walletAddress,
+        to: `${connection.packageId}::${connection.moduleId}::send_message_ua`,
+        value: 0n,
+        data: transactionRawBase64String
+      };
+    }
+    return this.walletProvider.signAndExecuteTxn(txb);
+  }
+  async configureAssetManagerHub(hubNetworkId, hubAssetManager) {
+    const tx = new transactions.Transaction();
+    const assetmanager = this.splitAddress(await this.getAssetManagerAddress());
+    tx.moveCall({
+      target: `${assetmanager.packageId}::${assetmanager.moduleId}::set_hub_details`,
+      arguments: [tx.object(assetmanager.stateId), tx.pure.u64(hubNetworkId), tx.pure.vector("u8", hubAssetManager)]
+    });
+    const result = await this.walletProvider.signAndExecuteTxn(tx);
+    return result;
+  }
+  async getWalletAddress() {
+    return this.walletProvider.getWalletAddress();
+  }
+  async getWalletAddressBytes() {
+    const address = await this.getWalletAddress();
+    return _SuiSpokeProvider.getAddressBCSBytes(address);
+  }
+  static getAddressBCSBytes(suiaddress) {
+    return viem.toHex(bcs.bcs.Address.serialize(suiaddress).toBytes());
+  }
+  async getAssetManagerAddress() {
+    if (!this.assetManagerAddress) {
+      this.assetManagerAddress = await SuiSpokeService.fetchAssetManagerAddress(this);
+    }
+    return this.assetManagerAddress.toString();
+  }
+};
+
+// src/entities/solana/SolanaSpokeProvider.ts
+var SolanaSpokeProvider = class {
+  walletProvider;
+  chainConfig;
+  constructor(walletProvider, chainConfig) {
+    this.walletProvider = walletProvider;
+    this.chainConfig = chainConfig;
+  }
+};
+var solanaSpokeChainConfig = spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID];
+function getSolanaAddressBytes(address) {
+  return `0x${Buffer.from(address.toBytes()).toString("hex")}`;
+}
+function isNative(address) {
+  if (address.equals(new web3_js.PublicKey(solanaSpokeChainConfig.nativeToken))) {
+    return true;
+  }
+  return false;
+}
+function convertTransactionInstructionToRaw(instruction) {
+  return {
+    keys: instruction.keys.map((key) => ({
+      pubkey: key.pubkey.toBase58(),
+      isSigner: key.isSigner,
+      isWritable: key.isWritable
+    })),
+    programId: instruction.programId.toBase58(),
+    data: instruction.data
+  };
+}
+
+// src/entities/icon/HanaWalletConnector.ts
+function requestAddress() {
+  return new Promise((resolve) => {
+    const eventHandler = (event) => {
+      const customEvent = event;
+      const response = customEvent.detail;
+      if (isResponseAddressType(response)) {
+        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+        resolve({
+          ok: true,
+          value: response.payload
+        });
+      }
+    };
+    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.dispatchEvent(
+      new CustomEvent("ICONEX_RELAY_REQUEST", {
+        detail: {
+          type: "REQUEST_ADDRESS"
+        }
+      })
+    );
+  });
+}
+function requestSigning(from, hash) {
+  return new Promise((resolve, reject) => {
+    const signRequest = new CustomEvent("ICONEX_RELAY_REQUEST", {
+      detail: {
+        type: "REQUEST_SIGNING",
+        payload: {
+          from,
+          hash
+        }
+      }
+    });
+    const eventHandler = (event) => {
+      const customEvent = event;
+      const response = customEvent.detail;
+      if (isResponseSigningType(response)) {
+        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+        resolve({
+          ok: true,
+          value: response.payload
+        });
+      } else if (response.type === "CANCEL_SIGNING") {
+        reject(new Error("CANCEL_SIGNING"));
+      }
+    };
+    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.dispatchEvent(signRequest);
+  });
+}
+function requestJsonRpc(rawTransaction, id = 99999) {
+  return new Promise((resolve, reject) => {
+    const eventHandler = (event) => {
+      const customEvent = event;
+      const { type, payload } = customEvent.detail;
+      if (type === "RESPONSE_JSON-RPC") {
+        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+        if (isJsonRpcPayloadResponse(payload)) {
+          resolve({
+            ok: true,
+            value: payload
+          });
+        } else {
+          reject(new Error("Invalid payload response type (expected JsonRpcPayloadResponse)"));
+        }
+      } else if (type === "CANCEL_JSON-RPC") {
+        window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+        reject(new Error("CANCEL_JSON-RPC"));
+      }
+    };
+    window.removeEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.addEventListener("ICONEX_RELAY_RESPONSE", eventHandler, false);
+    window.dispatchEvent(
+      new CustomEvent("ICONEX_RELAY_REQUEST", {
+        detail: {
+          type: "REQUEST_JSON-RPC",
+          payload: {
+            jsonrpc: "2.0",
+            method: "icx_sendTransaction",
+            params: rawTransaction,
+            id
+          }
+        }
+      })
+    );
+  });
+}
+var EvmSpokeService = class _EvmSpokeService {
+  constructor() {
+  }
+  /**
+   * Estimates the gas necessary to complete a transaction without submitting it to the network.
+   *
+   * - Docs: https://viem.sh/docs/actions/public/estimateGas
+   * - JSON-RPC Methods: [`eth_estimateGas`](https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_estimategas)
+   *
+   * @param {EvmRawTransaction} rawTx - The raw transaction to estimate the gas for.
+   * @param {EvmSpokeProvider} spokeProvider - The EVM spoke provider.
+   * @returns {Promise<bigint>} Estimated gas for the transaction.
+   *
+   * @example
+   *
+   * const rawTx: EvmRawTransaction = {
+   *   from: '0x1234...abcd', // sender address
+   *   to: '0xabcd...1234',   // recipient address
+   *   value: 1000000000000000000n, // 1 ETH in wei
+   *   data: '0x', // no calldata
+   * };
+   *
+   * // Assume spokeProvider is an initialized EvmSpokeProvider
+   * const estimatedGas = await EvmSpokeService.estimateGas(rawTx, spokeProvider);
+   * console.log(`Estimated gas: ${estimatedGas}`);
+   */
+  static async estimateGas(rawTx, spokeProvider) {
+    return spokeProvider.publicClient.estimateGas({
+      account: rawTx.from,
+      to: rawTx.to,
+      value: rawTx.value,
+      data: rawTx.data
+    });
+  }
+  /**
+   * Deposit tokens to the spoke chain.
+   * @param {EvmSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async deposit(params, spokeProvider, hubProvider, raw) {
+    const to = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      params.from,
+      hubProvider
+    );
+    return _EvmSpokeService.transfer(
+      {
+        token: params.token,
+        recipient: to,
+        amount: params.amount,
+        data: params.data
+      },
+      spokeProvider,
+      raw
+    );
+  }
+  /**
+   * Get the balance of the token in the spoke chain.
+   * @param {Address} token - The address of the token to get the balance of.
+   * @param {EvmSpokeProvider} spokeProvider - The spoke provider.
+   * @returns {Promise<bigint>} The balance of the token.
+   */
+  static async getDeposit(token, spokeProvider) {
+    return spokeProvider.publicClient.readContract({
+      address: token,
+      abi: erc20Abi,
+      functionName: "balanceOf",
+      args: [spokeProvider.chainConfig.addresses.assetManager]
+    });
+  }
+  /**
+   * 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.
+   * @param {Hex} payload - The payload to send to the contract.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
+    const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
+    const result = await _EvmSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
+    return result;
+  }
+  /**
+   * Transfers tokens to the hub chain.
+   * @param {EvmTransferToHubParams} params - The parameters for the transfer, including:
+   *   - {Address} token: The address of the token to transfer (use address(0) for native token).
+   *   - {Address} recipient: The recipient address on the hub chain.
+   *   - {bigint} amount: The amount to transfer.
+   *   - {Hex} [data="0x"]: Additional data for the transfer.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async transfer({ token, recipient, amount, data = "0x" }, spokeProvider, raw) {
+    const txPayload = {
+      address: spokeProvider.chainConfig.addresses.assetManager,
+      value: token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? amount : void 0
+    };
+    const from = await spokeProvider.walletProvider.getWalletAddress();
+    const rawTx = {
+      from,
+      to: txPayload.address,
+      value: txPayload.value ?? 0n,
+      data: viem.encodeFunctionData({
+        abi: spokeAssetManagerAbi,
+        functionName: "transfer",
+        args: [token, recipient, amount, data]
+      })
+    };
+    if (raw) {
+      return rawTx;
+    }
+    return spokeProvider.walletProvider.sendTransaction(rawTx);
+  }
+  /**
+   * Sends a message to the hub chain.
+   * @param {bigint} dstChainId - The chain ID of the hub chain.
+   * @param {Address} dstAddress - The address on the hub chain.
+   * @param {Hex} payload - The payload to send.
+   * @param {EvmSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseEvmTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
+    const txPayload = {
+      address: spokeProvider.chainConfig.addresses.connection};
+    const from = await spokeProvider.walletProvider.getWalletAddress();
+    const rawTx = {
+      from,
+      to: txPayload.address,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: connectionAbi,
+        functionName: "sendMessage",
+        args: [dstChainId, dstAddress, payload]
+      })
+    };
+    if (raw) {
+      return rawTx;
+    }
+    return spokeProvider.walletProvider.sendTransaction(rawTx);
+  }
+};
+var InjectiveSpokeService = class _InjectiveSpokeService {
+  constructor() {
+  }
+  /**
+   * Estimate the gas for a transaction.
+   * @param {InjectiveRawTransaction} rawTx - The raw transaction to estimate the gas for.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @returns {Promise<InjectiveGasEstimate>} The estimated gas for the transaction.
+   */
+  static async estimateGas(rawTx, spokeProvider) {
+    const txRaw = coreProtoTs.CosmosTxV1Beta1Tx.TxRaw.fromPartial({
+      bodyBytes: rawTx.signedDoc.bodyBytes,
+      authInfoBytes: rawTx.signedDoc.authInfoBytes,
+      signatures: []
+      // not required for simulation
+    });
+    const { gasInfo } = await spokeProvider.txClient.simulate(txRaw);
+    return {
+      gasWanted: gasInfo.gasWanted,
+      gasUsed: gasInfo.gasUsed
+    };
+  }
+  /**
+   * Deposit tokens to the spoke chain.
+   * @param {InjectiveSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async deposit(params, spokeProvider, hubProvider, raw) {
+    const userWallet = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      viem.toHex(Buffer.from(params.from, "utf-8")),
+      hubProvider
+    );
+    return _InjectiveSpokeService.transfer(
+      {
+        token: params.token,
+        recipient: userWallet,
+        amount: params.amount.toString(),
+        data: params.data
+      },
+      spokeProvider,
+      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,
+      viem.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.
+   * @param {InjectiveSpokeProvider} spokeProvider - The spoke provider.
+   * @returns {Promise<bigint>} The balance of the token.
+   */
+  static async getDeposit(token, spokeProvider) {
+    const bal = await spokeProvider.getBalance(token);
+    return BigInt(bal);
+  }
+  /**
+   * Calls a contract on the spoke chain using the user's wallet.
+   * @param {HubAddress} from - The address of the user on the hub chain.
+   * @param {Hex} payload - The payload to send to the contract.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
+   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
+    const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
+    return _InjectiveSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
+  }
+  /**
+   * Transfers tokens to the hub chain.
+   * @param {InjectiveTransferToHubParams} params - The parameters for the transfer, including:
+   *   - {string} token: The address of the token to transfer (use address(0) for native token).
+   *   - {Uint8Array} recipient: The recipient address on the hub chain.
+   *   - {string} amount: The amount to transfer.
+   *   - {Uint8Array} [data=new Uint8Array([])]: Additional data for the transfer.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @param {boolean} raw - The return type raw or just transaction hash
+   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async transfer({ token, recipient, amount, data = "0x" }, spokeProvider, raw) {
+    const sender = await spokeProvider.walletProvider.getWalletAddress();
+    return InjectiveSpokeProvider.deposit(sender, token, recipient, amount, data, spokeProvider, raw);
+  }
+  /**
+   * Sends a message to the hub chain.
+   * @param {bigint} dstChainId - The chain ID of the hub chain.
+   * @param {Address} dstAddress - The address on the hub chain.
+   * @param {Hex} payload - The payload to send.
+   * @param {InjectiveSpokeProvider} spokeProvider - The provider for the spoke chain.
+   * @returns {PromiseInjectiveTxReturnType<R>} A promise that resolves to the transaction hash.
+   */
+  static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
+    const sender = await spokeProvider.walletProvider.getWalletAddress();
+    return spokeProvider.send_message(sender, dstChainId.toString(), dstAddress, payload, raw);
+  }
+};
+
+// src/utils/icon-utils.ts
 async function estimateStepCost(rawTx, debugRpcUrl) {
   try {
     const tmpRawTx = { ...rawTx };
@@ -9662,18 +10081,14 @@ var SolanaSpokeService = class _SolanaSpokeService {
     );
   }
   static async getDeposit(token, spokeProvider) {
-    const assetManagerProgram = await getAssetManagerProgram(
-      spokeProvider.walletProvider.getWalletBase58PublicKey(),
-      spokeProvider.chainConfig.rpcUrl,
-      spokeProvider.chainConfig.addresses.assetManager
-    );
-    const solToken = new web3_js.PublicKey(Buffer.from(token, "hex"));
+    const assetManagerProgramId = new web3_js.PublicKey(spokeProvider.chainConfig.addresses.assetManager);
+    const solToken = new web3_js.PublicKey(token);
     if (isNative(new web3_js.PublicKey(solToken))) {
-      const vaultNative = AssetManagerPDA.vault_native(assetManagerProgram.programId);
+      const vaultNative = AssetManagerPDA.vault_native(assetManagerProgramId);
       const balance = await spokeProvider.walletProvider.getBalance(vaultNative.pda.toBase58());
       return BigInt(balance);
     }
-    const vaultToken = AssetManagerPDA.vault_token(assetManagerProgram.programId, new web3_js.PublicKey(solToken));
+    const vaultToken = AssetManagerPDA.vault_token(assetManagerProgramId, new web3_js.PublicKey(solToken));
     const tokenAccount = await spokeProvider.walletProvider.getTokenAccountBalance(vaultToken.pda.toBase58());
     return BigInt(tokenAccount.value.amount);
   }
@@ -9881,6 +10296,12 @@ var StellarSpokeService = class _StellarSpokeService {
       raw
     );
   }
+  /**
+   * Get the balance of the token in the spoke chain asset manager.
+   * @param token - The address of the token to get the balance of.
+   * @param spokeProvider - The spoke provider.
+   * @returns The balance of the token.
+   */
   static async getDeposit(token, spokeProvider) {
     return BigInt(await spokeProvider.getBalance(token));
   }
@@ -9929,131 +10350,16 @@ var StellarSpokeService = class _StellarSpokeService {
       amount.toString(),
       viem.fromHex(recipient, "bytes"),
       viem.fromHex(data, "bytes"),
-      raw
-    );
-  }
-  static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
-    return await spokeProvider.sendMessage(
-      dstChainId.toString(),
-      viem.fromHex(dstAddress, "bytes"),
-      viem.fromHex(payload, "bytes"),
-      raw
-    );
-  }
-};
-var SuiSpokeService = class _SuiSpokeService {
-  constructor() {
-  }
-  /**
-   * Estimate the gas for a transaction.
-   * @param {SuiRawTransaction} rawTx - The raw transaction to estimate the gas for.
-   * @param {SuiSpokeProvider} spokeProvider - The spoke provider.
-   * @returns {Promise<bigint>} The estimated computation cost.
-   */
-  static async estimateGas(rawTx, spokeProvider) {
-    const txb = transactions.Transaction.fromKind(rawTx.data);
-    const result = await spokeProvider.publicClient.devInspectTransactionBlock({
-      sender: rawTx.from,
-      transactionBlock: txb
-    });
-    return result.effects.gasUsed;
-  }
-  /**
-   * Deposit tokens to the spoke chain.
-   * @param {InjectiveSpokeDepositParams} params - The parameters for the deposit, including the user's address, token address, amount, and additional data.
-   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
-   */
-  static async deposit(params, spokeProvider, hubProvider, raw) {
-    const userWallet = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      params.from,
-      hubProvider
-    );
-    return _SuiSpokeService.transfer(
-      {
-        token: params.token,
-        recipient: userWallet,
-        amount: params.amount,
-        data: params.data
-      },
-      spokeProvider,
-      raw
-    );
-  }
-  /**
-   * Get the balance of the token in the spoke chain.
-   * @param {Address} token - The address of the token to get the balance of.
-   * @param {SuiSpokeProvider} spokeProvider - The spoke provider.
-   * @returns {Promise<bigint>} The balance of the token.
-   */
-  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: viem.toHex(encoder.encode(params.token)),
-      from: encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
-      to,
-      amount: params.amount,
-      data: params.data,
-      srcAddress: viem.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.
-   * @param {Hex} payload - The payload to send to the contract.
-   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {EvmHubProvider} hubProvider - The provider for the hub chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
-   */
-  static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
-    const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
-    return _SuiSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
-  }
-  /**
-   * Transfers tokens to the hub chain.
-   * @param {SuiTransferToHubParams} params - The parameters for the transfer, including:
-   *   - {string} token: The address of the token to transfer (use address(0) for native token).
-   *   - {Uint8Array} recipient: The recipient address on the hub chain.
-   *   - {string} amount: The amount to transfer.
-   *   - {Uint8Array} [data=new Uint8Array([])]: Additional data for the transfer.
-   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
-   */
-  static async transfer({ token, recipient, amount, data = "0x" }, spokeProvider, raw) {
-    return spokeProvider.transfer(token, amount, viem.fromHex(recipient, "bytes"), viem.fromHex(data, "bytes"), raw);
-  }
-  /**
-   * Sends a message to the hub chain.
-   * @param {bigint} dstChainId - The chain ID of the hub chain.
-   * @param {HubAddress} dstAddress - The address on the hub chain.
-   * @param {Hex} payload - The payload to send.
-   * @param {SuiSpokeProvider} spokeProvider - The provider for the spoke chain.
-   * @param {boolean} raw - The return type raw or just transaction hash
-   * @returns {PromiseSuiTxReturnType<R>} A promise that resolves to the transaction hash or raw transaction base64 string.
-   */
+      raw
+    );
+  }
   static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
-    return spokeProvider.sendMessage(dstChainId, viem.fromHex(dstAddress, "bytes"), viem.fromHex(payload, "bytes"), raw);
+    return await spokeProvider.sendMessage(
+      dstChainId.toString(),
+      viem.fromHex(dstAddress, "bytes"),
+      viem.fromHex(payload, "bytes"),
+      raw
+    );
   }
 };
 var SonicSpokeService = class _SonicSpokeService {
@@ -10112,7 +10418,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");
+    invariant12__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(
@@ -10177,11 +10483,11 @@ var SonicSpokeService = class _SonicSpokeService {
       inputToken = hubProvider.chainConfig.nativeToken;
     }
     const outputToken = getHubAssetInfo(createIntentParams.dstChain, createIntentParams.outputToken)?.asset;
-    invariant11__default.default(
+    invariant12__default.default(
       inputToken,
       `hub asset not found for spoke chain token (intent.inputToken): ${createIntentParams.inputToken}`
     );
-    invariant11__default.default(
+    invariant12__default.default(
       outputToken,
       `hub asset not found for spoke chain token (intent.outputToken): ${createIntentParams.outputToken}`
     );
@@ -10244,7 +10550,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");
+    invariant12__default.default(spokeProvider instanceof SonicSpokeProvider, "[SonicSpokeService] invalid spoke provider");
     const calls = viem.decodeAbiParameters(
       [
         {
@@ -10733,11 +11039,8 @@ var SpokeService = class _SpokeService {
    */
   static async deposit(params, spokeProvider, hubProvider, raw, skipSimulation = false) {
     if (spokeProvider instanceof SonicSpokeProvider) {
-      return SonicSpokeService.deposit(
-        params,
-        spokeProvider,
-        raw
-      );
+      const _params = params;
+      return SonicSpokeService.deposit(_params, spokeProvider, raw);
     }
     if (spokeProvider instanceof EvmSpokeProvider) {
       await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
@@ -10762,7 +11065,6 @@ var SpokeService = class _SpokeService {
       );
     }
     if (spokeProvider instanceof SuiSpokeProvider) {
-      await _SpokeService.verifyDepositSimulation(params, spokeProvider, hubProvider, skipSimulation);
       return SuiSpokeService.deposit(
         params,
         spokeProvider,
@@ -10890,6 +11192,20 @@ var SpokeService = class _SpokeService {
         raw
       );
     }
+    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 });
+      }
+    }
     if (isEvmSpokeProvider(spokeProvider)) {
       await _SpokeService.verifySimulation(from, payload, spokeProvider, hubProvider, skipSimulation);
       return await EvmSpokeService.callWallet(from, payload, spokeProvider, hubProvider);
@@ -10958,19 +11274,19 @@ async function postRequest(payload, apiUrl) {
   return response.json();
 }
 async function submitTransaction(payload, apiUrl) {
-  invariant11__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant11__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant12__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant12__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
   return postRequest(payload, apiUrl);
 }
 async function getTransactionPackets(payload, apiUrl) {
-  invariant11__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant11__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant12__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant12__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
   return postRequest(payload, apiUrl);
 }
 async function getPacket(payload, apiUrl) {
-  invariant11__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
-  invariant11__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
-  invariant11__default.default(payload.params.conn_sn.length > 0, "Invalid input parameters. conn_sn empty");
+  invariant12__default.default(payload.params.chain_id.length > 0, "Invalid input parameters. source_chain_id empty");
+  invariant12__default.default(payload.params.tx_hash.length > 0, "Invalid input parameters. tx_hash empty");
+  invariant12__default.default(payload.params.conn_sn.length > 0, "Invalid input parameters. conn_sn empty");
   return postRequest(payload, apiUrl);
 }
 async function waitUntilIntentExecuted(payload) {
@@ -11101,11 +11417,11 @@ var EvmSolverService = class _EvmSolverService {
       inputToken = hubProvider.chainConfig.wrappedNativeToken;
     }
     const outputToken = getHubAssetInfo(createIntentParams.dstChain, createIntentParams.outputToken)?.asset;
-    invariant11__default.default(
+    invariant12__default.default(
       inputToken,
       `hub asset not found for spoke chain token (intent.inputToken): ${createIntentParams.inputToken}`
     );
-    invariant11__default.default(
+    invariant12__default.default(
       outputToken,
       `hub asset not found for spoke chain token (intent.outputToken): ${createIntentParams.outputToken}`
     );
@@ -11137,7 +11453,7 @@ var EvmSolverService = class _EvmSolverService {
    * @returns A tuple containing [encoded fee data, fee amount]. Fee amount will be 0n if no fee.
    */
   static createIntentFeeData(fee, inputAmount) {
-    invariant11__default.default(inputAmount > 0n, "Input amount must be greater than 0");
+    invariant12__default.default(inputAmount > 0n, "Input amount must be greater than 0");
     if (!fee) {
       return ["0x", 0n];
     }
@@ -11145,7 +11461,7 @@ var EvmSolverService = class _EvmSolverService {
     if (isPartnerFeeAmount(fee)) {
       feeAmount = fee.amount;
     } else if (isPartnerFeePercentage(fee)) {
-      invariant11__default.default(
+      invariant12__default.default(
         fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
         `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
       );
@@ -11272,23 +11588,23 @@ var SolverApiService = class {
    * }
    */
   static async getQuote(payload, config) {
-    invariant11__default.default(payload.token_src.length > 0, "Empty token_src");
-    invariant11__default.default(payload.token_src_blockchain_id.length > 0, "Empty token_src_blockchain_id");
-    invariant11__default.default(payload.token_dst.length > 0, "Empty token_dst");
-    invariant11__default.default(payload.token_dst_blockchain_id.length > 0, "Empty token_dst_blockchain_id");
-    invariant11__default.default(payload.amount > 0n, "amount must be greater than 0");
-    invariant11__default.default(
+    invariant12__default.default(payload.token_src.length > 0, "Empty token_src");
+    invariant12__default.default(payload.token_src_blockchain_id.length > 0, "Empty token_src_blockchain_id");
+    invariant12__default.default(payload.token_dst.length > 0, "Empty token_dst");
+    invariant12__default.default(payload.token_dst_blockchain_id.length > 0, "Empty token_dst_blockchain_id");
+    invariant12__default.default(payload.amount > 0n, "amount must be greater than 0");
+    invariant12__default.default(
       isValidOriginalAssetAddress(payload.token_src_blockchain_id, payload.token_src),
       "unsupported token_src for src chain"
     );
-    invariant11__default.default(
+    invariant12__default.default(
       isValidOriginalAssetAddress(payload.token_dst_blockchain_id, payload.token_dst),
       "unsupported token_dst for dst chain"
     );
     const tokenSrc = getHubAssetInfo(payload.token_src_blockchain_id, payload.token_src)?.asset;
     const tokenDst = getHubAssetInfo(payload.token_dst_blockchain_id, payload.token_dst)?.asset;
-    invariant11__default.default(tokenSrc, "hub asset not found for token_src");
-    invariant11__default.default(tokenDst, "hub asset not found for token_dst");
+    invariant12__default.default(tokenSrc, "hub asset not found for token_src");
+    invariant12__default.default(tokenDst, "hub asset not found for token_dst");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/quote`, {
         method: "POST",
@@ -11383,7 +11699,7 @@ var SolverApiService = class {
     }
   }
   static async getStatus(request, config) {
-    invariant11__default.default(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
+    invariant12__default.default(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/status`, {
         method: "POST",
@@ -12015,19 +12331,19 @@ var SolverService = class {
     fee = this.config.partnerFee,
     raw
   }) {
-    invariant11__default.default(
+    invariant12__default.default(
       isValidOriginalAssetAddress(params.srcChain, params.inputToken),
       `Unsupported spoke chain token (params.srcChain): ${params.srcChain}, params.inputToken): ${params.inputToken}`
     );
-    invariant11__default.default(
+    invariant12__default.default(
       isValidOriginalAssetAddress(params.dstChain, params.outputToken),
       `Unsupported spoke chain token (params.dstChain): ${params.dstChain}, params.outputToken): ${params.outputToken}`
     );
-    invariant11__default.default(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
-    invariant11__default.default(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
+    invariant12__default.default(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
+    invariant12__default.default(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
     try {
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      invariant11__default.default(
+      invariant12__default.default(
         params.srcAddress.toLowerCase() === walletAddress.toLowerCase(),
         "srcAddress must be the same as wallet address"
       );
@@ -12101,8 +12417,8 @@ var SolverService = class {
    */
   async cancelIntent(intent, spokeProvider, raw) {
     try {
-      invariant11__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
-      invariant11__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
+      invariant12__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
+      invariant12__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const creatorHubWalletAddress = await deriveUserWalletAddress(spokeProvider, this.hubProvider, walletAddress);
       const calls = [];
@@ -12149,7 +12465,7 @@ var SolverService = class {
    * @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");
+    invariant12__default.default(deadline > 0n, "Deadline must be greater than 0");
     const block = await this.hubProvider.publicClient.getBlock({
       includeTransactions: false,
       blockTag: "latest"
@@ -12627,7 +12943,7 @@ var IcxMigrationService = class {
   migrateData(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(types.ICON_MAINNET_CHAIN_ID, params.address);
-    invariant11__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.address}`);
+    invariant12__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.address}`);
     calls.push(
       Erc20Service.encodeApprove(assetConfig.asset, this.hubProvider.chainConfig.addresses.icxMigration, params.amount)
     );
@@ -12643,7 +12959,7 @@ var IcxMigrationService = class {
   revertMigration(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(types.ICON_MAINNET_CHAIN_ID, params.wICX);
-    invariant11__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.wICX}`);
+    invariant12__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.wICX}`);
     calls.push(
       Erc20Service.encodeApprove(
         this.hubProvider.chainConfig.addresses.sodaToken,
@@ -12739,9 +13055,9 @@ var MigrationService = class {
   async isAllowanceValid(params, action, spokeProvider) {
     try {
       if (action === "migrate") {
-        invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-        invariant11__default.default(viem.isAddress(params.to) || isIconAddress(params.to), "To address is required");
-        invariant11__default.default(
+        invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant12__default.default(viem.isAddress(params.to) || isIconAddress(params.to), "To address is required");
+        invariant12__default.default(
           isIcxMigrateParams(params) || isBalnMigrateParams(params) || isUnifiedBnUSDMigrateParams(params),
           "Invalid params"
         );
@@ -12767,9 +13083,9 @@ var MigrationService = class {
         };
       }
       if (action === "revert") {
-        invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-        invariant11__default.default(params.to.length > 0, "To address is required");
-        invariant11__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant12__default.default(params.to.length > 0, "To address is required");
+        invariant12__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
           const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
@@ -12825,9 +13141,9 @@ var MigrationService = class {
   async approve(params, action, spokeProvider, raw) {
     try {
       if (action === "migrate") {
-        invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-        invariant11__default.default(params.to.length > 0, "To address is required");
-        invariant11__default.default(isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant12__default.default(params.to.length > 0, "To address is required");
+        invariant12__default.default(isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
           const evmSpokeProvider = spokeProvider;
           const result = await Erc20Service.approve(
@@ -12848,9 +13164,9 @@ var MigrationService = class {
         };
       }
       if (action === "revert") {
-        invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-        invariant11__default.default(params.to.length > 0, "To address is required");
-        invariant11__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant12__default.default(params.to.length > 0, "To address is required");
+        invariant12__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
         if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
           const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
@@ -13262,13 +13578,13 @@ var MigrationService = class {
   async createMigratebnUSDIntent(params, spokeProvider, unchecked = false, raw) {
     try {
       if (!unchecked) {
-        invariant11__default.default(isValidSpokeChainId(params.srcChainId), "Invalid spoke source chain ID");
-        invariant11__default.default(isValidSpokeChainId(params.dstChainId), "Invalid spoke destination chain ID");
-        invariant11__default.default(params.srcbnUSD.length > 0, "Legacy bnUSD token address is required");
-        invariant11__default.default(params.dstbnUSD.length > 0, "New bnUSD token address is required");
-        invariant11__default.default(params.amount > 0, "Amount must be greater than 0");
-        invariant11__default.default(params.to.length > 0, "Recipient address is required");
-        invariant11__default.default(
+        invariant12__default.default(isValidSpokeChainId(params.srcChainId), "Invalid spoke source chain ID");
+        invariant12__default.default(isValidSpokeChainId(params.dstChainId), "Invalid spoke destination chain ID");
+        invariant12__default.default(params.srcbnUSD.length > 0, "Legacy bnUSD token address is required");
+        invariant12__default.default(params.dstbnUSD.length > 0, "New bnUSD token address is required");
+        invariant12__default.default(params.amount > 0, "Amount must be greater than 0");
+        invariant12__default.default(params.to.length > 0, "Recipient address is required");
+        invariant12__default.default(
           !(isLegacybnUSDToken(params.srcbnUSD) && isLegacybnUSDToken(params.dstbnUSD)),
           "srcbnUSD and dstbnUSD cannot both be legacy bnUSD tokens"
         );
@@ -13276,11 +13592,11 @@ var MigrationService = class {
       let migrationData;
       if (isLegacybnUSDToken(params.srcbnUSD)) {
         if (!unchecked) {
-          invariant11__default.default(
+          invariant12__default.default(
             isLegacybnUSDChainId(params.srcChainId),
             "srcChainId must be a legacy bnUSD chain (icon, sui, stellar) if srcbnUSD is a legacy bnUSD token"
           );
-          invariant11__default.default(
+          invariant12__default.default(
             isNewbnUSDChainId(params.dstChainId),
             "dstChainId must be a new bnUSD chain (all spoke chains besides Icon) if dstbnUSD is a legacy bnUSD token"
           );
@@ -13295,15 +13611,15 @@ var MigrationService = class {
         });
       } else if (isLegacybnUSDToken(params.dstbnUSD)) {
         if (!unchecked) {
-          invariant11__default.default(
+          invariant12__default.default(
             isLegacybnUSDChainId(params.dstChainId),
             "dstChainId must be a legacy bnUSD chain (sui, stellar, icon) if dstbnUSD is a legacy bnUSD token"
           );
-          invariant11__default.default(
+          invariant12__default.default(
             isNewbnUSDToken(params.srcbnUSD),
             "srcbnUSD must be a new bnUSD token if dstbnUSD is a legacy bnUSD token"
           );
-          invariant11__default.default(
+          invariant12__default.default(
             isNewbnUSDChainId(params.srcChainId),
             "srcChainId must be a new bnUSD chain (all spoke chains besides Icon) if srcbnUSD is a new bnUSD token"
           );
@@ -13376,13 +13692,13 @@ var MigrationService = class {
    */
   async createMigrateIcxToSodaIntent(params, spokeProvider, raw) {
     try {
-      invariant11__default.default(params.amount > 0, "Amount must be greater than 0");
-      invariant11__default.default(viem.isAddress(params.to), "Recipient address is required");
-      invariant11__default.default(
+      invariant12__default.default(params.amount > 0, "Amount must be greater than 0");
+      invariant12__default.default(viem.isAddress(params.to), "Recipient address is required");
+      invariant12__default.default(
         params.address.toLowerCase() === spokeProvider.chainConfig.addresses.wICX.toLowerCase() || params.address.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase(),
         "Token must be wICX or native ICX token"
       );
-      invariant11__default.default(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
+      invariant12__default.default(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
       const availableAmount = await this.icxMigration.getAvailableAmount();
       if (availableAmount < params.amount) {
         throw new Error(
@@ -13494,7 +13810,7 @@ var BnUSDMigrationService = class {
   migrateData(params) {
     const calls = [];
     const assetConfig = getHubAssetInfo(params.srcChainId, params.legacybnUSD);
-    invariant11__default.default(assetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
+    invariant12__default.default(assetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
     const bnUSDVault = getMoneyMarketConfig(types.SONIC_MAINNET_CHAIN_ID).bnUSDVault;
     calls.push(Erc20Service.encodeApprove(assetConfig.asset, assetConfig.vault, params.amount));
     calls.push(EvmVaultTokenService.encodeDeposit(assetConfig.vault, assetConfig.asset, params.amount));
@@ -13506,7 +13822,7 @@ var BnUSDMigrationService = class {
       return encodeContractCalls(calls);
     }
     const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.newbnUSD);
-    invariant11__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
+    invariant12__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
       dstAssetConfig.decimal,
@@ -13539,14 +13855,14 @@ var BnUSDMigrationService = class {
     let decimals = 18;
     if (params.newbnUSD.toLowerCase() !== bnUSDVault.toLowerCase()) {
       const assetConfig = getHubAssetInfo(params.srcChainId, params.newbnUSD);
-      invariant11__default.default(assetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
+      invariant12__default.default(assetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
       decimals = assetConfig.decimal;
       calls.push(Erc20Service.encodeApprove(assetConfig.asset, bnUSDVault, params.amount));
       calls.push(EvmVaultTokenService.encodeDeposit(bnUSDVault, assetConfig.asset, params.amount));
     }
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(decimals, params.amount);
     const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.legacybnUSD);
-    invariant11__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.legacybnUSD}`);
+    invariant12__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.legacybnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.vault, translatedAmount));
     calls.push(EvmVaultTokenService.encodeWithdraw(dstAssetConfig.vault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
@@ -13629,7 +13945,7 @@ var BalnSwapService = class {
    */
   async swapData(balnToken, params) {
     const assetConfig = getHubAssetInfo(types.ICON_MAINNET_CHAIN_ID, balnToken);
-    invariant11__default.default(assetConfig, `hub asset not found for baln token: ${balnToken}`);
+    invariant12__default.default(assetConfig, `hub asset not found for baln token: ${balnToken}`);
     const calls = [];
     calls.push(
       Erc20Service.encodeApprove(assetConfig.asset, this.hubProvider.chainConfig.addresses.balnSwap, params.amount)
@@ -13682,129 +13998,620 @@ var BalnSwapService = class {
     return await this.call(spokeProvider, unstakeTx, raw);
   }
   /**
-   * Gets detailed locks for a specific user including unstake requests and staked amounts.
+   * Gets detailed locks for a specific user including unstake requests and staked amounts.
+   *
+   * @param publicClient - The public client for reading contract state
+   * @param user - The user address
+   * @returns Array of detailed lock information for the user
+   */
+  async getDetailedUserLocks(publicClient, user) {
+    return await publicClient.readContract({
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      abi: balnSwapAbi,
+      functionName: "getDetailedUserLocks",
+      args: [user]
+    });
+  }
+  // ===== ENCODING METHODS =====
+  /**
+   * Encodes a swap transaction for the BALN swap contract.
+   *
+   * @param amount - The amount of BALN tokens to swap
+   * @param lockupPeriod - The lockup period for the swap
+   * @param to - The address that will receive the swapped SODA tokens
+   * @param stake - Whether to stake the SODA tokens
+   * @returns The encoded contract call for the swap operation
+   */
+  encodeSwap(amount, lockupPeriod, to, stake) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: balnSwapAbi,
+        functionName: "swap",
+        args: [amount, BigInt(lockupPeriod), to, stake]
+      })
+    };
+  }
+  /**
+   * Encodes a claim transaction for the BALN swap contract.
+   *
+   * @param lockId - The lock ID to claim from
+   * @returns The encoded contract call for the claim operation
+   */
+  encodeClaim(lockId) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: balnSwapAbi,
+        functionName: "claim",
+        args: [lockId]
+      })
+    };
+  }
+  /**
+   * Encodes a claim unstaked transaction for the BALN swap contract.
+   *
+   * @param lockId - The lock ID to claim unstaked tokens from
+   * @returns The encoded contract call for the claim unstaked operation
+   */
+  encodeClaimUnstaked(lockId) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: balnSwapAbi,
+        functionName: "claimUnstaked",
+        args: [lockId]
+      })
+    };
+  }
+  /**
+   * Encodes a stake transaction for the BALN swap contract.
+   *
+   * @param lockId - The lock ID to stake
+   * @returns The encoded contract call for the stake operation
+   */
+  encodeStake(lockId) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: balnSwapAbi,
+        functionName: "stake",
+        args: [lockId]
+      })
+    };
+  }
+  /**
+   * Encodes an unstake transaction for the BALN swap contract.
+   *
+   * @param lockId - The lock ID to unstake
+   * @returns The encoded contract call for the unstake operation
+   */
+  encodeUnstake(lockId) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.balnSwap,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: balnSwapAbi,
+        functionName: "unstake",
+        args: [lockId]
+      })
+    };
+  }
+  // ===== PRIVATE HELPER METHODS =====
+  /**
+   * Executes a contract call through the Sonic wallet provider.
+   * @param spokeProvider - The Sonic spoke provider
+   * @param rawTx - The raw contract call to execute
+   * @param raw - Whether to return raw transaction data
+   * @returns The transaction hash or raw transaction data
+   */
+  async call(spokeProvider, rawTx, raw) {
+    const from = await spokeProvider.walletProvider.getWalletAddress();
+    const tx = {
+      from,
+      to: rawTx.address,
+      value: rawTx.value,
+      data: rawTx.data
+    };
+    if (raw) {
+      return tx;
+    }
+    return spokeProvider.walletProvider.sendTransaction(tx);
+  }
+};
+var BridgeService = class {
+  hubProvider;
+  relayerApiEndpoint;
+  config;
+  constructor(hubProvider, relayerApiEndpoint, config = void 0) {
+    this.config = config ? config : { partnerFee: void 0 };
+    this.hubProvider = hubProvider;
+    this.relayerApiEndpoint = relayerApiEndpoint;
+  }
+  /**
+   * Get the fee for a given input amount
+   * @param {bigint} inputAmount - The amount of input tokens
+   * @returns {Promise<bigint>} The fee amount (denominated in input tokens)
+   *
+   * @example
+   * const fee: bigint = await sodax.bridge.getFee(1000000000000000n);
+   * console.log('Fee:', fee);
+   */
+  getFee(inputAmount) {
+    if (!this.config.partnerFee) {
+      return 0n;
+    }
+    return calculateFeeAmount(inputAmount, this.config.partnerFee);
+  }
+  /**
+   * Check if allowance is valid for the bridge transaction
+   * @param params - The bridge parameters
+   * @param spokeProvider - The spoke provider
+   * @returns {Promise<Result<boolean, BridgeError<'ALLOWANCE_CHECK_FAILED'>>>}
+   */
+  async isAllowanceValid({
+    params,
+    spokeProvider
+  }) {
+    try {
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      invariant12__default.default(params.srcAsset.length > 0, "Source asset is required");
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      if (spokeProvider instanceof EvmSpokeProvider) {
+        invariant12__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for EVM chain");
+        const allowanceResult = await Erc20Service.isAllowanceValid(
+          params.srcAsset,
+          params.amount,
+          walletAddress,
+          spokeProvider.chainConfig.addresses.assetManager,
+          spokeProvider
+        );
+        if (!allowanceResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: "ALLOWANCE_CHECK_FAILED",
+              error: allowanceResult.error
+            }
+          };
+        }
+        return {
+          ok: true,
+          value: allowanceResult.value
+        };
+      }
+      if (spokeProvider instanceof SonicSpokeProvider) {
+        invariant12__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for Sonic chain");
+        const userRouter = await SonicSpokeService.getUserRouter(walletAddress, spokeProvider);
+        const allowanceResult = await Erc20Service.isAllowanceValid(
+          params.srcAsset,
+          params.amount,
+          walletAddress,
+          userRouter,
+          spokeProvider
+        );
+        if (!allowanceResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: "ALLOWANCE_CHECK_FAILED",
+              error: allowanceResult.error
+            }
+          };
+        }
+        return {
+          ok: true,
+          value: allowanceResult.value
+        };
+      }
+      return {
+        ok: true,
+        value: true
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "ALLOWANCE_CHECK_FAILED",
+          error
+        }
+      };
+    }
+  }
+  /**
+   * Approve token spending for the bridge transaction
+   * @param params - The bridge parameters
+   * @param spokeProvider - The spoke provider
+   * @param raw - Whether to return raw transaction data
+   * @returns Promise<Result<TxReturnType<S, R>, BridgeError<'APPROVAL_FAILED'>>>
+   */
+  async approve({
+    params,
+    spokeProvider,
+    raw
+  }) {
+    try {
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      invariant12__default.default(params.srcAsset.length > 0, "Source asset is required");
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      if (spokeProvider instanceof EvmSpokeProvider) {
+        invariant12__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for EVM chain");
+        const result = await Erc20Service.approve(
+          params.srcAsset,
+          params.amount,
+          spokeProvider.chainConfig.addresses.assetManager,
+          spokeProvider,
+          raw
+        );
+        return {
+          ok: true,
+          value: result
+        };
+      }
+      if (spokeProvider instanceof SonicSpokeProvider) {
+        invariant12__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for Sonic chain");
+        const userRouter = await SonicSpokeService.getUserRouter(
+          walletAddress,
+          spokeProvider
+        );
+        const result = await Erc20Service.approve(params.srcAsset, params.amount, userRouter, spokeProvider, raw);
+        return {
+          ok: true,
+          value: result
+        };
+      }
+      return {
+        ok: false,
+        error: {
+          code: "APPROVAL_FAILED",
+          error: new Error("Approval only supported for EVM spoke chains")
+        }
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        ok: false,
+        error: {
+          code: "APPROVAL_FAILED",
+          error
+        }
+      };
+    }
+  }
+  /**
+   * Execute a bridge transaction to transfer tokens from one chain to another
+   * @param params - The bridge parameters including source/destination chains, assets, and recipient
+   * @param spokeProvider - The spoke provider for the source chain
+   * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
+   * @returns {Promise<Result<[SpokeTxHash, HubTxHash], BridgeError<BridgeErrorCode>>>} - Returns the transaction hashes for both spoke and hub chains or error
    *
-   * @param publicClient - The public client for reading contract state
-   * @param user - The user address
-   * @returns Array of detailed lock information for the user
-   */
-  async getDetailedUserLocks(publicClient, user) {
-    return await publicClient.readContract({
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      abi: balnSwapAbi,
-      functionName: "getDetailedUserLocks",
-      args: [user]
-    });
-  }
-  // ===== ENCODING METHODS =====
-  /**
-   * Encodes a swap transaction for the BALN swap contract.
+   * @example
+   * const result = await sodax.bridge.bridge(
+   *   {
+   *     srcChainId: '0x2105.base',
+   *     srcAsset: '0x...', // Address of the source token
+   *     amount: 1000n, // Amount to bridge (in token decimals)
+   *     dstChainId: '0x89.polygon',
+   *     dstAsset: '0x...', // Address of the destination token
+   *     recipient: '0x...', // Recipient address on destination chain
+   *     partnerFee: { address: '0x...', percentage: 0.1 } // Optional partner fee. Partner fees and denominated in vault token decimals (18)
+   *   },
+   *   spokeProvider,
+   *   30000 // Optional timeout in milliseconds (default: 60000, i.e. 60 seconds)
+   * );
    *
-   * @param amount - The amount of BALN tokens to swap
-   * @param lockupPeriod - The lockup period for the swap
-   * @param to - The address that will receive the swapped SODA tokens
-   * @param stake - Whether to stake the SODA tokens
-   * @returns The encoded contract call for the swap operation
+   * if (!result.ok) {
+   *   // Handle error
+   * }
+   *
+   * const [
+   *  spokeTxHash, // transaction hash on the source chain
+   *  hubTxHash,   // transaction hash on the hub chain
+   * ] = result.value;
+   * console.log('Bridge transaction hashes:', { spokeTxHash, hubTxHash });
    */
-  encodeSwap(amount, lockupPeriod, to, stake) {
-    return {
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: balnSwapAbi,
-        functionName: "swap",
-        args: [amount, BigInt(lockupPeriod), to, stake]
-      })
-    };
+  async bridge({
+    params,
+    spokeProvider,
+    fee = this.config.partnerFee,
+    timeout = DEFAULT_RELAY_TX_TIMEOUT
+  }) {
+    try {
+      const txResult = await this.createBridgeIntent({ params, spokeProvider, fee, raw: false });
+      if (!txResult.ok) {
+        return txResult;
+      }
+      const packetResult = await relayTxAndWaitPacket(
+        txResult.value,
+        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+        spokeProvider,
+        this.relayerApiEndpoint,
+        timeout
+      );
+      if (!packetResult.ok) {
+        return {
+          ok: false,
+          error: {
+            code: packetResult.error.code,
+            error: packetResult.error
+          }
+        };
+      }
+      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "BRIDGE_FAILED",
+          error
+        }
+      };
+    }
   }
   /**
-   * Encodes a claim transaction for the BALN swap contract.
+   * Create bridge intent only (without relaying to hub)
+   * NOTE: This method only executes the transaction on the spoke chain and creates the bridge intent
+   * In order to successfully bridge tokens, you need to:
+   * 1. Check if the allowance is sufficient using isAllowanceValid
+   * 2. Approve the appropriate contract to spend the tokens using approve
+   * 3. Create the bridge intent using this method
+   * 4. Relay the transaction to the hub and await completion using the bridge method
    *
-   * @param lockId - The lock ID to claim from
-   * @returns The encoded contract call for the claim operation
+   * @param params - The bridge parameters including source/destination chains, assets, and recipient
+   * @param spokeProvider - The spoke provider for the source chain
+   * @param raw - Whether to return the raw transaction data
+   * @returns {Promise<Result<TxReturnType<S, R>, BridgeError<BridgeErrorCode>>>} - Returns the transaction result
+   *
+   * @example
+   * const bridgeService = new BridgeService(hubProvider, relayerApiEndpoint);
+   * const result = await sodax.bridge.createBridgeIntent(
+   *   {
+   *     srcChainId: 'ethereum',
+   *     srcAsset: "0x123...", // source token address
+   *     amount: 1000000000000000000n, // 1 token in wei
+   *     dstChainId: 'polygon',
+   *     dstAsset: "0x456...", // destination token address
+   *     recipient: "0x789..." // recipient address
+   *   },
+   *   spokeProvider,
+   *   raw // Optional: true = return the raw transaction data, false = execute and return the transaction hash (default: false)
+   * );
+   *
+   * if (result.ok) {
+   *   const txHash = result.value;
+   *   console.log('Bridge intent transaction hash:', txHash);
+   * } else {
+   *   console.error('Bridge intent creation failed:', result.error);
+   * }
    */
-  encodeClaim(lockId) {
-    return {
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: balnSwapAbi,
-        functionName: "claim",
-        args: [lockId]
-      })
-    };
+  async createBridgeIntent({
+    params,
+    spokeProvider,
+    fee = this.config.partnerFee,
+    raw
+  }) {
+    try {
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      const srcAssetInfo = getHubAssetInfo(params.srcChainId, params.srcAsset);
+      const dstAssetInfo = getHubAssetInfo(params.dstChainId, params.dstAsset);
+      invariant12__default.default(srcAssetInfo, `Unsupported spoke chain (${params.srcChainId}) token: ${params.srcAsset}`);
+      invariant12__default.default(dstAssetInfo, `Unsupported spoke chain (${params.dstChainId}) token: ${params.dstAsset}`);
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      const hubWallet = await WalletAbstractionService.getUserAbstractedWalletAddress(
+        walletAddress,
+        spokeProvider,
+        this.hubProvider
+      );
+      const data = this.buildBridgeData(params, srcAssetInfo, dstAssetInfo, fee);
+      const txResult = await SpokeService.deposit(
+        {
+          from: walletAddress,
+          to: hubWallet,
+          token: params.srcAsset,
+          amount: params.amount,
+          data
+        },
+        spokeProvider,
+        this.hubProvider,
+        raw
+      );
+      return {
+        ok: true,
+        value: txResult,
+        data: {
+          address: hubWallet,
+          payload: data
+        }
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        ok: false,
+        error: {
+          code: "CREATE_BRIDGE_INTENT_FAILED",
+          error
+        }
+      };
+    }
   }
   /**
-   * Encodes a claim unstaked transaction for the BALN swap contract.
-   *
-   * @param lockId - The lock ID to claim unstaked tokens from
-   * @returns The encoded contract call for the claim unstaked operation
+   * Build the bridge transaction data for executing the bridge operation on the hub
+   * @param params - The create bridge intent parameters
+   * @param srcAssetInfo - The source asset information
+   * @param dstAssetInfo - The destination asset information
+   * @returns Hex - The encoded contract calls for the bridge operation
    */
-  encodeClaimUnstaked(lockId) {
-    return {
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: balnSwapAbi,
-        functionName: "claimUnstaked",
-        args: [lockId]
-      })
-    };
+  buildBridgeData(params, srcAssetInfo, dstAssetInfo, partnerFee) {
+    const calls = [];
+    let translatedAmount = params.amount;
+    let srcVault = params.srcAsset;
+    if (!isValidVault(srcAssetInfo.asset)) {
+      calls.push(Erc20Service.encodeApprove(srcAssetInfo.asset, srcAssetInfo.vault, params.amount));
+      calls.push(EvmVaultTokenService.encodeDeposit(srcAssetInfo.vault, srcAssetInfo.asset, params.amount));
+      translatedAmount = EvmVaultTokenService.translateIncomingDecimals(srcAssetInfo.decimal, params.amount);
+      srcVault = srcAssetInfo.vault;
+    }
+    const feeAmount = calculateFeeAmount(translatedAmount, partnerFee);
+    if (partnerFee && feeAmount > 0n) {
+      calls.push(Erc20Service.encodeTransfer(srcVault, partnerFee.address, feeAmount));
+    }
+    const withdrawAmount = translatedAmount - feeAmount;
+    let translatedWithdrawAmount = withdrawAmount;
+    if (!isValidVault(dstAssetInfo.asset)) {
+      calls.push(EvmVaultTokenService.encodeWithdraw(dstAssetInfo.vault, dstAssetInfo.asset, withdrawAmount));
+      translatedWithdrawAmount = EvmVaultTokenService.translateOutgoingDecimals(dstAssetInfo.decimal, withdrawAmount);
+    }
+    const encodedRecipientAddress = encodeAddress(params.dstChainId, params.recipient);
+    if (params.dstChainId === this.hubProvider.chainConfig.chain.id) {
+      calls.push(Erc20Service.encodeTransfer(dstAssetInfo.asset, encodedRecipientAddress, translatedWithdrawAmount));
+    } else {
+      invariant12__default.default(dstAssetInfo, `Unsupported hub chain (${params.dstChainId}) token: ${params.dstAsset}`);
+      calls.push(
+        EvmAssetManagerService.encodeTransfer(
+          dstAssetInfo.asset,
+          encodedRecipientAddress,
+          translatedWithdrawAmount,
+          this.hubProvider.chainConfig.addresses.assetManager
+        )
+      );
+    }
+    return encodeContractCalls(calls);
   }
   /**
-   * Encodes a stake transaction for the BALN swap contract.
+   * Retrieves the deposited token balance held by the asset manager on a spoke chain.
+   * This balance represents the available liquidity for bridging operations and is used to verify
+   * that the target chain has sufficient funds to complete a bridge transaction.
    *
-   * @param lockId - The lock ID to stake
-   * @returns The encoded contract call for the stake operation
+   * @param spokeProvider - The spoke provider instance
+   * @param token - The token address to query the balance for
+   * @returns {Promise<bigint>} - The token balance as a bigint value
    */
-  encodeStake(lockId) {
-    return {
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: balnSwapAbi,
-        functionName: "stake",
-        args: [lockId]
-      })
-    };
+  async getBridgeableAmount(from, to) {
+    try {
+      const fromHubAsset = getHubAssetInfo(from.xChainId, from.address);
+      const toHubAsset = getHubAssetInfo(to.xChainId, to.address);
+      invariant12__default.default(fromHubAsset, `Hub asset not found for token ${from.address} on chain ${from.xChainId}`);
+      invariant12__default.default(toHubAsset, `Hub asset not found for token ${to.address} on chain ${to.xChainId}`);
+      const [depositTokenInfo, reserves] = await Promise.all([
+        EvmVaultTokenService.getTokenInfo(fromHubAsset.vault, fromHubAsset.asset, this.hubProvider.publicClient),
+        EvmVaultTokenService.getVaultReserves(toHubAsset.vault, this.hubProvider.publicClient)
+      ]);
+      if (!isValidVault(fromHubAsset.asset) && isValidVault(toHubAsset.asset)) {
+        const fromTokenIndex2 = reserves.tokens.findIndex((t) => t.toLowerCase() === fromHubAsset.asset.toLowerCase());
+        invariant12__default.default(
+          fromTokenIndex2 !== -1,
+          `Token ${fromHubAsset.asset} not found in the vault reserves for chain ${from.xChainId}`
+        );
+        const fromTokenDepositedAmount2 = reserves.balances[fromTokenIndex2] ?? 0n;
+        const availableDeposit2 = depositTokenInfo.maxDeposit - fromTokenDepositedAmount2;
+        return {
+          ok: true,
+          value: availableDeposit2
+        };
+      }
+      if (isValidVault(fromHubAsset.asset)) {
+        const tokenIndex2 = reserves.tokens.findIndex((t) => t.toLowerCase() === toHubAsset.asset.toLowerCase());
+        invariant12__default.default(
+          tokenIndex2 !== -1,
+          `Token ${toHubAsset.asset} not found in the vault reserves for chain ${to.xChainId}`
+        );
+        const assetManagerBalance2 = reserves.balances[tokenIndex2] ?? 0n;
+        return {
+          ok: true,
+          value: assetManagerBalance2
+        };
+      }
+      const fromTokenIndex = reserves.tokens.findIndex((t) => t.toLowerCase() === fromHubAsset.asset.toLowerCase());
+      invariant12__default.default(
+        fromTokenIndex !== -1,
+        `Token ${fromHubAsset.asset} not found in the vault reserves for chain ${from.xChainId}`
+      );
+      const fromTokenDepositedAmount = reserves.balances[fromTokenIndex] ?? 0n;
+      const availableDeposit = depositTokenInfo.maxDeposit - fromTokenDepositedAmount;
+      const tokenIndex = reserves.tokens.findIndex((t) => t.toLowerCase() === toHubAsset.asset.toLowerCase());
+      invariant12__default.default(
+        tokenIndex !== -1,
+        `Token ${toHubAsset.asset} not found in the vault reserves for chain ${to.xChainId}`
+      );
+      const assetManagerBalance = reserves.balances[tokenIndex] ?? 0n;
+      return {
+        ok: true,
+        value: availableDeposit < assetManagerBalance ? availableDeposit : assetManagerBalance
+      };
+    } catch (error) {
+      console.error(error);
+      return {
+        ok: false,
+        error
+      };
+    }
   }
   /**
-   * Encodes an unstake transaction for the BALN swap contract.
-   *
-   * @param lockId - The lock ID to unstake
-   * @returns The encoded contract call for the unstake operation
+   * Check if two assets on different chains are bridgeable
+   * Two assets are bridgeable if they share the same vault on the hub chain
+   * @param from - The source X token
+   * @param to - The destination X token
+   * @param unchecked - Whether to skip the chain ID validation
+   * @returns boolean - true if assets are bridgeable, false otherwise
    */
-  encodeUnstake(lockId) {
-    return {
-      address: this.hubProvider.chainConfig.addresses.balnSwap,
-      value: 0n,
-      data: viem.encodeFunctionData({
-        abi: balnSwapAbi,
-        functionName: "unstake",
-        args: [lockId]
-      })
-    };
+  isBridgeable({
+    from,
+    to,
+    unchecked = false
+  }) {
+    try {
+      if (!unchecked) {
+        invariant12__default.default(isValidSpokeChainId(from.xChainId), `Invalid spoke chain (${from.xChainId})`);
+        invariant12__default.default(isValidSpokeChainId(to.xChainId), `Invalid spoke chain (${to.xChainId})`);
+      }
+      const srcAssetInfo = getHubAssetInfo(from.xChainId, from.address);
+      const dstAssetInfo = getHubAssetInfo(to.xChainId, to.address);
+      invariant12__default.default(srcAssetInfo, `Hub asset not found for token ${from.address} on chain ${from.xChainId}`);
+      invariant12__default.default(dstAssetInfo, `Hub asset not found for token ${to.address} on chain ${to.xChainId}`);
+      return srcAssetInfo.vault.toLowerCase() === dstAssetInfo.vault.toLowerCase();
+    } catch (error) {
+      console.error(error);
+      return false;
+    }
   }
-  // ===== PRIVATE HELPER METHODS =====
   /**
-   * Executes a contract call through the Sonic wallet provider.
-   * @param spokeProvider - The Sonic spoke provider
-   * @param rawTx - The raw contract call to execute
-   * @param raw - Whether to return raw transaction data
-   * @returns The transaction hash or raw transaction data
+   * Get all bridgeable tokens from a source token to a destination chain
+   * @param from - The source chain ID
+   * @param to - The destination chain ID
+   * @param token - The source token address
+   * @returns XToken[] - Array of bridgeable tokens on the destination chain
    */
-  async call(spokeProvider, rawTx, raw) {
-    const from = await spokeProvider.walletProvider.getWalletAddress();
-    const tx = {
-      from,
-      to: rawTx.address,
-      value: rawTx.value,
-      data: rawTx.data
-    };
-    if (raw) {
-      return tx;
+  getBridgeableTokens(from, to, token) {
+    try {
+      const srcAssetInfo = getHubAssetInfo(from, token);
+      invariant12__default.default(srcAssetInfo, `Hub asset not found for token ${token} on chain ${from}`);
+      return {
+        ok: true,
+        value: this.filterTokensWithSameVault(spokeChainConfig[to].supportedTokens, to, srcAssetInfo)
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error
+      };
     }
-    return spokeProvider.walletProvider.sendTransaction(tx);
+  }
+  filterTokensWithSameVault(tokens, to, srcAssetInfo) {
+    const bridgeableTokens = [];
+    for (const token of Object.values(tokens)) {
+      const dstAssetInfo = getHubAssetInfo(to, token.address);
+      if (dstAssetInfo && srcAssetInfo && dstAssetInfo.vault.toLowerCase() === srcAssetInfo.vault.toLowerCase()) {
+        bridgeableTokens.push({
+          ...token,
+          xChainId: to
+        });
+      }
+    }
+    return bridgeableTokens;
   }
 };
 
@@ -13817,6 +14624,8 @@ var Sodax = class {
   // Money Market service enabling cross-chain lending and borrowing
   migration;
   // ICX migration service enabling ICX migration to SODA
+  bridge;
+  // Bridge service enabling cross-chain transfers
   hubProvider;
   // hub provider for the hub chain (e.g. Sonic mainnet)
   relayerApiEndpoint;
@@ -13828,6 +14637,7 @@ var Sodax = class {
     this.solver = config && config.solver ? new SolverService(config.solver, this.hubProvider, this.relayerApiEndpoint) : new SolverService(void 0, this.hubProvider, this.relayerApiEndpoint);
     this.moneyMarket = config && config.moneyMarket ? new MoneyMarketService(config.moneyMarket, this.hubProvider, this.relayerApiEndpoint) : new MoneyMarketService(void 0, this.hubProvider, this.relayerApiEndpoint);
     this.migration = config && config.migration ? new MigrationService(this.hubProvider, config.migration) : new MigrationService(this.hubProvider);
+    this.bridge = config && config.bridge ? new BridgeService(this.hubProvider, this.relayerApiEndpoint, config.bridge) : new BridgeService(this.hubProvider, this.relayerApiEndpoint);
   }
 };
 
@@ -13894,16 +14704,16 @@ function calculateFeeAmount(inputAmount, fee) {
   if (!fee) {
     return 0n;
   }
-  invariant11__default.default(inputAmount > 0n, "Input amount must be greater than 0");
+  invariant12__default.default(inputAmount > 0n, "Input amount must be greater than 0");
   let feeAmount = 0n;
   if (isPartnerFeeAmount(fee)) {
-    invariant11__default.default(
+    invariant12__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(
+    invariant12__default.default(
       fee.percentage >= 0 && fee.percentage <= FEE_PERCENTAGE_SCALE,
       `Fee percentage must be between 0 and ${FEE_PERCENTAGE_SCALE}}`
     );
@@ -13912,8 +14722,8 @@ function calculateFeeAmount(inputAmount, fee) {
   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");
+  invariant12__default.default(amount > 0n, "Amount must be greater than 0");
+  invariant12__default.default(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
   if (quoteType === "exact_input") {
     return amount - calculateFeeAmount(amount, fee);
   }
@@ -15488,9 +16298,9 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async isAllowanceValid(params, spokeProvider) {
     try {
-      invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-      invariant11__default.default(params.token.length > 0, "Token is required");
-      invariant11__default.default(
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      invariant12__default.default(params.token.length > 0, "Token is required");
+      invariant12__default.default(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
@@ -15585,19 +16395,19 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async approve(params, spokeProvider, raw) {
     try {
-      invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-      invariant11__default.default(params.token.length > 0, "Token is required");
-      invariant11__default.default(
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      invariant12__default.default(params.token.length > 0, "Token is required");
+      invariant12__default.default(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       if (spokeProvider instanceof EvmSpokeProvider) {
-        invariant11__default.default(
+        invariant12__default.default(
           params.action === "supply" || params.action === "repay",
           "Invalid action (only supply and repay are supported on evm)"
         );
-        invariant11__default.default(viem.isAddress(params.token), "Invalid token address");
+        invariant12__default.default(viem.isAddress(params.token), "Invalid token address");
         const result = await Erc20Service.approve(
           params.token,
           params.amount,
@@ -15611,11 +16421,11 @@ var MoneyMarketService = class _MoneyMarketService {
         };
       }
       if (spokeProvider instanceof SonicSpokeProvider && spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
-        invariant11__default.default(
+        invariant12__default.default(
           params.action === "withdraw" || params.action === "borrow" || params.action === "supply" || params.action === "repay",
           "Invalid action (only withdraw, borrow, supply and repay are supported on sonic)"
         );
-        invariant11__default.default(viem.isAddress(params.token), "Invalid token address");
+        invariant12__default.default(viem.isAddress(params.token), "Invalid token address");
         if (params.action === "withdraw") {
           const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
             params.token,
@@ -15787,10 +16597,10 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   async createSupplyIntent(params, spokeProvider, raw) {
     try {
-      invariant11__default.default(params.action === "supply", "Invalid action");
-      invariant11__default.default(params.token.length > 0, "Token is required");
-      invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-      invariant11__default.default(
+      invariant12__default.default(params.action === "supply", "Invalid action");
+      invariant12__default.default(params.token.length > 0, "Token is required");
+      invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+      invariant12__default.default(
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
@@ -15952,10 +16762,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createBorrowIntent(params, spokeProvider, raw) {
-    invariant11__default.default(params.action === "borrow", "Invalid action");
-    invariant11__default.default(params.token.length > 0, "Token is required");
-    invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-    invariant11__default.default(
+    invariant12__default.default(params.action === "borrow", "Invalid action");
+    invariant12__default.default(params.token.length > 0, "Token is required");
+    invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+    invariant12__default.default(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -16088,10 +16898,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createWithdrawIntent(params, spokeProvider, raw) {
-    invariant11__default.default(params.action === "withdraw", "Invalid action");
-    invariant11__default.default(params.token.length > 0, "Token is required");
-    invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-    invariant11__default.default(
+    invariant12__default.default(params.action === "withdraw", "Invalid action");
+    invariant12__default.default(params.token.length > 0, "Token is required");
+    invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+    invariant12__default.default(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -16239,10 +17049,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * }
    */
   async createRepayIntent(params, spokeProvider, raw) {
-    invariant11__default.default(params.action === "repay", "Invalid action");
-    invariant11__default.default(params.token.length > 0, "Token is required");
-    invariant11__default.default(params.amount > 0n, "Amount must be greater than 0");
-    invariant11__default.default(
+    invariant12__default.default(params.action === "repay", "Invalid action");
+    invariant12__default.default(params.token.length > 0, "Token is required");
+    invariant12__default.default(params.amount > 0n, "Amount must be greater than 0");
+    invariant12__default.default(
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
@@ -16295,7 +17105,7 @@ var MoneyMarketService = class _MoneyMarketService {
   buildSupplyData(token, to, amount, spokeChainId) {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
-    invariant11__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
+    invariant12__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
     let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const lendingPool = this.config.lendingPool;
@@ -16326,13 +17136,13 @@ var MoneyMarketService = class _MoneyMarketService {
    * @returns {Hex} The transaction data.
    */
   buildBorrowData(from, to, token, amount, spokeChainId) {
-    invariant11__default.default(isValidSpokeChainId(spokeChainId), `Invalid spokeChainId: ${spokeChainId}`);
-    invariant11__default.default(
+    invariant12__default.default(isValidSpokeChainId(spokeChainId), `Invalid spokeChainId: ${spokeChainId}`);
+    invariant12__default.default(
       isValidOriginalAssetAddress(spokeChainId, token),
       `Unsupported spoke chain (${spokeChainId}) token: ${token}`
     );
     const assetConfig = getHubAssetInfo(spokeChainId, token);
-    invariant11__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
+    invariant12__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
     let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;
@@ -16660,6 +17470,7 @@ exports.BalnSwapService = BalnSwapService;
 exports.BigIntToHex = BigIntToHex;
 exports.BigNumberZeroDecimal = BigNumberZeroDecimal;
 exports.BnUSDMigrationService = BnUSDMigrationService;
+exports.BridgeService = BridgeService;
 exports.ChainIdToIntentRelayChainId = ChainIdToIntentRelayChainId;
 exports.DEFAULT_DEADLINE_OFFSET = DEFAULT_DEADLINE_OFFSET;
 exports.DEFAULT_MAX_RETRY = DEFAULT_MAX_RETRY;
@@ -16701,6 +17512,9 @@ exports.RAY_DECIMALS = RAY_DECIMALS;
 exports.SECONDS_PER_YEAR = SECONDS_PER_YEAR;
 exports.STELLAR_DEFAULT_TX_TIMEOUT_SECONDS = STELLAR_DEFAULT_TX_TIMEOUT_SECONDS;
 exports.STELLAR_PRIORITY_FEE = STELLAR_PRIORITY_FEE;
+exports.SodaTokens = SodaTokens;
+exports.SodaTokensAsHubAssets = SodaTokensAsHubAssets;
+exports.SodaVaultTokensSet = SodaVaultTokensSet;
 exports.Sodax = Sodax;
 exports.SolanaSpokeProvider = SolanaSpokeProvider;
 exports.SolverIntentErrorCode = SolverIntentErrorCode;
@@ -16711,6 +17525,7 @@ exports.SonicSpokeService = SonicSpokeService;
 exports.SpokeService = SpokeService;
 exports.StellarSpokeProvider = StellarSpokeProvider;
 exports.SuiSpokeProvider = SuiSpokeProvider;
+exports.SuiSpokeService = SuiSpokeService;
 exports.SupportedMigrationTokens = SupportedMigrationTokens;
 exports.USD_DECIMALS = USD_DECIMALS;
 exports.UiPoolDataProviderService = UiPoolDataProviderService;
@@ -16758,12 +17573,15 @@ exports.getCompoundedBalance = getCompoundedBalance;
 exports.getEvmViemChain = getEvmViemChain;
 exports.getHubAssetInfo = getHubAssetInfo;
 exports.getHubChainConfig = getHubChainConfig;
+exports.getHubVaultTokenByAddress = getHubVaultTokenByAddress;
 exports.getIconAddressBytes = getIconAddressBytes;
 exports.getIntentRelayChainId = getIntentRelayChainId;
 exports.getLinearBalance = getLinearBalance;
 exports.getMarketReferenceCurrencyAndUsdBalance = getMarketReferenceCurrencyAndUsdBalance;
 exports.getMoneyMarketConfig = getMoneyMarketConfig;
 exports.getOriginalAssetAddress = getOriginalAssetAddress;
+exports.getOriginalAssetInfoFromVault = getOriginalAssetInfoFromVault;
+exports.getOriginalTokenFromOriginalAssetAddress = getOriginalTokenFromOriginalAssetAddress;
 exports.getPacket = getPacket;
 exports.getRandomBytes = getRandomBytes;
 exports.getReserveNormalizedIncome = getReserveNormalizedIncome;
@@ -16777,6 +17595,7 @@ exports.getTransactionPackets = getTransactionPackets;
 exports.hexToBigInt = hexToBigInt;
 exports.hubAssetToOriginalAssetMap = hubAssetToOriginalAssetMap;
 exports.hubAssets = hubAssets;
+exports.hubVaultTokensMap = hubVaultTokensMap;
 exports.hubVaults = hubVaults;
 exports.hubVaultsAddressSet = hubVaultsAddressSet;
 exports.intentRelayChainIdToSpokeChainIdMap = intentRelayChainIdToSpokeChainIdMap;
@@ -16823,6 +17642,7 @@ exports.isPartnerFeeAmount = isPartnerFeeAmount;
 exports.isPartnerFeePercentage = isPartnerFeePercentage;
 exports.isResponseAddressType = isResponseAddressType;
 exports.isResponseSigningType = isResponseSigningType;
+exports.isSodaVaultToken = isSodaVaultToken;
 exports.isSolanaSpokeProvider = isSolanaSpokeProvider;
 exports.isSolverSupportedToken = isSolverSupportedToken;
 exports.isSonicSpokeProvider = isSonicSpokeProvider;
@@ -16834,6 +17654,7 @@ exports.isValidHubAsset = isValidHubAsset;
 exports.isValidIntentRelayChainId = isValidIntentRelayChainId;
 exports.isValidOriginalAssetAddress = isValidOriginalAssetAddress;
 exports.isValidSpokeChainId = isValidSpokeChainId;
+exports.isValidVault = isValidVault;
 exports.isWaitUntilIntentExecutedFailed = isWaitUntilIntentExecutedFailed;
 exports.moneyMarketReserveAssets = moneyMarketReserveAssets;
 exports.moneyMarketReserveHubAssetsSet = moneyMarketReserveHubAssetsSet;
@@ -16862,6 +17683,7 @@ exports.spokeChainIdsSet = spokeChainIdsSet;
 exports.submitTransaction = submitTransaction;
 exports.supportedHubAssets = supportedHubAssets;
 exports.supportedHubChains = supportedHubChains;
+exports.supportedSodaAssets = supportedSodaAssets;
 exports.supportedSpokeChains = supportedSpokeChains;
 exports.supportedTokensPerChain = supportedTokensPerChain;
 exports.uiPoolDataAbi = uiPoolDataAbi;