@sodax/sdk 0.0.1-rc.10 → 0.0.1-rc.12

package/dist/index.cjs

@@ -5103,6 +5103,8 @@ var DEFAULT_RETRY_DELAY_MS = 2e3;
 var ICON_TX_RESULT_WAIT_MAX_RETRY = 10;
 var MAX_UINT256 = (1n << 256n) - 1n;
 var FEE_PERCENTAGE_SCALE = 10000n;
+var STELLAR_PRIORITY_FEE = "10000";
+var STELLAR_DEFAULT_TX_TIMEOUT_SECONDS = 100;
 var VAULT_TOKEN_DECIMALS = 18;
 var INTENT_RELAY_CHAIN_IDS = {
   AVAX: 6n,
@@ -5187,7 +5189,9 @@ var hubChainConfig = {
     addresses: {
       assetManager: "0x60c5681bD1DB4e50735c4cA3386005A4BA4937C0",
       hubWallet: "0xA0ed3047D358648F2C0583B415CffCA571FDB544",
-      xTokenManager: "0x5bD2843de9D6b0e6A05d0FB742072274EA3C6CA3"
+      xTokenManager: "0x5bD2843de9D6b0e6A05d0FB742072274EA3C6CA3",
+      icxMigration: "0x8Af7cae2c8377BEDD8820A5ad096AaFA29D839cc",
+      sodaToken: "0x8515352CB9832D1d379D52366D1E995ADd358420"
     },
     nativeToken: "0x0000000000000000000000000000000000000000",
     supportedTokens: []
@@ -5237,6 +5241,12 @@ var spokeChainConfig = {
         name: "Wrapped Sonic",
         decimals: 18,
         address: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38"
+      },
+      SODA: {
+        symbol: "SODA",
+        name: "SODAX",
+        decimals: 18,
+        address: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963"
       }
     }
   },
@@ -5272,8 +5282,8 @@ var spokeChainConfig = {
       }
     },
     gasPrice: "500000",
-    rpcUrl: "https://api.mainnet-beta.solana.com",
-    wsUrl: "https://api.mainnet-beta.solana.com",
+    rpcUrl: "https://solana-mainnet.g.alchemy.com/v2/i3q5fE3cYSFBE4Lcg1kS5",
+    wsUrl: "https://solana-mainnet.g.alchemy.com/v2/i3q5fE3cYSFBE4Lcg1kS5",
     walletAddress: ""
   },
   [types.AVALANCHE_MAINNET_CHAIN_ID]: {
@@ -5367,12 +5377,6 @@ var spokeChainConfig = {
         decimals: 18,
         address: "0xA256dd181C3f6E5eC68C6869f5D50a712d47212e"
       },
-      WETH: {
-        symbol: "WETH",
-        name: "Wrapped Ether",
-        decimals: 18,
-        address: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
-      },
       wstETH: {
         symbol: "wstETH",
         name: "Wrapped stETH",
@@ -5664,9 +5668,10 @@ var spokeChainConfig = {
     },
     nativeToken: "CAS3J7GYLGXMF6TDJBBYYSE3HQ6BBSMLNUQ34T6TZMYMW2EVH34XOWMA",
     bnUSD: "CD6YBFFWMU2UJHX2NGRJ7RN76IJVTCC7MRA46DUBXNB7E6W7H7JRJ2CX",
-    rpc_url: "https://rpc.ankr.com/stellar_soroban",
+    horizonRpcUrl: "https://horizon.stellar.org",
+    sorobanRpcUrl: "https://rpc.ankr.com/stellar_soroban",
     chain: {
-      name: "soroban-mainnet",
+      name: "Stellar",
       id: types.STELLAR_MAINNET_CHAIN_ID,
       type: "STELLAR"
     }
@@ -5697,6 +5702,42 @@ var spokeChainConfig = {
         name: "USD Coin",
         decimals: 6,
         address: "0xdba34672e30cb065b1f93e3ab55318768fd6fef66c15942c9f7cb846e2f900e7::usdc::USDC"
+      },
+      afSUI: {
+        symbol: "afSUI",
+        name: "Aftermath Staked Sui",
+        decimals: 9,
+        address: "0xf325ce1300e8dac124071d3152c5c5ee6174914f8bc2161e88329cf579246efc::afsui::AFSUI"
+      },
+      mSUI: {
+        symbol: "mSUI",
+        name: "Mirai Staked SUI",
+        decimals: 9,
+        address: "0x922d15d7f55c13fd790f6e54397470ec592caa2b508df292a2e8553f3d3b274f::msui::MSUI"
+      },
+      haSUI: {
+        symbol: "haSUI",
+        name: "haSUI",
+        decimals: 9,
+        address: "0xbde4ba4c2e274a60ce15c1cfff9e5c42e41654ac8b6d906a57efa4bd3c29f47d::hasui::HASUI"
+      },
+      vSUI: {
+        symbol: "vSUI",
+        name: "Volo Staked SUI",
+        decimals: 9,
+        address: "0x549e8b69270defbfafd4f94e17ec44cdbdd99820b33bda2278dea3b9a32d3f55::cert::CERT"
+      },
+      yapSUI: {
+        symbol: "yapSUI",
+        name: "Yap Staked SUI",
+        decimals: 9,
+        address: "0x83f1bb8c91ecd1fd313344058b0eed94d63c54e41d8d1ae5bff1353443517d65::yap_sui::YAP_SUI"
+      },
+      trevinSUI: {
+        symbol: "trevinSUI",
+        name: "Trevin Staked SUI",
+        decimals: 9,
+        address: "0x502867b177303bf1bf226245fcdd3403c177e78d175a55a56c0602c7ff51c7fa::trevin_sui::TREVIN_SUI"
       }
     },
     nativeToken: "0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI",
@@ -5712,7 +5753,8 @@ var spokeChainConfig = {
     addresses: {
       assetManager: "cx1be33c283c7dc7617181d1b21a6a2309e71b1ee7",
       connection: "cxe5cdf3b0f26967b0efc72d470d57bbf534268f94",
-      rateLimit: "cxbbdcea9e6757023a046067ba8daa3c4c50304358"
+      rateLimit: "cxbbdcea9e6757023a046067ba8daa3c4c50304358",
+      wICX: "cx3975b43d260fb8ec802cef6e60c2f4d07486f11d"
     },
     chain: {
       id: types.ICON_MAINNET_CHAIN_ID,
@@ -5744,6 +5786,201 @@ 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: {
+    address: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x654DdDf32a9a2aC53f5FB54bf1e93F66791f8047",
+      "0xddf6AD38F9C9451C1F4cDf369040F6869e37393e",
+      "0x1559B52d2e165da1505a542EA37C543c9137f52a"
+    ]
+  },
+  sodaS: {
+    address: "0x62ecc3eeb80a162c57624b3ff80313fe69f5203e",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x039e2fb66102314ce7b64ce5ce3e5183bc94ad38"
+    ]
+  },
+  sodaNIBI: {
+    address: "0xc6c85287a8b173a509c2f198bb719a8a5a2d0c68",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0xe0064414c2c1a636a9424c7a17d86fbf7fd3f190"
+    ]
+  },
+  sodaPOL: {
+    address: "0x208ed38f4783328aa9ebfec360d32e7520a9b779",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x9ee17486571917837210824b0d4cadfe3b324d12"
+    ]
+  },
+  bnUSD: {
+    address: "0xe801ca34e19abcbfea12025378d19c4fbe250131",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0xabbb91c0617090f0028bdc27597cd0d038f3a833",
+      "0xbdf1f453fcb61424011bbddcb96cfdb30f3fe876",
+      "0x94dc79ce9c515ba4ae4d195da8e6ab86c69bfc38",
+      "0x5ce6c1c51ff762cf3acd21396257046f694168b6",
+      "0xdf5639d91359866f266b56d60d98ede9feedd100",
+      "0x238384ae2b4f0ec189ecb5031859ba306b2679c5",
+      "0x419ca9054e44e94ceab52846ecdc3997439bbca6",
+      "0x18f85f9e80ff9496eebd5979a051af16ce751567",
+      "0x289cda1043b4ce26bdca3c12e534f56b24308a5b",
+      "0x23225ab8e63fca4070296678cb46566d57e1bbe3",
+      "0x14c65b1cdc0b821569081b1f77342da0d0cbf439",
+      "0xdf23097b9aeb917bf8fb70e99b6c528fffa35364",
+      "0x11b93c162aabffd026539bb3b9f9ec22c8b7ef8a",
+      "0x69425ffb14704124a58d6f69d510f74a59d9a5bc",
+      "0x9d4b663eb075d2a1c7b8eaefb9eccc0510388b51"
+    ]
+  },
+  sodaSODA: {
+    // SODA SODA vault
+    address: "0x21685e341de7844135329914be6bd8d16982d834",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x7c7d53eecda37a87ce0d5bf8e0b24512a48dc963"
+      // SODA SODA hub asset
+    ]
+  },
+  sodaAVAX: {
+    // SODA AVAX vault
+    address: "0x14238d267557e9d799016ad635b53cd15935d290",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0xc9e4f0b6195f389d9d2b639f2878b7674eb9d8cd"
+      // AvalancheAVAX hub asset
+    ]
+  },
+  sodaBNB: {
+    // SODA BNB vault
+    address: "0x40cd41b35db9e5109ae7e54b44de8625db320e6b",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x13b70564b1ec12876b20fab5d1bb630311312f4f"
+      // BSC BNB hub asset
+    ]
+  },
+  sodaETH: {
+    // SODA ETH vault
+    address: "0x4effb5813271699683c25c734f4dabc45b363709",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x70178089842be7f8e4726b33f0d1569db8021faa",
+      // BASE ETH hub asset
+      "0xad332860dd3b6f0e63f4f66e9457900917ac78cd",
+      // Optimism ETH hub asset
+      "0xdcd9578b51ef55239b6e68629d822a8d97c95b86",
+      // Arbitrum ETH hub asset
+      "0x57fc2ac5701e463ae261adbd6c99fbeb48ce5293",
+      // BSC ETH hub asset
+      "0x50c42deacd8fc9773493ed674b675be577f2634b"
+      // Sonic WETH hub asset
+    ]
+  },
+  sodaBTC: {
+    // SODA BTC vault
+    address: "0x7a1a5555842ad2d0ed274d09b5c4406a95799d5d",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x2803a23a3ba6b09e57d1c71dec0d9efdbb00a27f",
+      // BASE cbBTC hub asset,
+      "0xfb0acb1b2720b620935f50a6dd3f7fea52b2fcbe",
+      // Arbitrum wBTC hub asset
+      "0x96fc8540736f1598b7e235e6de8814062b3b5d3b",
+      // Arbitrum tBTC hub asset,
+      "0xd8a24c71fea5bb81c66c01e532de7d9b11e13905"
+      // BSC BTCB hub asset
+    ]
+  },
+  sodaSUI: {
+    // SODA SUI vault
+    address: "0xdc5b4b00f98347e95b9f94911213dab4c687e1e3",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x4676b2a551b25c04e235553c1c81019337384673"
+      // SUI SUI hub asset
+    ]
+  },
+  sodaINJ: {
+    // SODA INJ vault
+    address: "0x1f22279c89b213944b7ea41dacb0a868ddcdfd13",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0xd375590b4955f6ea5623f799153f9b787a3bd319"
+      // Injective INJ hub asset
+    ]
+  },
+  sodaXLM: {
+    // SODA XLM vault
+    address: "0x6bc8c37cba91f76e68c9e6d689a9c21e4d32079b",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x8ac68af223907fb1b893086601a3d99e00f2fa9d"
+      // Stellar XLM hub asset
+    ]
+  },
+  sodaSOL: {
+    // SODA SOL vault
+    address: "0xdea692287e2ce8cb08fa52917be0f16b1dacdc87",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x0c09e69a4528945de6d16c7e469dea6996fdf636"
+      // Solana SOL hub asset
+    ]
+  },
+  sodaUSDT: {
+    // SODA USDT vault
+    address: "0xbdf1f453fcb61424011bbddcb96cfdb30f3fe876",
+    reserves: [
+      // hub asset addresses contained in the vault
+      "0x41fd5c169e014e2a657b9de3553f7a7b735fe47a",
+      "0xc168067d95109003805ac865ae556e8476dc69bc",
+      "0x3c0a80c6a1110fc80309382b3989ec626c135ee9",
+      "0x6047828dc181963ba44974801ff68e538da5eaf9"
+      // Sonic USDT
+    ]
+  },
+  sodaUSDC: {
+    address: "0xabbb91c0617090f0028bdc27597cd0d038f3a833",
+    reserves: [
+      "0x41abf4b1559ff709ef8150079bcb26db1fffd117",
+      "0x72e852545b024ddcbc5b70c1bcbdaa025164259c",
+      "0xb7c213cbd24967de9838fa014668fddb338f724b",
+      "0xdb7bda65c3a1c51d64dc4444e418684677334109",
+      "0xa36893ba308b332fdebfa95916d1df3a2e3cf8b3",
+      "0x29219dd400f2bf60e5a23d13be72b486d4038894",
+      "0x5635369c8a29a081d26c2e9e28012fca548ba0cb",
+      "0x3d73437dd81b3f9ec82752beb1752f03a8531710",
+      "0x4bc1211faa06fb50ff61a70331f56167ae511057",
+      "0x348007b53f25a9a857ab8ea81ec9e3ccbcf440f2",
+      "0xc3f020057510ffe10ceb882e1b48238b43d78a5e",
+      "0x9d58508ad10d34048a11640735ca5075bba07b35"
+    ]
+  }
+};
 var hubAssets = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].nativeToken]: {
@@ -5751,35 +5988,42 @@ var hubAssets = {
       decimal: 18,
       symbol: "S",
       name: "Sonic",
-      vault: "0x62ecc3Eeb80a162c57624B3fF80313FE69f5203e"
+      vault: hubVaults.sodaS.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic.address]: {
       asset: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
       decimal: 18,
       symbol: "wSonic",
       name: "Sonic",
-      vault: "0x62ecc3Eeb80a162c57624B3fF80313FE69f5203e"
+      vault: hubVaults.sodaS.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH.address]: {
       asset: "0x50c42dEAcD8Fc9773493ED674b675bE577f2634b",
       decimal: 18,
       symbol: "WETH",
       name: "Wrapped Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
       decimal: 6,
       symbol: "USDC ",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
       asset: "0x6047828dc181963ba44974801ff68e538da5eaf9",
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
-      vault: "0xbDf1F453FCB61424011BBDDCB96cFDB30f3Fe876"
+      vault: hubVaults.sodaUSDT.address
+    },
+    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.SODA.address]: {
+      asset: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963",
+      decimal: 18,
+      symbol: "SODA",
+      name: "SODA",
+      vault: hubVaults.sodaSODA.address
     }
   },
   [types.AVALANCHE_MAINNET_CHAIN_ID]: {
@@ -5788,28 +6032,28 @@ var hubAssets = {
       decimal: 18,
       symbol: "AVAX",
       name: "AVAX",
-      vault: "0x14238D267557E9d799016ad635B53CD15935d290"
+      vault: hubVaults.sodaAVAX.address
     },
     [spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
       asset: "0x41Fd5c169e014e2A657B9de3553f7a7b735Fe47A",
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
-      vault: "0xbDf1F453FCB61424011BBDDCB96cFDB30f3Fe876"
+      vault: hubVaults.sodaUSDT.address
     },
     [spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x41abF4B1559FF709Ef8150079BcB26DB1Fffd117",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x289cDa1043b4Ce26BDCa3c12E534f56b24308A5B",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     }
   },
   [types.ARBITRUM_MAINNET_CHAIN_ID]: {
@@ -5818,56 +6062,58 @@ var hubAssets = {
       decimal: 18,
       symbol: "ETH",
       name: "Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.WBTC.address]: {
       asset: "0xfB0ACB1b2720B620935F50a6dd3F7FEA52b2FCBe",
       decimal: 8,
       symbol: "WBTC",
       name: "Wrapped Bitcoin",
-      vault: "0x7A1A5555842Ad2D0eD274d09b5c4406a95799D5d"
+      vault: hubVaults.sodaBTC.address
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.weETH.address]: {
       asset: "0x08D5cf039De35627fD5C0f48B8AF4a1647a462E8",
       decimal: 18,
       symbol: "weETH",
       name: "Wrapped eETH",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.wstETH.address]: {
       asset: "0x2D5A7837D68b0c2CC4b14C2af2a1F0Ef420DDDc5",
       decimal: 18,
       symbol: "wstETH",
       name: "Wrapped Staked Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.tBTC.address]: {
       asset: "0x96Fc8540736f1598b7E235e6dE8814062b3b5d3B",
       decimal: 18,
       symbol: "tBTC",
       name: "Arbitrum tBTC",
-      vault: "0x7A1A5555842Ad2D0eD274d09b5c4406a95799D5d"
+      vault: hubVaults.sodaBTC.address
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
       asset: "0x3C0a80C6a1110fC80309382b3989eC626c135eE9",
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
-      vault: "0xbDf1F453FCB61424011BBDDCB96cFDB30f3Fe876"
+      vault: hubVaults.sodaUSDT.address
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0xdB7BdA65c3a1C51D64dC4444e418684677334109",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x419cA9054E44E94ceAb52846eCdC3997439BBcA6",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     }
   },
   [types.BASE_MAINNET_CHAIN_ID]: {
@@ -5876,42 +6122,44 @@ var hubAssets = {
       decimal: 18,
       symbol: "ETH",
       name: "Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.cbBTC.address]: {
       asset: "0x2803a23a3BA6b09e57D1c71deC0D9eFdBB00A27F",
       decimal: 8,
       symbol: "cbBTC",
       name: "Coinbase Wrapped BTC",
-      vault: "0x7A1A5555842Ad2D0eD274d09b5c4406a95799D5d"
+      vault: hubVaults.sodaBTC.address
     },
     [spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x72E852545B024ddCbc5b70C1bCBDAA025164259C",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0xDF5639D91359866f266b56D60d98edE9fEEDd100",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.weETH.address]: {
       asset: "0x55e0ad45eb97493b3045eee417fb6726cb85dfd4",
       decimal: 18,
       symbol: "weETH",
       name: "Wrapped eETH",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     },
     [spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.wstETH.address]: {
       asset: "0x494aaeaefdf5964d4ed400174e8c5b98c00957aa",
       decimal: 18,
       symbol: "wstETH",
       name: "Wrapped Staked Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     }
   },
   [types.OPTIMISM_MAINNET_CHAIN_ID]: {
@@ -5920,42 +6168,44 @@ var hubAssets = {
       decimal: 18,
       symbol: "ETH",
       name: "Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x238384AE2b4F0EC189ecB5031859bA306B2679c5",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0xb7C213CbD24967dE9838fa014668FDDB338f724B",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.wstETH.address]: {
       asset: "0x61e26f611090CdC6bc79A7Bf156b0fD10f1fC212",
       decimal: 18,
       symbol: "wstETH",
       name: "Wrapped Staked Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     },
     [spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH.address]: {
       asset: "0xE121c0Dc2B33c00ff31ee3D902D248cc3f19Ea50",
       decimal: 18,
       symbol: "weETH",
       name: "Wrapped eETH",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: "0x"
+      // no vault yet
     },
     [spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
       asset: "0xc168067d95109003805aC865ae556e8476DC69bc",
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
-      vault: "0xbDf1F453FCB61424011BBDDCB96cFDB30f3Fe876"
+      vault: hubVaults.sodaUSDT.address
     }
   },
   [types.NIBIRU_MAINNET_CHAIN_ID]: {
@@ -5964,14 +6214,14 @@ var hubAssets = {
       decimal: 18,
       symbol: "NIBI",
       name: "Nibiru",
-      vault: "0xc6c85287a8b173A509C2F198bB719A8a5a2d0C68"
+      vault: hubVaults.sodaNIBI.address
     },
     [spokeChainConfig[types.NIBIRU_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x11b93C162aABFfD026539bb3B9F9eC22c8b7ef8a",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     }
   },
   [types.BSC_MAINNET_CHAIN_ID]: {
@@ -5980,35 +6230,35 @@ var hubAssets = {
       decimal: 18,
       symbol: "BNB",
       name: "BNB",
-      vault: "0x40Cd41b35DB9e5109ae7E54b44De8625dB320E6b"
+      vault: hubVaults.sodaBNB.address
     },
     [spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.ETHB.address]: {
       asset: "0x57fC2aC5701e463ae261AdBd6C99FBeB48Ce5293",
       decimal: 18,
       symbol: "ETHB",
       name: "Wrapped Ethereum",
-      vault: "0x4effB5813271699683C25c734F4daBc45B363709"
+      vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.BTCB.address]: {
       asset: "0xD8A24c71FEa5bB81c66C01e532dE7d9B11e13905",
       decimal: 18,
       symbol: "BTCB",
       name: "Wrapped Bitcoin",
-      vault: "0x7A1A5555842Ad2D0eD274d09b5c4406a95799D5d"
+      vault: hubVaults.sodaBTC.address
     },
     [spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x5Ce6C1c51ff762cF3acD21396257046f694168b6",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.BSC_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x9d58508ad10d34048a11640735ca5075bba07b35",
       decimal: 18,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     }
   },
   [types.POLYGON_MAINNET_CHAIN_ID]: {
@@ -6017,21 +6267,21 @@ var hubAssets = {
       decimal: 18,
       symbol: "MATIC",
       name: "Polygon",
-      vault: "0x0000000000000000000000000000000000000000"
+      vault: hubVaults.sodaPOL.address
     },
     [spokeChainConfig[types.POLYGON_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x18f85f9E80ff9496EeBD5979a051AF16Ce751567",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.POLYGON_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0xa36893ba308b332FDEbfa95916D1dF3a2e3CF8B3",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     }
   },
   [types.INJECTIVE_MAINNET_CHAIN_ID]: {
@@ -6040,21 +6290,21 @@ var hubAssets = {
       decimal: 18,
       symbol: "INJ",
       name: "Injective",
-      vault: "0x1f22279C89B213944b7Ea41daCB0a868DdCDFd13"
+      vault: hubVaults.sodaINJ.address
     },
     [spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x69425FFb14704124A58d6F69d510f74A59D9a5bC",
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x4bc1211faa06fb50ff61a70331f56167ae511057",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     }
   },
   [types.STELLAR_MAINNET_CHAIN_ID]: {
@@ -6063,21 +6313,21 @@ var hubAssets = {
       decimal: 7,
       symbol: "XLM",
       name: "Stellar Lumens",
-      vault: "0x6BC8C37cba91F76E68C9e6d689A9C21E4d32079B"
+      vault: hubVaults.sodaXLM.address
     },
     [spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x23225Ab8E63FCa4070296678cb46566d57E1BBe3",
       decimal: 7,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x348007B53F25A9A857aB8eA81ec9E3CCBCf440f2",
       decimal: 7,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xAbbb91c0617090F0028BDC27597Cd0D038F3A833"
+      vault: hubVaults.sodaUSDC.address
     }
   },
   [types.SUI_MAINNET_CHAIN_ID]: {
@@ -6086,44 +6336,92 @@ var hubAssets = {
       decimal: 9,
       symbol: "SUI",
       name: "Sui",
-      vault: "0xdc5B4b00F98347E95b9F94911213DAB4C687e1e3"
+      vault: hubVaults.sodaSUI.address
     },
     [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0xDf23097B9AEb917Bf8fb70e99b6c528fffA35364",
       decimal: 9,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
       asset: "0x5635369c8a29A081d26C2e9e28012FCa548BA0Cb",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xdc5B4b00F98347E95b9F94911213DAB4C687e1e3"
+      vault: hubVaults.sodaUSDC.address
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.afSUI.address]: {
+      asset: "0x039666bd0cbc96a66c40e8541af465beaa81aa7e",
+      decimal: 9,
+      symbol: "afSUI",
+      name: "afSUI",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.mSUI.address]: {
+      asset: "0xb202c674c9a79b5681e981ba0daa782b3ceeebbe",
+      decimal: 9,
+      symbol: "mSUI",
+      name: "mSUI",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.haSUI.address]: {
+      asset: "0x67a26d11fce15e8b33ac97230d36cae1c52c35e7",
+      decimal: 9,
+      symbol: "haSUI",
+      name: "haSUI",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.vSUI.address]: {
+      asset: "0x025715bcda08db06c795cd5bf944e2081468d99a",
+      decimal: 9,
+      symbol: "vSUI",
+      name: "vSUI",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.yapSUI.address]: {
+      asset: "0xac509404f3a3ca3f7766baf65be45a52b1cfccd7",
+      decimal: 9,
+      symbol: "yapSUI",
+      name: "yapSUI",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.trevinSUI.address]: {
+      asset: "0x514569c788b096595672e0f68ec72387a22ac67b",
+      decimal: 9,
+      symbol: "trevinSUI",
+      name: "trevinSUI",
+      vault: "0x"
+      // no vault yet
     }
   },
   [types.SOLANA_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.SOL.address]: {
       asset: "0x0c09e69a4528945de6d16c7e469dea6996fdf636",
       decimal: 9,
-      symbol: "USDC",
-      name: "USD Coin",
-      vault: "0xdEa692287E2cE8Cb08FA52917Be0F16b1DACDC87"
+      symbol: "SOL",
+      name: "Solana",
+      vault: hubVaults.sodaSOL.address
     },
     [spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].bnUSD]: {
       asset: "0x14C65b1CDc0B821569081b1F77342dA0D0CbF439",
       decimal: 9,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      vault: hubVaults.bnUSD.address
     },
     [spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
-      asset: "0x0c09e69a4528945de6d16c7e469dea6996fdf636",
+      asset: "0xC3f020057510ffE10Ceb882e1B48238b43d78a5e",
       decimal: 6,
       symbol: "USDC",
       name: "USD Coin",
-      vault: "0xdEa692287E2cE8Cb08FA52917Be0F16b1DACDC87"
+      vault: hubVaults.sodaUSDC.address
     }
   },
   [types.ICON_MAINNET_CHAIN_ID]: {
@@ -6132,6 +6430,14 @@ var hubAssets = {
       decimal: 18,
       symbol: "ICX",
       name: "ICON",
+      vault: "0x"
+      // no vault yet
+    },
+    [spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].addresses.wICX]: {
+      asset: "0xb66cB7D841272AF6BaA8b8119007EdEE35d2C24F",
+      decimal: 18,
+      symbol: "wICX",
+      name: "ICON",
       vault: "0x0000000000000000000000000000000000000000"
     },
     [spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].bnUSD]: {
@@ -6139,7 +6445,7 @@ var hubAssets = {
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51"
+      vault: hubVaults.IbnUSD.address
     }
   }
 };
@@ -6147,25 +6453,26 @@ var DEFAULT_RELAYER_API_ENDPOINT = "https://xcall-relay.nw.iconblockchain.xyz";
 var solverConfig = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     intentsContract: "0x6382D6ccD780758C5e8A6123c33ee8F4472F96ef",
-    solverApiEndpoint: "https://staging-new-world.iconblockchain.xyz"
-    // TODO replace with mainnet
+    solverApiEndpoint: "https://sodax-solver-staging.iconblockchain.xyz"
   }
 };
 var getSolverConfig = (chainId) => solverConfig[chainId];
 var solverSupportedTokens = {
   [types.SONIC_MAINNET_CHAIN_ID]: [
-    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.wSonic
+    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH, // NOTE: Planned for next release (1 - 2 weeks)
+    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC, // NOTE: Planned for next release (1 - 2 weeks)
+    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT, // NOTE: Planned for next release (1 - 2 weeks)
+    // spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic, // NOTE: Planned for next release (1 - 2 weeks)
   ],
   [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
   ],
   [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.WBTC,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.weETH,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
@@ -6175,6 +6482,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.weETH,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.USDC,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.wstETH,
@@ -6182,43 +6490,62 @@ 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.USDC,
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
-    spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH,
+    // spokeChainConfig[OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH, // NOTE: Not Implemented
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.USDT
   ],
   [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.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.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.USDC
   ],
   [types.ICON_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.ICX,
     spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.wICX,
     spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.bnUSD
+    // spokeChainConfig[ICON_MAINNET_CHAIN_ID].supportedTokens.BALN, // NOTE: Not Implemented
+    // spokeChainConfig[ICON_MAINNET_CHAIN_ID].supportedTokens.OMM, // NOTE: Not Implemented
   ],
   [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.USDC
   ],
   [types.SUI_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.SUI,
-    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.USDC
+    // spokeChainConfig[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,
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.haSUI,
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.vSUI,
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.yapSUI,
+    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.bnUSD, // NOTE: Not Implemented
     spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
-  [types.NIBIRU_MAINNET_CHAIN_ID]: []
+  [types.NIBIRU_MAINNET_CHAIN_ID]: [
+    // spokeChainConfig[NIBIRU_MAINNET_CHAIN_ID].supportedTokens.NIBI, // NOTE: Not Implemented
+    // spokeChainConfig[NIBIRU_MAINNET_CHAIN_ID].supportedTokens.bnUSD, // NOTE: Not Implemented
+    // spokeChainConfig[NIBIRU_MAINNET_CHAIN_ID].supportedTokens.USDC, // NOTE: Not Implemented
+  ]
 };
 var getSupportedSolverTokens = (chainId) => solverSupportedTokens[chainId];
 var isSolverSupportedToken = (chainId, token) => solverSupportedTokens[chainId].some((t) => t.address.toLowerCase() === token.toLowerCase());
@@ -6243,8 +6570,8 @@ var moneyMarketSupportedTokens = {
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.ETH,
     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,
+    // spokeChainConfig[ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.weETH,
+    // spokeChainConfig[ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.tBTC,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.USDT,
     spokeChainConfig[types.ARBITRUM_MAINNET_CHAIN_ID].supportedTokens.USDC
@@ -6252,17 +6579,17 @@ var moneyMarketSupportedTokens = {
   [types.BASE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.ETH,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
-    spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.weETH,
+    // spokeChainConfig[BASE_MAINNET_CHAIN_ID].supportedTokens.weETH,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.USDC,
-    spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.wstETH,
+    // spokeChainConfig[BASE_MAINNET_CHAIN_ID].supportedTokens.wstETH,
     spokeChainConfig[types.BASE_MAINNET_CHAIN_ID].supportedTokens.cbBTC
   ],
   [types.OPTIMISM_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.ETH,
     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[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH,
+    // spokeChainConfig[OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.wstETH,
+    // spokeChainConfig[OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.weETH,
     spokeChainConfig[types.OPTIMISM_MAINNET_CHAIN_ID].supportedTokens.USDT
   ],
   [types.POLYGON_MAINNET_CHAIN_ID]: [
@@ -6278,12 +6605,13 @@ var moneyMarketSupportedTokens = {
   ],
   [types.SOLANA_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.SOL,
-    spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.bnUSD
+    spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    spokeChainConfig[types.SOLANA_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.ICON_MAINNET_CHAIN_ID]: [
-    spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.ICX,
-    spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
-    spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.wICX
+    // spokeChainConfig[ICON_MAINNET_CHAIN_ID].supportedTokens.ICX,
+    spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.bnUSD
+    // spokeChainConfig[ICON_MAINNET_CHAIN_ID].supportedTokens.wICX,
   ],
   [types.STELLAR_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.XLM,
@@ -6291,11 +6619,13 @@ var moneyMarketSupportedTokens = {
   ],
   [types.SUI_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.SUI,
-    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.bnUSD
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.INJECTIVE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.INJ,
-    spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.bnUSD
+    spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+    spokeChainConfig[types.INJECTIVE_MAINNET_CHAIN_ID].supportedTokens.USDC
   ],
   [types.NIBIRU_MAINNET_CHAIN_ID]: [],
   [types.SONIC_MAINNET_CHAIN_ID]: [
@@ -6308,119 +6638,16 @@ var moneyMarketSupportedTokens = {
 };
 var isMoneyMarketSupportedToken = (chainId, token) => moneyMarketSupportedTokens[chainId].some((t) => t.address.toLowerCase() === token.toLowerCase());
 var getSupportedMoneyMarketTokens = (chainId) => moneyMarketSupportedTokens[chainId];
-var HubVaultSymbols = [
-  "sodaAVAX",
-  "sodaBNB",
-  "sodaETH",
-  "sodaBTC",
-  "sodaSUI",
-  "sodaINJ",
-  "sodaXLM",
-  "sodaSOL"
-];
-var hubVaults = {
-  sodaAVAX: {
-    // SODA AVAX vault
-    address: "0x14238d267557e9d799016ad635b53cd15935d290",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0xc9e4f0b6195f389d9d2b639f2878b7674eb9d8cd"
-      // AvalancheAVAX hub asset
-    ]
-  },
-  sodaBNB: {
-    // SODA BNB vault
-    address: "0x40cd41b35db9e5109ae7e54b44de8625db320e6b",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x13b70564b1ec12876b20fab5d1bb630311312f4f"
-      // BSC BNB hub asset
-    ]
-  },
-  sodaETH: {
-    // SODA ETH vault
-    address: "0x4effb5813271699683c25c734f4dabc45b363709",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x70178089842be7f8e4726b33f0d1569db8021faa",
-      // BASE ETH hub asset
-      "0xad332860dd3b6f0e63f4f66e9457900917ac78cd",
-      // Optimism ETH hub asset
-      "0xdcd9578b51ef55239b6e68629d822a8d97c95b86",
-      // Arbitrum ETH hub asset
-      "0x57fc2ac5701e463ae261adbd6c99fbeb48ce5293"
-      // BSC ETH hub asset
-    ]
-  },
-  sodaBTC: {
-    // SODA BTC vault
-    address: "0x7a1a5555842ad2d0ed274d09b5c4406a95799d5d",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x2803a23a3ba6b09e57d1c71dec0d9efdbb00a27f",
-      // BASE cbBTC hub asset,
-      "0xfb0acb1b2720b620935f50a6dd3f7fea52b2fcbe",
-      // Arbitrum wBTC hub asset
-      "0x96fc8540736f1598b7e235e6de8814062b3b5d3b",
-      // Arbitrum tBTC hub asset,
-      "0xd8a24c71fea5bb81c66c01e532de7d9b11e13905"
-      // BSC BTCB hub asset
-    ]
-  },
-  sodaSUI: {
-    // SODA SUI vault
-    address: "0xdc5b4b00f98347e95b9f94911213dab4c687e1e3",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x4676b2a551b25c04e235553c1c81019337384673"
-      // SUI SUI hub asset
-    ]
-  },
-  sodaINJ: {
-    // SODA INJ vault
-    address: "0x1f22279c89b213944b7ea41dacb0a868ddcdfd13",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0xd375590b4955f6ea5623f799153f9b787a3bd319"
-      // Injective INJ hub asset
-    ]
-  },
-  sodaXLM: {
-    // SODA XLM vault
-    address: "0x6bc8c37cba91f76e68c9e6d689a9c21e4d32079b",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x8ac68af223907fb1b893086601a3d99e00f2fa9d"
-      // Stellar XLM hub asset
-    ]
-  },
-  sodaSOL: {
-    // SODA SOL vault
-    address: "0xdea692287e2ce8cb08fa52917be0f16b1dacdc87",
-    reserves: [
-      // hub asset addresses contained in the vault
-      "0x0c09e69a4528945de6d16c7e469dea6996fdf636"
-      // Solana SOL hub asset
-    ]
-  }
-};
-var hubVaultsAddressSet = new Set(
-  Object.values(hubVaults).map((vault) => vault.address.toLowerCase())
-);
-var moneyMarketReserveHubAssetsSet = new Set(
-  Object.values(hubVaults).flatMap((vault) => vault.reserves.map((reserve) => reserve.toLowerCase()))
-);
-var isMoneyMarketReserveHubAsset = (hubAsset) => moneyMarketReserveHubAssetsSet.has(hubAsset.toLowerCase());
-var moneyMarketReserveAssets = [
-  hubVaults["sodaAVAX"].address,
-  hubVaults["sodaBNB"].address,
-  hubVaults["sodaETH"].address,
-  hubVaults["sodaBTC"].address,
-  hubVaults["sodaSUI"].address,
-  hubVaults["sodaINJ"].address,
-  hubVaults["sodaXLM"].address,
-  hubVaults["sodaSOL"].address,
-  getMoneyMarketConfig(types.SONIC_MAINNET_CHAIN_ID).bnUSDVault
+var hubVaultsAddressSet = new Set(
+  Object.values(hubVaults).map((vault) => vault.address.toLowerCase())
+);
+var moneyMarketReserveHubAssetsSet = new Set(
+  Object.values(hubVaults).flatMap((vault) => vault.reserves.map((reserve) => reserve.toLowerCase()))
+);
+var isMoneyMarketReserveHubAsset = (hubAsset) => moneyMarketReserveHubAssetsSet.has(hubAsset.toLowerCase());
+var moneyMarketReserveAssets = [
+  ...Object.values(hubVaults).map((vault) => vault.address),
+  getMoneyMarketConfig(types.SONIC_MAINNET_CHAIN_ID).bnUSDVault
 ];
 var isMoneyMarketReserveAsset = (asset) => moneyMarketReserveAssets.map((a) => a.toLowerCase()).includes(asset.toLowerCase());
 var originalAssetTohubAssetMap = new Map(
@@ -6766,28 +6993,164 @@ var EvmSpokeProvider = class {
     }
   }
 };
+var CustomStellarAccount = class {
+  accountId;
+  sequenceNumber;
+  startingSequenceNumber;
+  constructor({ account_id, sequence }) {
+    this.accountId = account_id;
+    this.sequenceNumber = BigInt(sequence);
+    this.startingSequenceNumber = BigInt(sequence);
+  }
+  getSequenceNumber() {
+    return this.sequenceNumber;
+  }
+  getStartingSequenceNumber() {
+    return this.startingSequenceNumber;
+  }
+  getAccountId() {
+    return this.accountId;
+  }
+  getAccountClone() {
+    return new stellarSdk.Account(this.accountId, this.sequenceNumber.toString());
+  }
+  incrementSequenceNumber() {
+    this.sequenceNumber++;
+  }
+  decrementSequenceNumber() {
+    if (this.sequenceNumber > this.startingSequenceNumber) {
+      this.sequenceNumber--;
+    }
+    throw new Error(
+      `Sequence number cannot be decremented below the starting sequence number: ${this.startingSequenceNumber}`
+    );
+  }
+  resetSequenceNumber() {
+    this.sequenceNumber = this.startingSequenceNumber;
+  }
+};
+var CustomSorobanServer = class extends stellarSdk.SorobanRpc.Server {
+  customHeaders;
+  constructor(serverUrl, customHeaders) {
+    super(serverUrl, {
+      allowHttp: true
+    });
+    this.customHeaders = customHeaders;
+  }
+  async getNetwork() {
+    const requestOptions = {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...this.customHeaders
+      },
+      body: JSON.stringify({
+        id: 1,
+        jsonrpc: "2.0",
+        method: "getNetwork"
+      })
+    };
+    const response = await fetch(`${this.serverURL}`, requestOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error getting network! status: ${response.status}`);
+    }
+    return response.json().then((json) => json.result);
+  }
+  async simulateTransaction(tx) {
+    const requestOptions = {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...this.customHeaders
+      },
+      body: JSON.stringify({
+        id: 1,
+        jsonrpc: "2.0",
+        method: "simulateTransaction",
+        params: {
+          transaction: tx.toXDR()
+        }
+      })
+    };
+    const response = await fetch(`${this.serverURL}`, requestOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error simulating TX! status: ${response.status}`);
+    }
+    return response.json().then((json) => json.result);
+  }
+  async sendTransaction(tx) {
+    const requestOptions = {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...this.customHeaders
+      },
+      body: JSON.stringify({
+        id: 1,
+        jsonrpc: "2.0",
+        method: "sendTransaction",
+        params: {
+          transaction: tx.toXDR()
+        }
+      })
+    };
+    const response = await fetch(`${this.serverURL}`, requestOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error submitting TX! status: ${response.status}`);
+    }
+    return response.json().then((json) => json.result);
+  }
+  async getTransaction(hash) {
+    const requestOptions = {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        ...this.customHeaders
+      },
+      body: JSON.stringify({
+        id: 1,
+        jsonrpc: "2.0",
+        method: "getTransaction",
+        params: { hash }
+      })
+    };
+    const response = await fetch(`${this.serverURL}`, requestOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error getting TX! status: ${response.status}`);
+    }
+    return response.json().then((json) => json.result);
+  }
+};
 var StellarSpokeProvider = class {
   server;
+  sorobanServer;
   contract;
   chainConfig;
   walletProvider;
-  constructor(walletProvider, contractAddress, config, rpc) {
-    this.server = new stellarSdk.rpc.Server(rpc);
+  constructor(walletProvider, config, rpcConfig) {
+    this.server = new stellarSdk.Horizon.Server(
+      rpcConfig && rpcConfig.horizonRpcUrl ? rpcConfig.horizonRpcUrl : config.horizonRpcUrl,
+      { allowHttp: true }
+    );
+    this.sorobanServer = new CustomSorobanServer(
+      rpcConfig && rpcConfig.sorobanRpcUrl ? rpcConfig.sorobanRpcUrl : config.sorobanRpcUrl,
+      {}
+    );
     this.walletProvider = walletProvider;
-    this.contract = new stellarSdk.Contract(contractAddress);
+    this.contract = new stellarSdk.Contract(config.addresses.assetManager);
     this.chainConfig = config;
   }
   async getBalance(tokenAddress) {
     const [network, walletAddress] = await Promise.all([
-      this.server.getNetwork(),
+      this.sorobanServer.getNetwork(),
       this.walletProvider.getWalletAddress()
     ]);
-    const sourceAccount = await this.server.getAccount(walletAddress);
+    const sourceAccount = await this.sorobanServer.getAccount(walletAddress);
     const tx = new stellarSdk.TransactionBuilder(sourceAccount, {
       fee: stellarSdk.BASE_FEE,
       networkPassphrase: network.passphrase
     }).addOperation(this.contract.call("get_token_balance", stellarSdk.nativeToScVal(tokenAddress, { type: "address" }))).setTimeout(stellarSdk.TimeoutInfinite).build();
-    const result = await this.server.simulateTransaction(tx);
+    const result = await this.sorobanServer.simulateTransaction(tx);
     if (stellarSdk.rpc.Api.isSimulationError(result)) {
       throw new Error("Failed to simulate transaction");
     }
@@ -6797,32 +7160,112 @@ var StellarSpokeProvider = class {
     }
     throw new Error("result undefined");
   }
+  async buildPriorityStellarTransaction(account, network, operation) {
+    const simulationForFee = await this.sorobanServer.simulateTransaction(
+      new stellarSdk.TransactionBuilder(account.getAccountClone(), {
+        fee: stellarSdk.BASE_FEE,
+        networkPassphrase: network.passphrase
+      }).addOperation(operation).setTimeout(STELLAR_DEFAULT_TX_TIMEOUT_SECONDS).build()
+    );
+    if (!stellarSdk.rpc.Api.isSimulationSuccess(simulationForFee)) {
+      throw new Error(`Simulation error: ${JSON.stringify(simulationForFee)}`);
+    }
+    const priorityTransaction = new stellarSdk.TransactionBuilder(account.getAccountClone(), {
+      fee: (BigInt(simulationForFee.minResourceFee) + BigInt(STELLAR_PRIORITY_FEE) + BigInt(stellarSdk.BASE_FEE.toString())).toString(),
+      networkPassphrase: network.passphrase
+    }).addOperation(operation).setTimeout(STELLAR_DEFAULT_TX_TIMEOUT_SECONDS).build();
+    const simulation = await this.sorobanServer.simulateTransaction(priorityTransaction);
+    return [stellarSdk.SorobanRpc.assembleTransaction(priorityTransaction, simulation).build(), simulation];
+  }
+  handleSendTransactionError(response) {
+    if (response.status === "ERROR") {
+      throw new Error(
+        `Transaction failed: status: ${response.status}, hash: ${response.hash}, errorResult: ${JSON.stringify({
+          name: response?.errorResult?.result()?.switch()?.name ?? "unknown",
+          value: response?.errorResult?.result()?.switch()?.value ?? "unknown"
+        })}, diagnosticEvents: ${JSON.stringify(response?.diagnosticEvents ?? "{}")}`
+      );
+    }
+    return response;
+  }
+  async signAndSendTransaction(tx, waitForTransaction = true) {
+    const signedTransaction = await this.walletProvider.signTransaction(tx.toXDR());
+    const signedTx = stellarSdk.TransactionBuilder.fromXDR(signedTransaction, tx.networkPassphrase);
+    const response = this.handleSendTransactionError(await this.sorobanServer.sendTransaction(signedTx));
+    if (waitForTransaction) {
+      return await this.waitForTransaction(response.hash);
+    }
+    return response.hash;
+  }
+  async waitForTransaction(hash, attempts = 60) {
+    if (attempts === 0) {
+      throw new Error(
+        "[StellarSpokeProvider.waitForTransaction] Timeout error. Transaction not found after 5 attempts"
+      );
+    }
+    const response = await this.sorobanServer.getTransaction(hash);
+    if (response.status === stellarSdk.rpc.Api.GetTransactionStatus.SUCCESS) {
+      return hash;
+    }
+    if (response.status === stellarSdk.rpc.Api.GetTransactionStatus.FAILED) {
+      throw response;
+    }
+    await new Promise((resolve) => setTimeout(resolve, 1e3));
+    return this.waitForTransaction(hash, attempts - 1);
+  }
+  async submitOrRestoreAndRetry(account, network, tx, operation, simulation) {
+    const initialSimulation = simulation ?? await this.sorobanServer.simulateTransaction(tx);
+    if (!stellarSdk.rpc.Api.isSimulationSuccess(initialSimulation)) {
+      throw new Error(
+        `[StellarSpokeProvider.submitOrRestoreAndRetry] Simulation Failed: ${JSON.stringify(initialSimulation)}`
+      );
+    }
+    let restored = false;
+    if (stellarSdk.rpc.Api.isSimulationRestore(initialSimulation)) {
+      try {
+        await this.handleSimulationRestore(
+          initialSimulation.restorePreamble.minResourceFee,
+          initialSimulation.restorePreamble.transactionData.build(),
+          account,
+          network
+        );
+        restored = true;
+      } catch (error) {
+        throw new Error(
+          `[StellarSpokeProvider.submitOrRestoreAndRetry] Simulation Restore Failed: ${JSON.stringify(error)}`
+        );
+      }
+    }
+    if (!restored) {
+      return await this.signAndSendTransaction(tx);
+    }
+    const newAccount = account.getAccountClone();
+    newAccount.incrementSequenceNumber();
+    return await this.signAndSendTransaction(
+      new stellarSdk.TransactionBuilder(newAccount, {
+        fee: stellarSdk.BASE_FEE,
+        networkPassphrase: network.passphrase
+      }).addOperation(operation).setTimeout(STELLAR_DEFAULT_TX_TIMEOUT_SECONDS).build()
+    );
+  }
+  async handleSimulationRestore(minResourceFee, transactionData, account, network) {
+    const totalFee = (BigInt(stellarSdk.BASE_FEE) + BigInt(STELLAR_PRIORITY_FEE) + BigInt(minResourceFee)).toString();
+    return this.signAndSendTransaction(
+      new stellarSdk.TransactionBuilder(account.getAccountClone(), { fee: totalFee }).setNetworkPassphrase(network.passphrase).setSorobanData(transactionData).addOperation(stellarSdk.Operation.restoreFootprint({})).setTimeout(STELLAR_DEFAULT_TX_TIMEOUT_SECONDS).build()
+    );
+  }
   async deposit(token, amount, recipient, data, raw) {
     try {
       const [network, walletAddress] = await Promise.all([
-        this.server.getNetwork(),
+        this.sorobanServer.getNetwork(),
         this.walletProvider.getWalletAddress()
       ]);
-      const sourceAccount = await this.server.getAccount(walletAddress);
-      const simulateTx = new stellarSdk.TransactionBuilder(sourceAccount, {
-        fee: stellarSdk.BASE_FEE,
-        networkPassphrase: network.passphrase
-      }).addOperation(
-        this.contract.call(
-          "transfer",
-          stellarSdk.nativeToScVal(stellarSdk.Address.fromString(walletAddress), { type: "address" }),
-          stellarSdk.nativeToScVal(stellarSdk.Address.fromString(token), {
-            type: "address"
-          }),
-          stellarSdk.nativeToScVal(BigInt(amount), { type: "u128" }),
-          stellarSdk.nativeToScVal(recipient),
-          stellarSdk.nativeToScVal(Buffer.from(data), { type: "bytes" })
-        )
-      ).setTimeout(100).build();
-      const simResult = await this.server.simulateTransaction(simulateTx);
-      const tx = stellarSdk.rpc.assembleTransaction(simulateTx, simResult).build();
+      const accountResponse = await this.server.loadAccount(walletAddress);
+      const stellarAccount = new CustomStellarAccount(accountResponse);
+      const depositCall = this.buildDepositCall(walletAddress, token, amount, recipient, data);
+      const [priorityTx, simulation] = await this.buildPriorityStellarTransaction(stellarAccount, network, depositCall);
       if (raw) {
-        const transactionXdr = tx.toXDR();
+        const transactionXdr = priorityTx.toXDR();
         return {
           from: walletAddress,
           to: this.chainConfig.addresses.assetManager,
@@ -6830,16 +7273,8 @@ var StellarSpokeProvider = class {
           data: transactionXdr
         };
       }
-      if (tx) {
-        const signedTx = await this.walletProvider.signTransaction(tx.toXDR());
-        const sendResponse = await this.server.sendTransaction(
-          stellarSdk.TransactionBuilder.fromXDR(signedTx, tx.networkPassphrase)
-        );
-        if (sendResponse.hash) {
-          return `0x${sendResponse.hash}`;
-        }
-      }
-      throw new Error("Failed to create transaction");
+      const hash = await this.submitOrRestoreAndRetry(stellarAccount, network, priorityTx, depositCall, simulation);
+      return `${hash}`;
     } catch (error) {
       console.error("Error during deposit:", error);
       throw error;
@@ -6848,27 +7283,19 @@ var StellarSpokeProvider = class {
   async sendMessage(dst_chain_id, dst_address, payload, raw) {
     try {
       const [network, walletAddress] = await Promise.all([
-        this.server.getNetwork(),
+        this.sorobanServer.getNetwork(),
         this.walletProvider.getWalletAddress()
       ]);
-      const sourceAccount = await this.server.getAccount(walletAddress);
-      const connection = new stellarSdk.Contract(this.chainConfig.addresses.connection);
-      const simulateTx = new stellarSdk.TransactionBuilder(sourceAccount, {
-        fee: stellarSdk.BASE_FEE,
-        networkPassphrase: network.passphrase
-      }).addOperation(
-        connection.call(
-          "send_message",
-          stellarSdk.nativeToScVal(stellarSdk.Address.fromString(walletAddress), { type: "address" }),
-          stellarSdk.nativeToScVal(dst_chain_id, { type: "u128" }),
-          stellarSdk.nativeToScVal(Buffer.from(dst_address), { type: "bytes" }),
-          stellarSdk.nativeToScVal(Buffer.from(payload), { type: "bytes" })
-        )
-      ).setTimeout(100).build();
-      const simResult = await this.server.simulateTransaction(simulateTx);
-      const tx = stellarSdk.rpc.assembleTransaction(simulateTx, simResult).build();
+      const accountResponse = await this.server.loadAccount(walletAddress);
+      const stellarAccount = new CustomStellarAccount(accountResponse);
+      const sendMessageCall = this.buildSendMessageCall(walletAddress, dst_chain_id, dst_address, payload);
+      const [priorityTx, simulation] = await this.buildPriorityStellarTransaction(
+        stellarAccount,
+        network,
+        sendMessageCall
+      );
       if (raw) {
-        const transactionXdr = tx.toXDR();
+        const transactionXdr = priorityTx.toXDR();
         return {
           from: walletAddress,
           to: this.chainConfig.addresses.assetManager,
@@ -6876,21 +7303,35 @@ var StellarSpokeProvider = class {
           data: transactionXdr
         };
       }
-      if (tx) {
-        const signedTx = await this.walletProvider.signTransaction(tx.toXDR());
-        const sendResponse = await this.server.sendTransaction(
-          stellarSdk.TransactionBuilder.fromXDR(signedTx, tx.networkPassphrase)
-        );
-        if (sendResponse.hash) {
-          return `0x${sendResponse.hash}`;
-        }
-      }
-      throw new Error("Failed to create transaction");
+      const hash = await this.submitOrRestoreAndRetry(stellarAccount, network, priorityTx, sendMessageCall, simulation);
+      return `${hash}`;
     } catch (error) {
-      console.error("Error during deposit:", error);
+      console.error("Error during sendMessage:", error);
       throw error;
     }
   }
+  buildDepositCall(walletAddress, token, amount, recipient, data) {
+    return this.contract.call(
+      "transfer",
+      stellarSdk.nativeToScVal(stellarSdk.Address.fromString(walletAddress), { type: "address" }),
+      stellarSdk.nativeToScVal(stellarSdk.Address.fromString(token), {
+        type: "address"
+      }),
+      stellarSdk.nativeToScVal(BigInt(amount), { type: "u128" }),
+      stellarSdk.nativeToScVal(Buffer.from(recipient), { type: "bytes" }),
+      stellarSdk.nativeToScVal(Buffer.from(data), { type: "bytes" })
+    );
+  }
+  buildSendMessageCall(walletAddress, dst_chain_id, dst_address, payload) {
+    const connection = new stellarSdk.Contract(this.chainConfig.addresses.connection);
+    return connection.call(
+      "send_message",
+      stellarSdk.nativeToScVal(stellarSdk.Address.fromString(walletAddress), { type: "address" }),
+      stellarSdk.nativeToScVal(dst_chain_id, { type: "u128" }),
+      stellarSdk.nativeToScVal(Buffer.from(dst_address), { type: "bytes" }),
+      stellarSdk.nativeToScVal(Buffer.from(payload), { type: "bytes" })
+    );
+  }
   static getAddressBCSBytes(stellaraddress) {
     return `0x${stellarSdk.Address.fromString(stellaraddress).toScVal().toXDR("hex")}`;
   }
@@ -7661,9 +8102,13 @@ function encodeAddress(spokeChainId, address) {
     case "injective-1":
       return viem.toHex(Buffer.from(address, "utf-8"));
     case "0x1.icon":
-      return `0x${Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex").toString("hex")}`;
+      return viem.toHex(Buffer.from(address.replace("cx", "01").replace("hx", "00") ?? "f8", "hex"));
     case "sui":
       return viem.toHex(bcs.bcs.Address.serialize(address).toBytes());
+    case "solana":
+      return viem.toHex(Buffer.from(new web3_js.PublicKey(address).toBytes()));
+    case "stellar":
+      return `0x${stellarSdk.Address.fromString(address).toScVal().toXDR("hex")}`;
     default:
       return address;
   }
@@ -7916,10 +8361,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param params - The parameters for the supply transaction.
    * @param spokeProvider - The spoke provider.
    * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[Hex, Hex], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
+   * @returns {Promise<Result<[SpokeTxHash, HubTxHash], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
    *
    * @example
-   * const result = await moneyMarketService.supplyAndSubmit(
+   * const result = await moneyMarketService.supply(
    *   {
    *     token: '0x...', // Address of the token (spoke chain address) to supply
    *     amount: 1000n, // Amount to supply (in token decimals)
@@ -7938,40 +8383,47 @@ var MoneyMarketService = class _MoneyMarketService {
    * ] = result.value;
    * console.log('Supply transaction hashes:', { spokeTxHash, hubTxHash });
    */
-  async supplyAndSubmit(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async supply(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.supply(params, spokeProvider);
+      const txResult = await this.createSupplyIntent(params, spokeProvider);
       if (!txResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: "SUPPLY_FAILED",
-            error: txResult.error
-          }
-        };
+        return txResult;
       }
       const packetResult = await relayTxAndWaitPacket(
         txResult.value,
+        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
         spokeProvider,
         this.config.relayerApiEndpoint,
         timeout
       );
       if (!packetResult.ok) {
-        return packetResult;
+        return {
+          ok: false,
+          error: {
+            code: packetResult.error.code,
+            data: {
+              error: packetResult.error,
+              payload: txResult.value
+            }
+          }
+        };
       }
       return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
     } catch (error) {
       return {
         ok: false,
         error: {
-          code: "UNKNOWN",
-          error
+          code: "SUPPLY_UNKNOWN_ERROR",
+          data: {
+            error,
+            payload: params
+          }
         }
       };
     }
   }
   /**
-   * Supply tokens to the money market pool without submitting the intent to the Solver API
+   * Create supply intent only (without submitting to Solver API)
    * NOTE: This method does not submit the intent to the Solver API, it only executes the transaction on the spoke chain
    * In order to successfully supply tokens, you need to:
    * 1. Check if the allowance is sufficient
@@ -7986,7 +8438,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *
    * @example
    * const moneyMarketService = new MoneyMarketService(config);
-   * const result = await moneyMarketService.supply(
+   * const result = await moneyMarketService.createSupplyIntent(
    *   {
    *     token: "0x123...", // token address
    *     amount: 1000000000000000000n // 1 token in wei
@@ -8002,7 +8454,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *   console.error('Supply failed:', result.error);
    * }
    */
-  async supply(params, spokeProvider, raw) {
+  async createSupplyIntent(params, spokeProvider, raw) {
     try {
       invariant2__default.default(params.action === "supply", "Invalid action");
       invariant2__default.default(params.token.length > 0, "Token is required");
@@ -8018,7 +8470,12 @@ var MoneyMarketService = class _MoneyMarketService {
         this.hubProvider,
         spokeProvider
       );
-      const data = this.supplyData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
+      const data = this.buildSupplyData(
+        params.token,
+        hubWallet,
+        params.amount,
+        spokeProvider.chainConfig.chain.id
+      );
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const txResult = await SpokeService.deposit(
         {
@@ -8034,14 +8491,21 @@ var MoneyMarketService = class _MoneyMarketService {
       );
       return {
         ok: true,
-        value: txResult
+        value: txResult,
+        data: {
+          address: hubWallet,
+          payload: data
+        }
       };
     } catch (error) {
       return {
         ok: false,
         error: {
-          code: "UNKNOWN",
-          error
+          code: "CREATE_SUPPLY_INTENT_FAILED",
+          data: {
+            error,
+            payload: params
+          }
         }
       };
     }
@@ -8051,10 +8515,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param params - The parameters for the borrow transaction.
    * @param spokeProvider - The spoke provider.
    * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[Hex, Hex], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
+   * @returns {Promise<Result<[SpokeTxHash, HubTxHash], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
    *
    * @example
-   * const result = await moneyMarketService.borrowAndSubmit(
+   * const result = await moneyMarketService.borrow(
    *   {
    *     token: '0x...', // Address of the token (spoke chain address) to borrow
    *     amount: 1000n, // Amount to borrow (in token decimals)
@@ -8073,40 +8537,47 @@ var MoneyMarketService = class _MoneyMarketService {
    * ] = result.value;
    * console.log('Borrow transaction hashes:', { spokeTxHash, hubTxHash });
    */
-  async borrowAndSubmit(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async borrow(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.borrow(params, spokeProvider);
+      const txResult = await this.createBorrowIntent(params, spokeProvider);
       if (!txResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: "BORROW_FAILED",
-            error: txResult.error
-          }
-        };
+        return txResult;
       }
       const packetResult = await relayTxAndWaitPacket(
         txResult.value,
+        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
         spokeProvider,
         this.config.relayerApiEndpoint,
         timeout
       );
       if (!packetResult.ok) {
-        return packetResult;
+        return {
+          ok: false,
+          error: {
+            code: packetResult.error.code,
+            data: {
+              error: packetResult.error,
+              payload: txResult.value
+            }
+          }
+        };
       }
       return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
     } catch (error) {
       return {
         ok: false,
         error: {
-          code: "UNKNOWN",
-          error
+          code: "BORROW_UNKNOWN_ERROR",
+          data: {
+            error,
+            payload: params
+          }
         }
       };
     }
   }
   /**
-   * Borrow tokens from the money market pool without submitting the intent to the Solver API
+   * Create borrow intent only (without submitting to Solver API)
    * NOTE: This method does not submit the intent to the Solver API, it only executes the transaction on the spoke chain
    * In order to successfully borrow tokens, you need to:
    * 1. Execute the borrow transaction on the spoke chain
@@ -8119,13 +8590,13 @@ var MoneyMarketService = class _MoneyMarketService {
    *
    * @example
    * const moneyMarketService = new MoneyMarketService(config);
-   * const result = await moneyMarketService.borrow(
+   * const result = await moneyMarketService.createBorrowIntent(
    *   {
    *     token: "0x123...", // token address
    *     amount: 1000000000000000000n // 1 token in wei
    *   },
    *   spokeProvider,
-   *   raw // Optional: true = return the raw transaction data, false = exeute and return the transaction hash (default: false)
+   *   raw // Optional: true = return the raw transaction data, false = execute and return the transaction hash (default: false)
    * );
    *
    * if (result.ok) {
@@ -8135,7 +8606,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *   console.error('Borrow failed:', result.error);
    * }
    */
-  async borrow(params, spokeProvider, raw) {
+  async createBorrowIntent(params, spokeProvider, raw) {
     invariant2__default.default(params.action === "borrow", "Invalid action");
     invariant2__default.default(params.token.length > 0, "Token is required");
     invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
@@ -8150,7 +8621,7 @@ var MoneyMarketService = class _MoneyMarketService {
       this.hubProvider,
       spokeProvider
     );
-    const data = this.borrowData(
+    const data = this.buildBorrowData(
       hubWallet,
       walletAddressBytes,
       params.token,
@@ -8158,7 +8629,14 @@ var MoneyMarketService = class _MoneyMarketService {
       spokeProvider.chainConfig.chain.id
     );
     const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
-    return { ok: true, value: txResult };
+    return {
+      ok: true,
+      value: txResult,
+      data: {
+        address: hubWallet,
+        payload: data
+      }
+    };
   }
   /**
    * Withdraw tokens from the money market pool, relay the transaction to the hub and submit the intent to the Solver API
@@ -8166,10 +8644,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param params - The parameters for the withdraw transaction.
    * @param spokeProvider - The spoke provider.
    * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[Hex, Hex], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
+   * @returns {Promise<Result<[SpokeTxHash, HubTxHash], MoneyMarketError>>} - Returns the spoke and hub transaction hashes or error
    *
    * @example
-   * const result = await moneyMarketService.withdrawAndSubmit(
+   * const result = await moneyMarketService.withdraw(
    *   {
    *     token: '0x...', // Address of the token (spoke chain address) to withdraw
    *     amount: 1000n, // Amount to withdraw (in token decimals)
@@ -8188,40 +8666,47 @@ var MoneyMarketService = class _MoneyMarketService {
    * ] = result.value;
    * console.log('Withdraw transaction hashes:', { spokeTxHash, hubTxHash });
    */
-  async withdrawAndSubmit(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async withdraw(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.withdraw(params, spokeProvider);
+      const txResult = await this.createWithdrawIntent(params, spokeProvider);
       if (!txResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: "WITHDRAW_FAILED",
-            error: txResult.error
-          }
-        };
+        return txResult;
       }
       const packetResult = await relayTxAndWaitPacket(
         txResult.value,
+        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
         spokeProvider,
         this.config.relayerApiEndpoint,
         timeout
       );
       if (!packetResult.ok) {
-        return packetResult;
+        return {
+          ok: false,
+          error: {
+            code: packetResult.error.code,
+            data: {
+              error: packetResult.error,
+              payload: txResult.value
+            }
+          }
+        };
       }
       return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
     } catch (error) {
       return {
         ok: false,
         error: {
-          code: "UNKNOWN",
-          error
+          code: "WITHDRAW_UNKNOWN_ERROR",
+          data: {
+            error,
+            payload: params
+          }
         }
       };
     }
   }
   /**
-   * Withdraw tokens from the money market pool without submitting the intent to the Solver API
+   * Create withdraw intent only (without submitting to Solver API)
    * NOTE: This method does not submit the intent to the Solver API, it only executes the transaction on the spoke chain
    * In order to successfully withdraw tokens, you need to:
    * 1. Execute the withdraw transaction on the spoke chain
@@ -8234,7 +8719,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *
    * @example
    * const moneyMarketService = new MoneyMarketService(config);
-   * const result = await moneyMarketService.withdraw(
+   * const result = await moneyMarketService.createWithdrawIntent(
    *   {
    *     token: "0x123...", // token address
    *     amount: 1000000000000000000n // 1 token in wei
@@ -8250,7 +8735,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *   console.error('Withdraw failed:', result.error);
    * }
    */
-  async withdraw(params, spokeProvider, raw) {
+  async createWithdrawIntent(params, spokeProvider, raw) {
     invariant2__default.default(params.action === "withdraw", "Invalid action");
     invariant2__default.default(params.token.length > 0, "Token is required");
     invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
@@ -8265,7 +8750,7 @@ var MoneyMarketService = class _MoneyMarketService {
       this.hubProvider,
       spokeProvider
     );
-    const data = this.withdrawData(
+    const data = this.buildWithdrawData(
       hubWallet,
       walletAddressBytes,
       params.token,
@@ -8273,7 +8758,14 @@ var MoneyMarketService = class _MoneyMarketService {
       spokeProvider.chainConfig.chain.id
     );
     const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
-    return { ok: true, value: txResult };
+    return {
+      ok: true,
+      value: txResult,
+      data: {
+        address: hubWallet,
+        payload: data
+      }
+    };
   }
   /**
    * Repay tokens to the money market pool, relay the transaction to the hub and submit the intent to the Solver API
@@ -8281,10 +8773,10 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param params - The parameters for the repay transaction.
    * @param spokeProvider - The spoke provider.
    * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[Hex, Hex], MoneyMarketError>>} - Returns the transaction result and the hub transaction hash or error
+   * @returns {Promise<Result<[SpokeTxHash, HubTxHash], MoneyMarketError>>} - Returns the spoke and hub transaction hashes or error
    *
    * @example
-   * const result = await moneyMarketService.repayAndSubmit(
+   * const result = await moneyMarketService.repay(
    *   {
    *     token: '0x...', // Address of the token (spoke chain address) to repay
    *     amount: 1000n, // Amount to repay (in token decimals)
@@ -8303,40 +8795,47 @@ var MoneyMarketService = class _MoneyMarketService {
    * ] = result.value;
    * console.log('Repay transaction hashes:', { spokeTxHash, hubTxHash });
    */
-  async repayAndSubmit(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async repay(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.repay(params, spokeProvider);
+      const txResult = await this.createRepayIntent(params, spokeProvider);
       if (!txResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: "REPAY_FAILED",
-            error: txResult.error
-          }
-        };
+        return txResult;
       }
       const packetResult = await relayTxAndWaitPacket(
         txResult.value,
+        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
         spokeProvider,
         this.config.relayerApiEndpoint,
         timeout
       );
       if (!packetResult.ok) {
-        return packetResult;
+        return {
+          ok: false,
+          error: {
+            code: packetResult.error.code,
+            data: {
+              error: packetResult.error,
+              payload: txResult.value
+            }
+          }
+        };
       }
       return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
     } catch (error) {
       return {
         ok: false,
         error: {
-          code: "UNKNOWN",
-          error
+          code: "REPAY_UNKNOWN_ERROR",
+          data: {
+            error,
+            payload: params
+          }
         }
       };
     }
   }
   /**
-   * Repay tokens to the money market pool without submitting the intent to the Solver API
+   * Create repay intent only (without submitting to Solver API)
    * NOTE: This method does not submit the intent to the Solver API, it only executes the transaction on the spoke chain
    * In order to successfully repay tokens, you need to:
    * 1. Check if the allowance is sufficient
@@ -8351,7 +8850,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *
    * @example
    * const moneyMarketService = new MoneyMarketService(config);
-   * const result = await moneyMarketService.repay(
+   * const result = await moneyMarketService.createRepayIntent(
    *   {
    *     token: "0x123...", // token address
    *     amount: 1000000000000000000n // 1 token in wei
@@ -8367,7 +8866,7 @@ var MoneyMarketService = class _MoneyMarketService {
    *   console.error('Repay failed:', result.error);
    * }
    */
-  async repay(params, spokeProvider, raw) {
+  async createRepayIntent(params, spokeProvider, raw) {
     invariant2__default.default(params.action === "repay", "Invalid action");
     invariant2__default.default(params.token.length > 0, "Token is required");
     invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
@@ -8382,7 +8881,7 @@ var MoneyMarketService = class _MoneyMarketService {
       this.hubProvider,
       spokeProvider
     );
-    const data = this.repayData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
+    const data = this.buildRepayData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const txResult = await SpokeService.deposit(
       {
@@ -8396,7 +8895,14 @@ var MoneyMarketService = class _MoneyMarketService {
       this.hubProvider,
       raw
     );
-    return { ok: true, value: txResult };
+    return {
+      ok: true,
+      value: txResult,
+      data: {
+        address: hubWallet,
+        payload: data
+      }
+    };
   }
   /**
    * Build transaction data for supplying to the money market pool
@@ -8406,7 +8912,7 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param spokeChainId - The chain ID of the spoke chain
    * @returns {Hex} The transaction data.
    */
-  supplyData(token, to, amount, spokeChainId) {
+  buildSupplyData(token, to, amount, spokeChainId) {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant2__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
@@ -8434,7 +8940,7 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param spokeChainId - The chain ID of the spoke chain
    * @returns {Hex} The transaction data.
    */
-  borrowData(from, to, token, amount, spokeChainId) {
+  buildBorrowData(from, to, token, amount, spokeChainId) {
     invariant2__default.default(isValidSpokeChainId(spokeChainId), `Invalid spokeChainId: ${spokeChainId}`);
     invariant2__default.default(
       isValidOriginalAssetAddress(spokeChainId, token),
@@ -8509,7 +9015,7 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param spokeChainId - The chain ID of the spoke chain
    * @returns {Hex} The transaction data.
    */
-  withdrawData(from, to, token, amount, spokeChainId) {
+  buildWithdrawData(from, to, token, amount, spokeChainId) {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     if (!assetConfig) {
@@ -8560,11 +9066,11 @@ var MoneyMarketService = class _MoneyMarketService {
    * @param spokeChainId - The chain ID of the spoke chain
    * @returns {Hex} The transaction data.
    */
-  repayData(token, to, amount, spokeChainId) {
+  buildRepayData(token, to, amount, spokeChainId) {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     if (!assetConfig) {
-      throw new Error("[repayData] Hub asset not found");
+      throw new Error("[buildRepayData] Hub asset not found");
     }
     const assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
@@ -9064,10 +9570,7 @@ var IconSpokeService = class _IconSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction({
       from: walletAddress,
-      to: isNativeToken(spokeProvider.chainConfig.chain.id, token) ? (
-        // wICX address
-        "cx3975b43d260fb8ec802cef6e60c2f4d07486f11d"
-      ) : token,
+      to: isNativeToken(spokeProvider.chainConfig.chain.id, token) ? spokeProvider.chainConfig.addresses.wICX : token,
       value,
       nid: spokeProvider.chainConfig.nid,
       method: "transfer",
@@ -9187,7 +9690,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
   static async deposit(params, spokeProvider, hubProvider, raw) {
     const userWallet = params.to ?? await EvmWalletAbstraction.getUserHubWalletAddress(
       spokeProvider.chainConfig.chain.id,
-      viem.toHex(new web3_js.PublicKey(params.from).toBytes()),
+      encodeAddress(spokeProvider.chainConfig.chain.id, params.from),
       hubProvider
     );
     return _SolanaSpokeService.transfer(
@@ -9195,7 +9698,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
         token: new web3_js.PublicKey(params.token),
         recipient: userWallet,
         amount: params.amount.toString(),
-        data: params.data
+        data: viem.keccak256(params.data)
       },
       spokeProvider,
       raw
@@ -9229,7 +9732,7 @@ var SolanaSpokeService = class _SolanaSpokeService {
    */
   static async callWallet(from, payload, spokeProvider, hubProvider, raw) {
     const relayId = getIntentRelayChainId(hubProvider.chainConfig.chain.id);
-    return _SolanaSpokeService.call(BigInt(relayId), from, payload, spokeProvider, raw);
+    return _SolanaSpokeService.call(BigInt(relayId), from, viem.keccak256(payload), spokeProvider, raw);
   }
   static async transfer({ token, recipient, amount, data }, spokeProvider, raw) {
     let depositInstruction;
@@ -9782,9 +10285,9 @@ var SonicSpokeService = class _SonicSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
-  static async withdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService) {
+  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService) {
     const userRouter = await _SonicSpokeService.getUserRouter(from, spokeProvider);
-    const withdrawCall = moneyMarketService.withdrawData(
+    const withdrawCall = moneyMarketService.buildWithdrawData(
       userRouter,
       from,
       withdrawInfo.token,
@@ -9885,6 +10388,51 @@ function isConfiguredSolverConfig(value) {
 function isConfiguredMoneyMarketConfig(value) {
   return typeof value === "object" && value !== null && "lendingPool" in value && "uiPoolDataProvider" in value && "poolAddressesProvider" in value && "bnUSD" in value && "bnUSDVault" in value;
 }
+function isIntentCreationFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "CREATION_FAILED" && "data" in error && typeof error.data === "object" && error.data !== null && "payload" in error.data && "error" in error.data;
+}
+function isIntentSubmitTxFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "SUBMIT_TX_FAILED" && "data" in error && typeof error.data === "object" && error.data !== null && "payload" in error.data && "error" in error.data;
+}
+function isIntentPostExecutionFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "POST_EXECUTION_FAILED" && "data" in error && typeof error.data === "object" && error.data !== null && "detail" in error.data;
+}
+function isWaitUntilIntentExecutedFailed(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "RELAY_TIMEOUT" && "data" in error && typeof error.data === "object" && error.data !== null && "payload" in error.data && "error" in error.data;
+}
+function isIntentCreationUnknownError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "UNKNOWN" && "data" in error && typeof error.data === "object" && error.data !== null && "payload" in error.data && "error" in error.data;
+}
+function isMoneyMarketSubmitTxFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "SUBMIT_TX_FAILED";
+}
+function isMoneyMarketRelayTimeoutError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "RELAY_TIMEOUT";
+}
+function isMoneyMarketCreateSupplyIntentFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "CREATE_SUPPLY_INTENT_FAILED";
+}
+function isMoneyMarketCreateBorrowIntentFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "CREATE_BORROW_INTENT_FAILED";
+}
+function isMoneyMarketCreateWithdrawIntentFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "CREATE_WITHDRAW_INTENT_FAILED";
+}
+function isMoneyMarketCreateRepayIntentFailedError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "CREATE_REPAY_INTENT_FAILED";
+}
+function isMoneyMarketSupplyUnknownError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "SUPPLY_UNKNOWN_ERROR";
+}
+function isMoneyMarketBorrowUnknownError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "BORROW_UNKNOWN_ERROR";
+}
+function isMoneyMarketWithdrawUnknownError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "WITHDRAW_UNKNOWN_ERROR";
+}
+function isMoneyMarketRepayUnknownError(error) {
+  return typeof error === "object" && error !== null && "code" in error && error.code === "REPAY_UNKNOWN_ERROR";
+}
 
 // src/services/spoke/SpokeService.ts
 var SpokeService = class {
@@ -10081,12 +10629,12 @@ async function waitUntilIntentExecuted(payload) {
       } catch (e) {
         console.error("Error getting transaction packets", e);
       }
-      await new Promise((resolve) => setTimeout(resolve, 1e3));
+      await new Promise((resolve) => setTimeout(resolve, 2e3));
     }
     return {
       ok: false,
       error: {
-        code: "TIMEOUT",
+        code: "RELAY_TIMEOUT",
         data: {
           payload,
           error: {
@@ -10100,7 +10648,7 @@ async function waitUntilIntentExecuted(payload) {
     return {
       ok: false,
       error: {
-        code: "TIMEOUT",
+        code: "RELAY_TIMEOUT",
         data: {
           payload,
           error: e
@@ -10109,12 +10657,16 @@ async function waitUntilIntentExecuted(payload) {
     };
   }
 }
-async function relayTxAndWaitPacket(spokeTxHash, spokeProvider, relayerApiEndpoint, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+async function relayTxAndWaitPacket(spokeTxHash, data, spokeProvider, relayerApiEndpoint, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
   try {
     const intentRelayChainId = getIntentRelayChainId(spokeProvider.chainConfig.chain.id).toString();
     const submitPayload = {
       action: "submit",
-      params: {
+      params: data ? {
+        chain_id: intentRelayChainId,
+        tx_hash: spokeTxHash,
+        data
+      } : {
         chain_id: intentRelayChainId,
         tx_hash: spokeTxHash
       }
@@ -10139,7 +10691,7 @@ async function relayTxAndWaitPacket(spokeTxHash, spokeProvider, relayerApiEndpoi
       return {
         ok: false,
         error: {
-          code: "TIMEOUT",
+          code: "RELAY_TIMEOUT",
           error: packet.error
         }
       };
@@ -10152,7 +10704,7 @@ async function relayTxAndWaitPacket(spokeTxHash, spokeProvider, relayerApiEndpoi
     return {
       ok: false,
       error: {
-        code: "UNKNOWN",
+        code: "SUBMIT_TX_FAILED",
         error
       }
     };
@@ -10190,6 +10742,8 @@ var EvmSolverService = class _EvmSolverService {
       outputToken,
       srcChain: getIntentRelayChainId(createIntentParams.srcChain),
       dstChain: getIntentRelayChainId(createIntentParams.dstChain),
+      srcAddress: encodeAddress(createIntentParams.srcChain, createIntentParams.srcAddress),
+      dstAddress: encodeAddress(createIntentParams.dstChain, createIntentParams.dstAddress),
       intentId: randomUint256(),
       creator: creatorHubWalletAddress,
       data: feeData
@@ -10417,7 +10971,7 @@ var SolverApiService = class {
    *   }
    * }
    */
-  static async postExecution(intentExecutionRequest, config) {
+  static async postExecution(request, config) {
     try {
       const response = await retry(
         () => fetch(`${config.solverApiEndpoint}/execute`, {
@@ -10425,7 +10979,7 @@ var SolverApiService = class {
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify(intentExecutionRequest)
+          body: JSON.stringify(request)
         })
       );
       if (!response.ok) {
@@ -10451,15 +11005,15 @@ var SolverApiService = class {
       };
     }
   }
-  static async getStatus(intentStatusRequest, config) {
-    invariant2__default.default(intentStatusRequest.intent_tx_hash.length > 0, "Empty intent_tx_hash");
+  static async getStatus(request, config) {
+    invariant2__default.default(request.intent_tx_hash.length > 0, "Empty intent_tx_hash");
     try {
       const response = await fetch(`${config.solverApiEndpoint}/status`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify(intentStatusRequest)
+        body: JSON.stringify(request)
       });
       if (!response.ok) {
         return {
@@ -10518,8 +11072,8 @@ var SolverService = class {
   }
   /**
    * Request a quote from the solver API
-   * @param {IntentQuoteRequest} payload - The intent quote request
-   * @returns {Promise<Result<IntentQuoteResponse, IntentErrorResponse>>} The intent quote response
+   * @param {SolverIntentQuoteRequest} payload - The solver intent quote request
+   * @returns {Promise<Result<SolverIntentQuoteResponse, SolverErrorResponse>>} The intent quote response
    *
    * @example
    * const payload = {
@@ -10529,7 +11083,7 @@ var SolverService = class {
    *     "token_dst_blockchain_id":"0xa4b1.arbitrum",
    *     "amount":1000000000000000n,
    *     "quote_type": "exact_input"
-   * } satisfies IntentQuoteRequest
+   * } satisfies SolverIntentQuoteRequest
    *
    * const response = await solverService.getQuote(payload);
    *
@@ -10560,15 +11114,16 @@ var SolverService = class {
   }
   /**
    * Get the status of an intent from Solver API
-   * @param {IntentStatusRequest} intentStatusRequest - The intent status request
-   * @returns {Promise<Result<IntentStatusResponse, IntentErrorResponse>>} The intent status response
+   * NOTE: intentHash should be retrieved from relay packet dst_tx_hash property (see createAndSubmitIntent)
+   * @param {SolverIntentStatusRequest} request - The intent status request
+   * @returns {Promise<Result<SolverIntentStatusResponse, SolverErrorResponse>>} The solver intent status response
    *
    * @example
-   * const intentStatusRequest = {
-   *     "intentHash": "a0dd7652-b360-4123-ab2d-78cfbcd20c6b"
-   * } satisfies IntentStatusRequest
+   * const request = {
+   *     "intent_tx_hash": "a0dd7652-b360-4123-ab2d-78cfbcd20c6b" // destination tx hash from relay packet
+   * } satisfies SolverIntentStatusRequest
    *
-   * const response = await solverService.getStatus(intentStatusRequest);
+   * const response = await solverService.getStatus(request);
    *
    * if (response.ok) {
    *   const { status, intent_hash } = response.value;
@@ -10578,20 +11133,20 @@ var SolverService = class {
    *   // handle error
    * }
    */
-  async getStatus(intentStatusRequest) {
-    return SolverApiService.getStatus(intentStatusRequest, this.config);
+  async getStatus(request) {
+    return SolverApiService.getStatus(request, this.config);
   }
   /**
    * Post execution of intent order transaction executed on hub chain to Solver API
-   * @param {IntentExecutionRequest} intentExecutionRequest - The intent execution request
-   * @returns {Promise<Result<IntentExecutionResponse, IntentErrorResponse>>} The intent execution response
+   * @param {SolverExecutionRequest} request - The intent execution request
+   * @returns {Promise<Result<SolverExecutionResponse, SolverErrorResponse>>} The intent execution response
    *
    * @example
-   * const intentExecutionRequest = {
+   * const request = {
    *     "intent_tx_hash": "0xba3dce19347264db32ced212ff1a2036f20d9d2c7493d06af15027970be061af",
-   * } satisfies IntentExecutionRequest
+   * } satisfies SolverExecutionRequest
    *
-   * const response = await solverService.postExecution(intentExecutionRequest);
+   * const response = await solverService.postExecution(request);
    *
    * if (response.ok) {
    *   const { answer, intent_hash } = response.value;
@@ -10601,28 +11156,121 @@ var SolverService = class {
    *   // handle error
    * }
    */
-  async postExecution(intentExecutionRequest) {
-    return SolverApiService.postExecution(intentExecutionRequest, this.config);
+  async postExecution(request) {
+    return SolverApiService.postExecution(request, this.config);
   }
   /**
-   * Creates an intent and submits it to the Solver API and Relayer API
-   * @param {CreateIntentParams} payload - The intent to create
-   * @param {ISpokeProvider} spokeProvider - The spoke provider
-   * @param {number} timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
-   * @returns {Promise<Result<[IntentExecutionResponse, Intent, PacketData], IntentSubmitError<IntentSubmitErrorCode>>>} The intent execution response, intent, and packet data
+   * Submit intent transaction to the relayer API
+   * @param {IntentRelayRequest<'submit'>} submitPayload - The intent relay request
+   * @returns {Promise<Result<GetRelayResponse<'submit'>, IntentError<'SUBMIT_TX_FAILED'>>>} The intent relay response
    *
    * @example
-   * const payload = {
-   *     "inputToken": "0x2170Ed0880ac9A755fd29B2688956BD959F933F8", // BSC ETH token address
-   *     "outputToken": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", // ARB WBTC token address
+   * const submitPayload = {
+   *     "action": "submit",
+   *     "params": {
+   *         "chain_id": "0x38.bsc",
+   *         "tx_hash": "0xba3dce19347264db32ced212ff1a2036f20d9d2c7493d06af15027970be061af",
+   *     },
+   * } satisfies IntentRelayRequest<'submit'>;
+   *
+   * const submitResult = await solverService.submitIntent(submitPayload);
+   *
+   * if (submitResult.ok) {
+   *   const { success, message } = submitResult.value;
+   *   console.log('Success:', success);
+   *   console.log('Message:', message);
+   * } else {
+   *   // handle error
+   * }
+   */
+  async submitIntent(submitPayload) {
+    try {
+      const submitResult = await submitTransaction(submitPayload, this.config.relayerApiEndpoint);
+      if (!submitResult.success) {
+        return {
+          ok: false,
+          error: {
+            code: "SUBMIT_TX_FAILED",
+            data: {
+              payload: submitPayload,
+              error: new Error(submitResult.message)
+            }
+          }
+        };
+      }
+      return {
+        ok: true,
+        value: submitResult
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "SUBMIT_TX_FAILED",
+          data: {
+            payload: submitPayload,
+            error
+          }
+        }
+      };
+    }
+  }
+  /**
+   * Swap is a syntatic sugar for createAndSubmitIntent that creates an intent and submits it to the Solver API and Relayer API
+   * @param {CreateIntentParams} payload - The intent to create
+   * @param {ISpokeProvider} spokeProvider - The spoke provider
+   * @param {number} timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
+   * @returns {Promise<Result<[SolverExecutionResponse, Intent, PacketData], IntentError<IntentErrorCode>>>} The solver execution response, intent, and packet data
+   *
+   * @example
+   * const payload = {
+   *     "inputToken": "0x2170Ed0880ac9A755fd29B2688956BD959F933F8", // BSC ETH token address
+   *     "outputToken": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", // ARB WBTC token address
+   *     "inputAmount": 1000000000000000n, // The amount of input tokens
+   *     "minOutputAmount": 900000000000000n, // min amount you are expecting to receive
+   *     "deadline": 0n, // Optional timestamp after which intent expires (0 = no deadline)
+   *     "allowPartialFill": false, // Whether the intent can be partially filled
+   *     "srcChain": "0x38.bsc", // Chain ID where input tokens originate
+   *     "dstChain": "0xa4b1.arbitrum", // Chain ID where output tokens should be delivered
+   *     "srcAddress": "0x..", // Source address (original address on spoke chain)
+   *     "dstAddress": "0x...", // Destination address (original address on spoke chain)
+   *     "solver": "0x..", // Optional specific solver address (address(0) = any solver)
+   *     "data": "0x..", // Additional arbitrary data
+   * } satisfies CreateIntentParams;
+   *
+   * const swapResult = await solverService.swap(payload, spokeProvider);
+   *
+   * if (swapResult.ok) {
+   *   const [solverExecutionResponse, intent, packetData] = swapResult.value;
+   *   console.log('Intent execution response:', solverExecutionResponse);
+   *   console.log('Intent:', intent);
+   *   console.log('Packet data:', packetData);
+   * } else {
+   *   // handle error
+   * }
+   */
+  async swap(payload, spokeProvider, fee, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+    return this.createAndSubmitIntent(payload, spokeProvider, fee, timeout);
+  }
+  /**
+   * Creates an intent and submits it to the Solver API and Relayer API
+   * @param {CreateIntentParams} payload - The intent to create
+   * @param {ISpokeProvider} spokeProvider - The spoke provider
+   * @param {number} timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
+   * @returns {Promise<Result<[SolverExecutionResponse, Intent, PacketData], IntentError<IntentErrorCode>>>} The solver execution response, intent, and packet data
+   *
+   * @example
+   * const payload = {
+   *     "inputToken": "0x2170Ed0880ac9A755fd29B2688956BD959F933F8", // BSC ETH token address
+   *     "outputToken": "0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f", // ARB WBTC token address
    *     "inputAmount": 1000000000000000n, // The amount of input tokens
    *     "minOutputAmount": 900000000000000n, // min amount you are expecting to receive
    *     "deadline": 0n, // Optional timestamp after which intent expires (0 = no deadline)
    *     "allowPartialFill": false, // Whether the intent can be partially filled
    *     "srcChain": "0x38.bsc", // Chain ID where input tokens originate
    *     "dstChain": "0xa4b1.arbitrum", // Chain ID where output tokens should be delivered
-   *     "srcAddress": "0x..", // Source address in bytes (original address on spoke chain)
-   *     "dstAddress": "0x...", // Destination address in bytes (original address on spoke chain)
+   *     "srcAddress": "0x..", // Source address (original address on spoke chain)
+   *     "dstAddress": "0x...", // Destination address (original address on spoke chain)
    *     "solver": "0x..", // Optional specific solver address (address(0) = any solver)
    *     "data": "0x..", // Additional arbitrary data
    * } satisfies CreateIntentParams;
@@ -10630,8 +11278,8 @@ var SolverService = class {
    * const createAndSubmitIntentResult = await solverService.createAndSubmitIntent(payload, spokeProvider);
    *
    * if (createAndSubmitIntentResult.ok) {
-   *   const [intentExecutionResponse, intent, packetData] = createAndSubmitIntentResult.value;
-   *   console.log('Intent execution response:', intentExecutionResponse);
+   *   const [solverExecutionResponse, intent, packetData] = createAndSubmitIntentResult.value;
+   *   console.log('Intent execution response:', solverExecutionResponse);
    *   console.log('Intent:', intent);
    *   console.log('Packet data:', packetData);
    * } else {
@@ -10642,32 +11290,30 @@ var SolverService = class {
     try {
       const createIntentResult = await this.createIntent(payload, spokeProvider, fee, false);
       if (!createIntentResult.ok) {
-        return {
-          ok: false,
-          error: createIntentResult.error
-        };
+        return createIntentResult;
       }
-      const [spokeTxHash, intent] = createIntentResult.value;
+      const [spokeTxHash, intent, data] = createIntentResult.value;
       const intentRelayChainId = getIntentRelayChainId(payload.srcChain).toString();
-      const submitPayload = {
+      const submitPayload = payload.srcChain === types.SOLANA_MAINNET_CHAIN_ID && data ? {
+        action: "submit",
+        params: {
+          chain_id: intentRelayChainId,
+          tx_hash: spokeTxHash,
+          data: {
+            address: intent.creator,
+            payload: data
+          }
+        }
+      } : {
         action: "submit",
         params: {
           chain_id: intentRelayChainId,
           tx_hash: spokeTxHash
         }
       };
-      const submitResult = await submitTransaction(submitPayload, this.config.relayerApiEndpoint);
-      if (!submitResult.success) {
-        return {
-          ok: false,
-          error: {
-            code: "SUBMIT_TX_FAILED",
-            data: {
-              payload: submitPayload,
-              apiUrl: this.config.relayerApiEndpoint
-            }
-          }
-        };
+      const submitResult = await this.submitIntent(submitPayload);
+      if (!submitResult.ok) {
+        return submitResult;
       }
       const packet = await waitUntilIntentExecuted({
         intentRelayChainId,
@@ -10726,8 +11372,8 @@ var SolverService = class {
    *     "allowPartialFill": false, // Whether the intent can be partially filled
    *     "srcChain": "0x38.bsc", // Chain ID where input tokens originate
    *     "dstChain": "0xa4b1.arbitrum", // Chain ID where output tokens should be delivered
-   *     "srcAddress": "0x..", // Source address in bytes (original address on spoke chain)
-   *     "dstAddress": "0x...", // Destination address in bytes (original address on spoke chain)
+   *     "srcAddress": "0x..", // Source address (original address on spoke chain)
+   *     "dstAddress": "0x...", // Destination address (original address on spoke chain)
    *     "solver": "0x..", // Optional specific solver address (address(0) = any solver)
    *     "data": "0x..", // Additional arbitrary data
    * } satisfies CreateIntentParams;
@@ -10789,10 +11435,16 @@ var SolverService = class {
    *
    * const txReceipt = approveResult.value;
    */
-  async approve(token, amount, address, spokeProvider, raw) {
+  async approve(token, amount, spokeProvider, raw) {
     try {
       if (spokeProvider instanceof EvmSpokeProvider || spokeProvider instanceof SonicSpokeProvider) {
-        const result = await Erc20Service.approve(token, amount, address, spokeProvider, raw);
+        const result = await Erc20Service.approve(
+          token,
+          amount,
+          spokeProvider.chainConfig.addresses.assetManager,
+          spokeProvider,
+          raw
+        );
         return {
           ok: true,
           value: result
@@ -10812,11 +11464,11 @@ var SolverService = class {
   /**
    * Creates an intent by handling token approval and intent creation
    * NOTE: This method does not submit the intent to the Solver API
-   * @param {CreateIntentParams} params - The intent to create
+   * @param {Omit<CreateIntentParams, 'srcAddress'>} params - The intent to create
    * @param {SpokeProvider} spokeProvider - The spoke provider
    * @param {boolean} raw - Whether to return the raw transaction
    * @param {PartnerFee} fee - The fee to apply to the intent
-   * @returns {Promise<Result<[TxReturnType<S, R>, Intent & FeeAmount], IntentSubmitError<'CREATION_FAILED'>>>} The encoded contract call
+   * @returns {Promise<Result<[TxReturnType<S, R>, Intent & FeeAmount], IntentError<'CREATION_FAILED'>>>} The encoded contract call
    *
    * @example
    * const payload = {
@@ -10828,8 +11480,8 @@ var SolverService = class {
    *     "allowPartialFill": false, // Whether the intent can be partially filled
    *     "srcChain": "0x38.bsc", // Chain ID where input tokens originate
    *     "dstChain": "0xa4b1.arbitrum", // Chain ID where output tokens should be delivered
-   *     "srcAddress": "0x..", // Source address in bytes (original address on spoke chain)
-   *     "dstAddress": "0x...", // Destination address in bytes (original address on spoke chain)
+   *     "srcAddress": "0x..", // Source address (original address on spoke chain)
+   *     "dstAddress": "0x...", // Destination address (original address on spoke chain)
    *     "solver": "0x..", // Optional specific solver address (address(0) = any solver)
    *     "data": "0x..", // Additional arbitrary data
    * } satisfies CreateIntentParams;
@@ -10853,7 +11505,12 @@ var SolverService = class {
     invariant2__default.default(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
     invariant2__default.default(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
     try {
-      const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      invariant2__default.default(
+        params.srcAddress.toLowerCase() === walletAddress.toLowerCase(),
+        "srcAddress must be the same as wallet address"
+      );
+      const walletAddressBytes = encodeAddress(params.srcChain, walletAddress);
       const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(
         params.srcChain,
         walletAddressBytes,
@@ -10861,12 +11518,14 @@ var SolverService = class {
         spokeProvider
       );
       const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
-        params,
+        {
+          ...params,
+          srcAddress: walletAddress
+        },
         creatorHubWalletAddress,
         this.config,
         fee
       );
-      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const txResult = await SpokeService.deposit(
         {
           from: walletAddress,
@@ -10881,7 +11540,7 @@ var SolverService = class {
       );
       return {
         ok: true,
-        value: [txResult, { ...intent, feeAmount }]
+        value: [txResult, { ...intent, feeAmount }, data]
       };
     } catch (error) {
       return {
@@ -10904,20 +11563,37 @@ var SolverService = class {
    * @returns {Promise<TxReturnType<T, R>>} The encoded contract call
    */
   async cancelIntent(intent, spokeProvider, raw) {
-    invariant2__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
-    invariant2__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
-    const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
-    );
-    const calls = [];
-    const intentsContract = this.config.intentsContract;
-    calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
-    const data = encodeContractCalls(calls);
-    return SpokeService.callWallet(creatorHubWalletAddress, data, spokeProvider, this.hubProvider, raw);
+    try {
+      invariant2__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
+      invariant2__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
+      const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(
+        spokeProvider.chainConfig.chain.id,
+        walletAddressBytes,
+        this.hubProvider,
+        spokeProvider
+      );
+      const calls = [];
+      const intentsContract = this.config.intentsContract;
+      calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
+      const data = encodeContractCalls(calls);
+      const txResult = await SpokeService.callWallet(
+        creatorHubWalletAddress,
+        data,
+        spokeProvider,
+        this.hubProvider,
+        raw
+      );
+      return {
+        ok: true,
+        value: txResult
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error
+      };
+    }
   }
   /**
    * Gets an intent from a transaction hash (on Hub chain)
@@ -10937,6 +11613,939 @@ var SolverService = class {
   }
 };
 
+// src/abis/icxSwap.abi.ts
+var icxSwapAbi = [
+  {
+    type: "constructor",
+    inputs: [],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    name: "ICX",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "contract IERC20"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "UPGRADE_INTERFACE_VERSION",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "string",
+        internalType: "string"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "getImplementation",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "initialize",
+    inputs: [],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    name: "owner",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "pendingMigrations",
+    inputs: [
+      {
+        name: "",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    outputs: [
+      {
+        name: "user",
+        type: "address",
+        internalType: "address"
+      },
+      {
+        name: "to",
+        type: "address",
+        internalType: "address"
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        internalType: "uint256"
+      },
+      {
+        name: "timestamp",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "reverseSwap",
+    inputs: [
+      {
+        name: "amount",
+        type: "uint256",
+        internalType: "uint256"
+      },
+      {
+        name: "to",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "function",
+    name: "reverseSwapEnabled",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "bool",
+        internalType: "bool"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "sodax",
+    inputs: [],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "contract IERC20"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "swap",
+    inputs: [
+      {
+        name: "amount",
+        type: "uint256",
+        internalType: "uint256"
+      },
+      {
+        name: "to",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    outputs: [],
+    stateMutability: "nonpayable"
+  },
+  {
+    type: "event",
+    name: "Initialized",
+    inputs: [
+      {
+        name: "version",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "OwnershipTransferStarted",
+    inputs: [
+      {
+        name: "previousOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "newOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "OwnershipTransferred",
+    inputs: [
+      {
+        name: "previousOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "newOwner",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "PendingMigrationApproved",
+    inputs: [
+      {
+        name: "index",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "user",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "PendingMigrationCreated",
+    inputs: [
+      {
+        name: "user",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "index",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "ReverseSwap",
+    inputs: [
+      {
+        name: "user",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "sodaxAmount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "ICXAmount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "ReverseSwapToggled",
+    inputs: [
+      {
+        name: "enabled",
+        type: "bool",
+        indexed: false,
+        internalType: "bool"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "Swap",
+    inputs: [
+      {
+        name: "user",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      },
+      {
+        name: "ICXAmount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "sodaxAmount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "event",
+    name: "Upgraded",
+    inputs: [
+      {
+        name: "implementation",
+        type: "address",
+        indexed: true,
+        internalType: "address"
+      }
+    ],
+    anonymous: false
+  },
+  {
+    type: "error",
+    name: "AddressEmptyCode",
+    inputs: [
+      {
+        name: "target",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "ERC1967InvalidImplementation",
+    inputs: [
+      {
+        name: "implementation",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "ERC1967NonPayable",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "FailedCall",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "InvalidInitialization",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "NotInitializing",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "OwnableInvalidOwner",
+    inputs: [
+      {
+        name: "owner",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "OwnableUnauthorizedAccount",
+    inputs: [
+      {
+        name: "account",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "ReentrancyGuardReentrantCall",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "SafeERC20FailedOperation",
+    inputs: [
+      {
+        name: "token",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "UUPSUnauthorizedCallContext",
+    inputs: []
+  },
+  {
+    type: "error",
+    name: "UUPSUnsupportedProxiableUUID",
+    inputs: [
+      {
+        name: "slot",
+        type: "bytes32",
+        internalType: "bytes32"
+      }
+    ]
+  }
+];
+var IcxMigrationService = class {
+  hubProvider;
+  constructor(hubProvider) {
+    this.hubProvider = hubProvider;
+  }
+  /**
+   * Retrieves the available amount of SODA tokens in the ICX migration contract.
+   * This represents the amount of tokens available for migration.
+   *
+   * @returns The available balance of SODA tokens in the migration contract
+   */
+  async getAvailableAmount() {
+    const balance = await this.hubProvider.publicClient.readContract({
+      address: this.hubProvider.chainConfig.addresses.sodaToken,
+      abi: erc20Abi,
+      functionName: "balanceOf",
+      args: [this.hubProvider.chainConfig.addresses.icxMigration]
+    });
+    return balance;
+  }
+  /**
+   * Generates transaction data for migrating wICX tokens from ICON to the hub chain.
+   * This method creates the necessary contract calls to:
+   * 1. Approve the migration contract to spend the wICX tokens
+   * 2. Execute the migration swap
+   *
+   * @param params - The migration parameters including token address, amount, and recipient
+   * @returns Encoded transaction data for the migration operation
+   * @throws Will throw an error if the hub asset configuration is not found
+   */
+  migrateData(params) {
+    const calls = [];
+    const assetConfig = getHubAssetInfo(types.ICON_MAINNET_CHAIN_ID, params.icx);
+    invariant2__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.icx}`);
+    calls.push(
+      Erc20Service.encodeApprove(assetConfig.asset, this.hubProvider.chainConfig.addresses.icxMigration, params.amount)
+    );
+    calls.push(this.encodeMigrate(params.amount, params.to));
+    return encodeContractCalls(calls);
+  }
+  /**
+   * Generates transaction data for migrating back tokens to the ICON  chain.
+   * @param params - The migration parameters including token address, amount, and recipient
+   * @returns Encoded transaction data for the migration operation
+   * @throws Will throw an error if the hub asset configuration is not found
+   */
+  revertMigration(params) {
+    const calls = [];
+    const assetConfig = getHubAssetInfo(types.ICON_MAINNET_CHAIN_ID, params.wICX);
+    invariant2__default.default(assetConfig, `hub asset not found for spoke chain token (token): ${params.wICX}`);
+    calls.push(
+      Erc20Service.encodeApprove(
+        this.hubProvider.chainConfig.addresses.sodaToken,
+        this.hubProvider.chainConfig.addresses.icxMigration,
+        params.amount
+      )
+    );
+    calls.push(this.encodeRevertMigration(params.amount, params.userWallet));
+    calls.push(
+      EvmAssetManagerService.encodeTransfer(
+        assetConfig.asset,
+        params.to,
+        params.amount,
+        this.hubProvider.chainConfig.addresses.assetManager
+      )
+    );
+    return encodeContractCalls(calls);
+  }
+  /**
+   * Encodes a migration transaction for the ICX swap contract.
+   * This creates the contract call data for swapping wICX tokens to SODA tokens.
+   *
+   * @param amount - The amount of wICX tokens to migrate
+   * @param to - The address that will receive the migrated SODA tokens
+   * @returns The encoded contract call for the migration operation
+   */
+  encodeMigrate(amount, to) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.icxMigration,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: icxSwapAbi,
+        functionName: "swap",
+        args: [amount, to]
+      })
+    };
+  }
+  /**
+   * Encodes a revert migration transaction for the ICX swap contract.
+   * This creates the contract call data for swapping SODA tokens to wICX tokens.
+   *
+   * @param amount - The amount of wICX tokens to migrate
+   * @param to - The address that will receive the migrated SODA tokens
+   * @returns The encoded contract call for the migration operation
+   */
+  encodeRevertMigration(amount, to) {
+    return {
+      address: this.hubProvider.chainConfig.addresses.icxMigration,
+      value: 0n,
+      data: viem.encodeFunctionData({
+        abi: icxSwapAbi,
+        functionName: "reverseSwap",
+        args: [amount, to]
+      })
+    };
+  }
+};
+var MigrationService = class {
+  icxMigration;
+  hubProvider;
+  config;
+  constructor(hubProvider, config) {
+    this.hubProvider = hubProvider;
+    this.icxMigration = new IcxMigrationService(hubProvider);
+    this.config = config ?? {
+      relayerApiEndpoint: DEFAULT_RELAYER_API_ENDPOINT
+    };
+  }
+  async migrateData(params) {
+    return this.icxMigration.migrateData(params);
+  }
+  /**
+   * Checks if the allowance is valid for the migration transaction.
+   * @param params - The parameters for the migration transaction.
+   * @param spokeProvider - The spoke provider.
+   * @returns {Promise<Result<boolean>>} - Returns the result of the allowance check or error
+   *
+   * @example
+   * const result = await migrationService.isAllowanceValid(
+   *   {
+   *     token: 'ICX', // Token to migrate
+   *     icx: 'cx...', // Address of the ICX or wICX token to migrate
+   *     amount: 1000n, // Amount to migrate (in ICX decimals, usually 18)
+   *     to: '0x...', // Address to receive the migrated SODA tokens
+   *     action: 'migrate', // Action to perform (migrate or revert)
+   *   },
+   *   spokeProvider, // IconSpokeProvider instance
+   * );
+   *
+   */
+  async isAllowanceValid(params, spokeProvider) {
+    try {
+      if (params.action === "migrate") {
+        invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant2__default.default(viem.isAddress(params.to) || isIconAddress(params.to), "To address is required");
+        invariant2__default.default(
+          spokeProvider instanceof IconSpokeProvider,
+          "Spoke provider must be an instance of IconSpokeProvider"
+        );
+        invariant2__default.default(
+          params.icx.toLowerCase() === spokeProvider.chainConfig.addresses.wICX.toLowerCase() || params.icx.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase(),
+          "Token must be wICX or native ICX token"
+        );
+        invariant2__default.default(params.token === "ICX", "Token must be ICX");
+        return {
+          ok: true,
+          value: true
+        };
+      }
+      if (params.action === "revert") {
+        invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant2__default.default(viem.isAddress(params.to) || isIconAddress(params.to), "To address is required");
+        invariant2__default.default(
+          spokeProvider instanceof SonicSpokeProvider,
+          "Spoke provider must be an instance of SonicSpokeProvider"
+        );
+        const wallet = await spokeProvider.walletProvider.getWalletAddress();
+        const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+        return await Erc20Service.isAllowanceValid(
+          this.hubProvider.chainConfig.addresses.sodaToken,
+          params.amount,
+          wallet,
+          userRouter,
+          spokeProvider
+        );
+      }
+      return {
+        ok: false,
+        error: new Error("Invalid action")
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error
+      };
+    }
+  }
+  /**
+   * Approves the amount spending for the revert migration transaction.
+   * @param params - The parameters for the revert migration transaction.
+   * @param spokeProvider - The spoke provider.
+   * @param raw - Whether to return the raw transaction hash instead of the transaction receipt
+   * @returns {Promise<Result<TxReturnType<S, R>>>} - Returns the raw transaction payload or transaction hash
+   *
+   * @example
+   * const result = await migrationService.approve(
+   *   {
+   *     amount: 1000n, // Amount of SODA tokens to revert
+   *     to: 'hx...', // Icon Address to receive the reverted SODA tokens as ICX
+   *     action: 'revert',
+   *   },
+   *   spokeProvider, // SonicSpokeProvider instance
+   *   true // Optional raw flag to return the raw transaction hash instead of the transaction receipt
+   * );
+   *
+   */
+  async approve(params, spokeProvider, raw) {
+    try {
+      if (params.action === "revert") {
+        invariant2__default.default(params.amount > 0n, "Amount must be greater than 0");
+        invariant2__default.default(params.to.length > 0, "To address is required");
+        invariant2__default.default(
+          spokeProvider instanceof SonicSpokeProvider,
+          "Spoke provider must be an instance of SonicSpokeProvider"
+        );
+        const wallet = await spokeProvider.walletProvider.getWalletAddress();
+        const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+        const result = await Erc20Service.approve(
+          this.hubProvider.chainConfig.addresses.sodaToken,
+          params.amount,
+          userRouter,
+          spokeProvider,
+          raw
+        );
+        return {
+          ok: true,
+          value: result
+        };
+      }
+      return {
+        ok: false,
+        error: new Error("Invalid action")
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error
+      };
+    }
+  }
+  /**
+   * Creates a migration intent and submits (relays) it to the hub chain.
+   * @param params - The parameters for the migration transaction.
+   * @param spokeProvider - The spoke provider.
+   * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
+   * @returns {Promise<Result<[Hex, Hex], MigrationError<'MIGRATION_FAILED'> | MigrationError<'CREATE_MIGRATION_INTENT_FAILED'> | RelayError>>}
+   * Returns a Result containing a tuple of [spokeTxHash, hubTxHash] if successful,
+   * or an error describing why the migration or relay failed.
+   *
+   * @example
+   * const result = await migrationService.createAndSubmitMigrateIntent(
+   *   {
+   *     token: 'ICX', // Token to migrate
+   *     icx: 'cx...', // Address of the ICX or wICX token to migrate
+   *     amount: 1000n, // Amount to migrate (in ICX decimals, usually 18)
+   *     to: '0x...', // Address to receive the migrated SODA tokens
+   *     action: 'migrate',
+   *   },
+   *   spokeProvider, // IconSpokeProvider instance
+   *   30000 // Optional timeout in milliseconds (default: 60000, i.e. 60 seconds)
+   * );
+   *
+   * if (!result.ok) {
+   *   // Handle error
+   * }
+   *
+   * const [
+   *  spokeTxHash, // transaction hash on the spoke chain
+   *  hubTxHash,   // transaction hash on the hub chain (i.e. the transaction that was relayed to the hub)
+   * ] = result.value;
+   * console.log('Migration transaction hashes:', { spokeTxHash, hubTxHash });
+   */
+  async createAndSubmitMigrateIntent(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+    try {
+      const txResult = await this.createMigrateIntent(params, spokeProvider);
+      if (!txResult.ok) {
+        return {
+          ok: false,
+          error: txResult.error
+        };
+      }
+      const packetResult = await relayTxAndWaitPacket(
+        txResult.value,
+        void 0,
+        spokeProvider,
+        this.config.relayerApiEndpoint,
+        timeout
+      );
+      if (!packetResult.ok) {
+        return packetResult;
+      }
+      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "MIGRATION_FAILED",
+          data: {
+            payload: params,
+            error
+          }
+        }
+      };
+    }
+  }
+  /**
+   * Creates a revert migration (SODA to ICX) intent and submits (relays) it to the spoke chain.
+   * @param params - The parameters for the revert migration transaction.
+   * @param spokeProvider - The SonicSpokeProvider instance.
+   * @param timeout - The timeout in milliseconds for the transaction. Default is 60 seconds.
+   *
+   * @returns {Promise<Result<[Hex, Hex], MigrationError<'REVERT_MIGRATION_FAILED'> | MigrationError<'CREATE_REVERT_MIGRATION_INTENT_FAILED'> | RelayError>>}
+   * Returns a Result containing a tuple of [hubTxHash, spokeTxHash] if successful,
+   * or an error describing why the revert migration or relay failed.
+   *
+   *
+   * @example
+   * const result = await migrationService.createAndSubmitRevertMigrationIntent(
+   *   {
+   *     amount: 1000n, // Amount of SODA tokens to revert
+   *     to: 'hx...', // Icon Address to receive the reverted SODA tokens as ICX
+   *     action: 'revert',
+   *   },
+   *   spokeProvider, // SonicSpokeProvider instance
+   *   30000 // Optional timeout in milliseconds (default: 60000, i.e. 60 seconds)
+   * );
+   *
+   * if (!result.ok) {
+   *   // Handle error
+   * }
+   *
+   * const [
+   *  hubTxHash,   // transaction hash on the hub chain
+   *  spokeTxHash, // transaction hash on the spoke chain (i.e. the transaction that was relayed to the spoke)
+   * ] = result.value;
+   * console.log('Revert migration transaction hashes:', { hubTxHash, spokeTxHash });
+   */
+  async createAndSubmitRevertMigrationIntent(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+    try {
+      const txResult = await this.createRevertMigrationIntent(params, spokeProvider);
+      if (!txResult.ok) {
+        return txResult;
+      }
+      const packetResult = await relayTxAndWaitPacket(
+        txResult.value,
+        void 0,
+        spokeProvider,
+        this.config.relayerApiEndpoint,
+        timeout
+      );
+      if (!packetResult.ok) {
+        return packetResult;
+      }
+      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "REVERT_MIGRATION_FAILED",
+          data: {
+            payload: params,
+            error
+          }
+        }
+      };
+    }
+  }
+  /**
+   * Migrates ICX or wICX tokens from ICON to the hub chain.
+   * This function handles the migration of ICX or wICX tokens to SODA tokens on the hub chain.
+   * Note: This function does not relay the transaction to the spoke chain.
+   * You should call the `isAllowanceValid` function before calling this function to check if the allowance is valid.
+   * You should call the `relayTxAndWaitPacket` function after calling this function to relay the transaction to the spoke chain.
+   *
+   * @param {MigrationParams} params - The parameters for the migration transaction.
+   * @param {IconSpokeProvider} spokeProvider - The spoke provider.
+   * @param {boolean} raw - Whether to return the raw transaction hash instead of the transaction receipt
+   * @returns {Promise<Result<TxReturnType<IconSpokeProvider, R>, MigrationError<'CREATE_MIGRATION_INTENT_FAILED'>>>} - Returns the raw transaction payload or transaction hash
+   *
+   * @example
+   * const result = await migrationService.createMigrateIntent(
+   *   {
+   *     icx: 'cx...', // Address of the ICX or wICX token to migrate
+   *     amount: 1000n, // Amount to migrate (in ICX decimals, usually 18)
+   *     to: '0x...', // Address to receive the migrated SODA tokens
+   *   },
+   *   spokeProvider, // IconSpokeProvider instance
+   *   true // Optional raw flag to return the raw transaction hash instead of the transaction receipt
+   * );
+   *
+   * if (!result.ok) {
+   *   // Handle error
+   * }
+   */
+  async createMigrateIntent(params, spokeProvider, raw) {
+    try {
+      invariant2__default.default(params.amount > 0, "Amount must be greater than 0");
+      invariant2__default.default(viem.isAddress(params.to), "Recipient address is required");
+      invariant2__default.default(
+        params.icx.toLowerCase() === spokeProvider.chainConfig.addresses.wICX.toLowerCase() || params.icx.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase(),
+        "Token must be wICX or native ICX token"
+      );
+      invariant2__default.default(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
+      invariant2__default.default(params.token === "ICX", "Token must be ICX");
+      const availableAmount = await this.icxMigration.getAvailableAmount();
+      if (availableAmount < params.amount) {
+        throw new Error(
+          `Insufficient liquidity. Available: ${availableAmount.toString()}, Requested: ${params.amount.toString()}`
+        );
+      }
+      const migrationData = this.icxMigration.migrateData(params);
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      const txResult = await SpokeService.deposit(
+        {
+          from: walletAddress,
+          token: params.icx,
+          amount: params.amount,
+          data: migrationData
+        },
+        spokeProvider,
+        this.hubProvider,
+        raw
+      );
+      return {
+        ok: true,
+        value: txResult
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "CREATE_MIGRATION_INTENT_FAILED",
+          data: {
+            payload: params,
+            error
+          }
+        }
+      };
+    }
+  }
+  /**
+   * Creates a revert migration intent transaction on the hub chain.
+   * Note: This function does not relay the transaction to the spoke chain.
+   * You should call the `isAllowanceValid` function before calling this function to check if the allowance is valid.
+   * You should call the `relayTxAndWaitPacket` function after calling this function to relay the transaction to the spoke chain.
+   * @param {IcxCreateRevertMigrationParams} - The parameters for the revert migration transaction.
+   * @param {SonicSpokeProvider} spokeProvider - The spoke provider.
+   * @param {boolean} raw - Whether to return the raw transaction hash instead of the transaction receipt
+   * @returns {Promise<Result<TxReturnType<SonicSpokeProvider, R>, MigrationError<'CREATE_REVERT_MIGRATION_INTENT_FAILED'>>>} - Returns the transaction hash or error
+   *
+   * @example
+   * const result = await migrationService.createRevertMigrationIntent(
+   *   {
+   *     amount: 1000n, // Amount of SODA tokens to revert
+   *     to: 'hx...', // Icon Address to receive the reverted SODA tokens as ICX
+   *     action: 'revert',
+   *   },
+   */
+  async createRevertMigrationIntent(params, spokeProvider, raw) {
+    try {
+      const wallet = await spokeProvider.walletProvider.getWalletAddress();
+      const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+      const data = this.icxMigration.revertMigration({
+        wICX: spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].addresses.wICX,
+        amount: params.amount,
+        to: encodeAddress(types.ICON_MAINNET_CHAIN_ID, params.to),
+        userWallet: userRouter
+      });
+      const txResult = await SonicSpokeService.deposit(
+        {
+          from: wallet,
+          token: this.hubProvider.chainConfig.addresses.sodaToken,
+          amount: params.amount,
+          data
+        },
+        spokeProvider,
+        raw
+      );
+      return {
+        ok: true,
+        value: txResult
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        error: {
+          code: "CREATE_REVERT_MIGRATION_INTENT_FAILED",
+          data: {
+            payload: params,
+            error
+          }
+        }
+      };
+    }
+  }
+};
+
 // src/entities/Sodax.ts
 var Sodax = class {
   config;
@@ -10944,6 +12553,8 @@ var Sodax = class {
   // Solver service enabling intent based swaps
   moneyMarket;
   // Money Market service enabling cross-chain lending and borrowing
+  migration;
+  // ICX migration service enabling ICX migration to SODA
   hubProvider;
   // hub provider for the hub chain (e.g. Sonic mainnet)
   relayerApiEndpoint;
@@ -10954,39 +12565,40 @@ var Sodax = class {
     this.hubProvider = new EvmHubProvider(config?.hubProviderConfig);
     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);
   }
 };
 
 // src/types.ts
-var IntentStatusCode = /* @__PURE__ */ ((IntentStatusCode2) => {
-  IntentStatusCode2[IntentStatusCode2["NOT_FOUND"] = -1] = "NOT_FOUND";
-  IntentStatusCode2[IntentStatusCode2["NOT_STARTED_YET"] = 1] = "NOT_STARTED_YET";
-  IntentStatusCode2[IntentStatusCode2["STARTED_NOT_FINISHED"] = 2] = "STARTED_NOT_FINISHED";
-  IntentStatusCode2[IntentStatusCode2["SOLVED"] = 3] = "SOLVED";
-  IntentStatusCode2[IntentStatusCode2["FAILED"] = 4] = "FAILED";
-  return IntentStatusCode2;
-})(IntentStatusCode || {});
-var IntentErrorCode = /* @__PURE__ */ ((IntentErrorCode2) => {
-  IntentErrorCode2[IntentErrorCode2["NO_PATH_FOUND"] = -4] = "NO_PATH_FOUND";
-  IntentErrorCode2[IntentErrorCode2["NO_PRIVATE_LIQUIDITY"] = -5] = "NO_PRIVATE_LIQUIDITY";
-  IntentErrorCode2[IntentErrorCode2["NOT_ENOUGH_PRIVATE_LIQUIDITY"] = -8] = "NOT_ENOUGH_PRIVATE_LIQUIDITY";
-  IntentErrorCode2[IntentErrorCode2["NO_EXECUTION_MODULE_FOUND"] = -7] = "NO_EXECUTION_MODULE_FOUND";
-  IntentErrorCode2[IntentErrorCode2["QUOTE_NOT_FOUND"] = -8] = "QUOTE_NOT_FOUND";
-  IntentErrorCode2[IntentErrorCode2["QUOTE_NOT_MATCH"] = -9] = "QUOTE_NOT_MATCH";
-  IntentErrorCode2[IntentErrorCode2["INTENT_DATA_NOT_MATCH_QUOTE"] = -10] = "INTENT_DATA_NOT_MATCH_QUOTE";
-  IntentErrorCode2[IntentErrorCode2["NO_GAS_HANDLER_FOR_BLOCKCHAIN"] = -11] = "NO_GAS_HANDLER_FOR_BLOCKCHAIN";
-  IntentErrorCode2[IntentErrorCode2["INTENT_NOT_FOUND"] = -12] = "INTENT_NOT_FOUND";
-  IntentErrorCode2[IntentErrorCode2["QUOTE_EXPIRED"] = -13] = "QUOTE_EXPIRED";
-  IntentErrorCode2[IntentErrorCode2["MAX_INPUT_AMOUNT"] = -14] = "MAX_INPUT_AMOUNT";
-  IntentErrorCode2[IntentErrorCode2["MAX_DIFF_OUTPUT"] = -15] = "MAX_DIFF_OUTPUT";
-  IntentErrorCode2[IntentErrorCode2["STOPPED"] = -16] = "STOPPED";
-  IntentErrorCode2[IntentErrorCode2["NO_ORACLE_MODULE_FOUND"] = -17] = "NO_ORACLE_MODULE_FOUND";
-  IntentErrorCode2[IntentErrorCode2["NEGATIVE_INPUT_AMOUNT"] = -18] = "NEGATIVE_INPUT_AMOUNT";
-  IntentErrorCode2[IntentErrorCode2["INTENT_ALREADY_IN_ORDERBOOK"] = -19] = "INTENT_ALREADY_IN_ORDERBOOK";
-  IntentErrorCode2[IntentErrorCode2["CREATE_INTENT_ORDER_FAILED"] = -998] = "CREATE_INTENT_ORDER_FAILED";
-  IntentErrorCode2[IntentErrorCode2["UNKNOWN"] = -999] = "UNKNOWN";
-  return IntentErrorCode2;
-})(IntentErrorCode || {});
+var SolverIntentStatusCode = /* @__PURE__ */ ((SolverIntentStatusCode2) => {
+  SolverIntentStatusCode2[SolverIntentStatusCode2["NOT_FOUND"] = -1] = "NOT_FOUND";
+  SolverIntentStatusCode2[SolverIntentStatusCode2["NOT_STARTED_YET"] = 1] = "NOT_STARTED_YET";
+  SolverIntentStatusCode2[SolverIntentStatusCode2["STARTED_NOT_FINISHED"] = 2] = "STARTED_NOT_FINISHED";
+  SolverIntentStatusCode2[SolverIntentStatusCode2["SOLVED"] = 3] = "SOLVED";
+  SolverIntentStatusCode2[SolverIntentStatusCode2["FAILED"] = 4] = "FAILED";
+  return SolverIntentStatusCode2;
+})(SolverIntentStatusCode || {});
+var SolverIntentErrorCode = /* @__PURE__ */ ((SolverIntentErrorCode2) => {
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NO_PATH_FOUND"] = -4] = "NO_PATH_FOUND";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NO_PRIVATE_LIQUIDITY"] = -5] = "NO_PRIVATE_LIQUIDITY";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NOT_ENOUGH_PRIVATE_LIQUIDITY"] = -8] = "NOT_ENOUGH_PRIVATE_LIQUIDITY";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NO_EXECUTION_MODULE_FOUND"] = -7] = "NO_EXECUTION_MODULE_FOUND";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["QUOTE_NOT_FOUND"] = -8] = "QUOTE_NOT_FOUND";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["QUOTE_NOT_MATCH"] = -9] = "QUOTE_NOT_MATCH";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["INTENT_DATA_NOT_MATCH_QUOTE"] = -10] = "INTENT_DATA_NOT_MATCH_QUOTE";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NO_GAS_HANDLER_FOR_BLOCKCHAIN"] = -11] = "NO_GAS_HANDLER_FOR_BLOCKCHAIN";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["INTENT_NOT_FOUND"] = -12] = "INTENT_NOT_FOUND";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["QUOTE_EXPIRED"] = -13] = "QUOTE_EXPIRED";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["MAX_INPUT_AMOUNT"] = -14] = "MAX_INPUT_AMOUNT";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["MAX_DIFF_OUTPUT"] = -15] = "MAX_DIFF_OUTPUT";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["STOPPED"] = -16] = "STOPPED";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NO_ORACLE_MODULE_FOUND"] = -17] = "NO_ORACLE_MODULE_FOUND";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["NEGATIVE_INPUT_AMOUNT"] = -18] = "NEGATIVE_INPUT_AMOUNT";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["INTENT_ALREADY_IN_ORDERBOOK"] = -19] = "INTENT_ALREADY_IN_ORDERBOOK";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["CREATE_INTENT_ORDER_FAILED"] = -998] = "CREATE_INTENT_ORDER_FAILED";
+  SolverIntentErrorCode2[SolverIntentErrorCode2["UNKNOWN"] = -999] = "UNKNOWN";
+  return SolverIntentErrorCode2;
+})(SolverIntentErrorCode || {});
 
 exports.BigIntToHex = BigIntToHex;
 exports.CWSpokeProvider = CWSpokeProvider;
@@ -11009,15 +12621,19 @@ exports.HubVaultSymbols = HubVaultSymbols;
 exports.ICON_TX_RESULT_WAIT_MAX_RETRY = ICON_TX_RESULT_WAIT_MAX_RETRY;
 exports.INTENT_RELAY_CHAIN_IDS = INTENT_RELAY_CHAIN_IDS;
 exports.IconSpokeProvider = IconSpokeProvider;
+exports.IcxMigrationService = IcxMigrationService;
 exports.IntentCreatedEventAbi = IntentCreatedEventAbi;
 exports.IntentDataType = IntentDataType;
-exports.IntentErrorCode = IntentErrorCode;
-exports.IntentStatusCode = IntentStatusCode;
 exports.IntentsAbi = IntentsAbi;
 exports.MAX_UINT256 = MAX_UINT256;
+exports.MigrationService = MigrationService;
 exports.MoneyMarketService = MoneyMarketService;
+exports.STELLAR_DEFAULT_TX_TIMEOUT_SECONDS = STELLAR_DEFAULT_TX_TIMEOUT_SECONDS;
+exports.STELLAR_PRIORITY_FEE = STELLAR_PRIORITY_FEE;
 exports.Sodax = Sodax;
 exports.SolanaSpokeProvider = SolanaSpokeProvider;
+exports.SolverIntentErrorCode = SolverIntentErrorCode;
+exports.SolverIntentStatusCode = SolverIntentStatusCode;
 exports.SolverService = SolverService;
 exports.SonicSpokeProvider = SonicSpokeProvider;
 exports.SonicSpokeService = SonicSpokeService;
@@ -11066,11 +12682,25 @@ exports.isEvmUninitializedConfig = isEvmUninitializedConfig;
 exports.isEvmUninitializedPrivateKeyConfig = isEvmUninitializedPrivateKeyConfig;
 exports.isIconAddress = isIconAddress;
 exports.isIconSpokeProvider = isIconSpokeProvider;
+exports.isIntentCreationFailedError = isIntentCreationFailedError;
+exports.isIntentCreationUnknownError = isIntentCreationUnknownError;
+exports.isIntentPostExecutionFailedError = isIntentPostExecutionFailedError;
 exports.isIntentRelayChainId = isIntentRelayChainId;
+exports.isIntentSubmitTxFailedError = isIntentSubmitTxFailedError;
 exports.isJsonRpcPayloadResponse = isJsonRpcPayloadResponse;
+exports.isMoneyMarketBorrowUnknownError = isMoneyMarketBorrowUnknownError;
+exports.isMoneyMarketCreateBorrowIntentFailedError = isMoneyMarketCreateBorrowIntentFailedError;
+exports.isMoneyMarketCreateRepayIntentFailedError = isMoneyMarketCreateRepayIntentFailedError;
+exports.isMoneyMarketCreateSupplyIntentFailedError = isMoneyMarketCreateSupplyIntentFailedError;
+exports.isMoneyMarketCreateWithdrawIntentFailedError = isMoneyMarketCreateWithdrawIntentFailedError;
+exports.isMoneyMarketRelayTimeoutError = isMoneyMarketRelayTimeoutError;
+exports.isMoneyMarketRepayUnknownError = isMoneyMarketRepayUnknownError;
 exports.isMoneyMarketReserveAsset = isMoneyMarketReserveAsset;
 exports.isMoneyMarketReserveHubAsset = isMoneyMarketReserveHubAsset;
+exports.isMoneyMarketSubmitTxFailedError = isMoneyMarketSubmitTxFailedError;
+exports.isMoneyMarketSupplyUnknownError = isMoneyMarketSupplyUnknownError;
 exports.isMoneyMarketSupportedToken = isMoneyMarketSupportedToken;
+exports.isMoneyMarketWithdrawUnknownError = isMoneyMarketWithdrawUnknownError;
 exports.isNativeToken = isNativeToken;
 exports.isPartnerFeeAmount = isPartnerFeeAmount;
 exports.isPartnerFeePercentage = isPartnerFeePercentage;
@@ -11086,8 +12716,10 @@ exports.isValidHubAsset = isValidHubAsset;
 exports.isValidIntentRelayChainId = isValidIntentRelayChainId;
 exports.isValidOriginalAssetAddress = isValidOriginalAssetAddress;
 exports.isValidSpokeChainId = isValidSpokeChainId;
+exports.isWaitUntilIntentExecutedFailed = isWaitUntilIntentExecutedFailed;
 exports.moneyMarketReserveAssets = moneyMarketReserveAssets;
 exports.moneyMarketReserveHubAssetsSet = moneyMarketReserveHubAssetsSet;
+exports.moneyMarketSupportedTokens = moneyMarketSupportedTokens;
 exports.originalAssetTohubAssetMap = originalAssetTohubAssetMap;
 exports.poolAbi = poolAbi;
 exports.randomUint256 = randomUint256;