@sodax/sdk 0.0.1-rc.16 → 0.0.1-rc.18

package/dist/index.cjs

@@ -6239,14 +6239,20 @@ var spokeChainConfig = {
       wrappedSonic: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38"
     },
     nativeToken: "0x0000000000000000000000000000000000000000",
-    bnUSD: "0x6958a4CBFe11406E2a1c1d3a71A1971aD8B3b92F",
+    bnUSD: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131",
     supportedTokens: {
-      Sonic: {
-        symbol: "Sonic",
+      S: {
+        symbol: "S",
         name: "Sonic",
         decimals: 18,
         address: "0x0000000000000000000000000000000000000000"
       },
+      bnUSD: {
+        symbol: "bnUSD",
+        name: "bnUSD",
+        decimals: 18,
+        address: "0xE801CA34E19aBCbFeA12025378D19c4FBE250131"
+      },
       WETH: {
         symbol: "WETH",
         name: "Wrapped Ether",
@@ -6265,8 +6271,8 @@ var spokeChainConfig = {
         decimals: 6,
         address: "0x6047828dc181963ba44974801FF68e538dA5eaF9"
       },
-      wSonic: {
-        symbol: "wSonic",
+      wS: {
+        symbol: "wS",
         name: "Wrapped Sonic",
         decimals: 18,
         address: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38"
@@ -6815,6 +6821,14 @@ var spokeChainConfig = {
         address: "cx3975b43d260fb8ec802cef6e60c2f4d07486f11d"
       },
       bnUSD: {
+        // same as legacy
+        symbol: "bnUSD",
+        name: "bnUSD",
+        decimals: 18,
+        address: "cx88fd7df7ddff82f7cc735c871dc519838cb235bb"
+      },
+      legacybnUSD: {
+        // duplicate of bnUSD  purely for consistency with other legacy tokens chains (sui, stellar)
         symbol: "bnUSD",
         name: "bnUSD",
         decimals: 18,
@@ -6852,6 +6866,7 @@ var HubVaultSymbols = [
 ];
 var hubVaults = {
   IbnUSD: {
+    // ICON bnUSD (Migration) vault on Sonic contains legacy bnUSD tokens (stellar, sui, icon)
     address: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51",
     reserves: [
       // hub asset addresses contained in the vault
@@ -6882,6 +6897,7 @@ var hubVaults = {
     ]
   },
   bnUSD: {
+    // new bnUSD vault on Sonic (also contains IbnUSD vault token as part of it)
     address: "0xe801ca34e19abcbfea12025378d19c4fbe250131",
     reserves: [
       // hub asset addresses contained in the vault
@@ -7027,45 +7043,81 @@ var hubVaults = {
     ]
   }
 };
+var bnUSDLegacySpokeChainIds = [
+  types.ICON_MAINNET_CHAIN_ID,
+  types.SUI_MAINNET_CHAIN_ID,
+  types.STELLAR_MAINNET_CHAIN_ID
+];
+var newbnUSDSpokeChainIds = types.SPOKE_CHAIN_IDS.filter((chainId) => chainId !== types.ICON_MAINNET_CHAIN_ID);
+var bnUSDLegacyTokens = [
+  spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
+  spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.legacybnUSD,
+  spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.legacybnUSD
+];
+var bnUSDNewTokens = newbnUSDSpokeChainIds.map((chainId) => spokeChainConfig[chainId].supportedTokens.bnUSD);
+var isLegacybnUSDChainId = (chainId) => {
+  return bnUSDLegacySpokeChainIds.includes(chainId);
+};
+var isNewbnUSDChainId = (chainId) => {
+  return newbnUSDSpokeChainIds.includes(chainId);
+};
+var isLegacybnUSDToken = (token) => {
+  if (typeof token === "string") {
+    return bnUSDLegacyTokens.some((t) => t.address.toLowerCase() === token.toLowerCase());
+  }
+  return bnUSDLegacyTokens.some((t) => t.address.toLowerCase() === token.address.toLowerCase());
+};
+var isNewbnUSDToken = (token) => {
+  if (typeof token === "string") {
+    return newbnUSDSpokeChainIds.map((chainId) => spokeChainConfig[chainId].supportedTokens.bnUSD).some((t) => t.address.toLowerCase() === token.toLowerCase());
+  }
+  return newbnUSDSpokeChainIds.map((chainId) => spokeChainConfig[chainId].supportedTokens.bnUSD).some((t) => t.address.toLowerCase() === token.address.toLowerCase());
+};
+var getAllLegacybnUSDTokens = () => {
+  return bnUSDLegacySpokeChainIds.map((chainId) => ({
+    token: spokeChainConfig[chainId].supportedTokens.legacybnUSD,
+    chainId
+  }));
+};
 var hubAssets = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].nativeToken]: {
-      asset: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
       decimal: 18,
       symbol: "S",
       name: "Sonic",
       vault: hubVaults.sodaS.address
     },
-    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wSonic.address]: {
-      asset: "0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38",
+    [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address]: {
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
       decimal: 18,
-      symbol: "wSonic",
+      symbol: "wS",
       name: "Sonic",
       vault: hubVaults.sodaS.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH.address]: {
-      asset: "0x50c42dEAcD8Fc9773493ED674b675bE577f2634b",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH.address,
       decimal: 18,
       symbol: "WETH",
       name: "Wrapped Ethereum",
       vault: hubVaults.sodaETH.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC.address]: {
-      asset: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC.address,
       decimal: 6,
       symbol: "USDC ",
       name: "USD Coin",
       vault: hubVaults.sodaUSDC.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT.address]: {
-      asset: "0x6047828dc181963ba44974801ff68e538da5eaf9",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT.address,
       decimal: 6,
       symbol: "USDT",
       name: "Tether USD",
       vault: hubVaults.sodaUSDT.address
     },
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.SODA.address]: {
-      asset: "0x7c7d53EEcda37a87ce0D5bf8E0b24512A48dC963",
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.SODA.address,
       decimal: 18,
       symbol: "SODA",
       name: "SODA",
@@ -7380,7 +7432,7 @@ var hubAssets = {
       decimal: 18,
       symbol: "legacybnUSD",
       name: "legacybnUSD",
-      vault: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51"
+      vault: hubVaults.IbnUSD.address
     }
   },
   [types.SUI_MAINNET_CHAIN_ID]: {
@@ -7458,7 +7510,7 @@ var hubAssets = {
       decimal: 9,
       symbol: "bnUSD",
       name: "legacybnUSD",
-      vault: "0x9D4b663Eb075d2a1C7B8eaEFB9eCCC0510388B51"
+      vault: hubVaults.IbnUSD.address
     }
   },
   [types.SOLANA_MAINNET_CHAIN_ID]: {
@@ -7505,7 +7557,7 @@ var hubAssets = {
       decimal: 18,
       symbol: "bnUSD",
       name: "bnUSD",
-      vault: hubVaults.bnUSD.address
+      vault: hubVaults.IbnUSD.address
     },
     [spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.BALN.address]: {
       asset: "0xde8e19a099fedf9d617599f62c5f7f020d92b572",
@@ -7527,10 +7579,11 @@ var solverConfig = {
 var getSolverConfig = (chainId) => solverConfig[chainId];
 var solverSupportedTokens = {
   [types.SONIC_MAINNET_CHAIN_ID]: [
-    // 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)
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.S,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.WETH,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDC,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.USDT,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS
   ],
   [types.AVALANCHE_MAINNET_CHAIN_ID]: [
     spokeChainConfig[types.AVALANCHE_MAINNET_CHAIN_ID].supportedTokens.AVAX,
@@ -7697,35 +7750,13 @@ var moneyMarketSupportedTokens = {
   ],
   [types.NIBIRU_MAINNET_CHAIN_ID]: [],
   [types.SONIC_MAINNET_CHAIN_ID]: [
-    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.Sonic,
+    spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.S,
     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[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS
   ]
 };
-var migrationConfig = {
-  bnUSD: {
-    [types.ICON_MAINNET_CHAIN_ID]: {
-      legacybnUSD: spokeChainConfig[types.ICON_MAINNET_CHAIN_ID].supportedTokens.bnUSD,
-      newbnUSD: hubVaults.bnUSD.address
-    },
-    [types.SUI_MAINNET_CHAIN_ID]: {
-      legacybnUSD: spokeChainConfig[types.SUI_MAINNET_CHAIN_ID].supportedTokens.legacybnUSD,
-      newbnUSD: hubVaults.bnUSD.address
-    },
-    [types.STELLAR_MAINNET_CHAIN_ID]: {
-      legacybnUSD: spokeChainConfig[types.STELLAR_MAINNET_CHAIN_ID].supportedTokens.legacybnUSD,
-      newbnUSD: hubVaults.bnUSD.address
-    }
-  },
-  ICX: {
-    [types.ICON_MAINNET_CHAIN_ID]: {
-      icx: spokeChainConfig[types.ICON_MAINNET_CHAIN_ID]["nativeToken"],
-      wICX: spokeChainConfig[types.ICON_MAINNET_CHAIN_ID]["addresses"]["wICX"]
-    }
-  }
-};
 var isMoneyMarketSupportedToken = (chainId, token) => moneyMarketSupportedTokens[chainId].some((t) => t.address.toLowerCase() === token.toLowerCase());
 var getSupportedMoneyMarketTokens = (chainId) => moneyMarketSupportedTokens[chainId];
 var hubVaultsAddressSet = new Set(
@@ -9052,16 +9083,28 @@ var EvmWalletAbstraction = class {
 var WalletAbstractionService = class {
   constructor() {
   }
-  static async getUserHubWalletAddress(chainId, address, hubProvider, spokeProvider) {
-    if (chainId === hubProvider.chainConfig.chain.id) {
+  /**
+   * Gets the hub wallet address for a user based on their spoke chain address.
+   * @param address - The user's address on the spoke chain
+   * @param spokeProvider - The provider for interacting with the spoke chain
+   * @param hubProvider - The provider for interacting with the hub chain
+   * @returns The user's hub wallet address
+   */
+  static async getUserHubWalletAddress(address, spokeProvider, hubProvider) {
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, address);
+    if (spokeProvider.chainConfig.chain.id === hubProvider.chainConfig.chain.id) {
       if (spokeProvider instanceof SonicSpokeProvider) {
-        return SonicSpokeService.getUserRouter(address, spokeProvider);
+        return SonicSpokeService.getUserRouter(encodedAddress, spokeProvider);
       }
       throw new Error(
         "[WalletAbstractionService.getUserHubWalletAddress] Invalid spoke provider. Sonic spoke provider is required."
       );
     }
-    return EvmWalletAbstraction.getUserHubWalletAddress(chainId, address, hubProvider);
+    return EvmWalletAbstraction.getUserHubWalletAddress(
+      spokeProvider.chainConfig.chain.id,
+      encodedAddress,
+      hubProvider
+    );
   }
 };
 async function retry(action, retryCount = DEFAULT_MAX_RETRY, delayMs = DEFAULT_RETRY_DELAY_MS) {
@@ -9439,26 +9482,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9513,12 +9562,11 @@ var MoneyMarketService = class _MoneyMarketService {
         isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
         `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
       );
-      const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-        spokeProvider.chainConfig.chain.id,
-        walletAddressBytes,
-        this.hubProvider,
-        spokeProvider
+        walletAddress,
+        spokeProvider,
+        this.hubProvider
       );
       const data = this.buildSupplyData(
         params.token,
@@ -9526,7 +9574,6 @@ var MoneyMarketService = class _MoneyMarketService {
         params.amount,
         spokeProvider.chainConfig.chain.id
       );
-      const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       const txResult = await SpokeService.deposit(
         {
           from: walletAddress,
@@ -9593,26 +9640,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9664,16 +9717,16 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildBorrowData(
       hubWallet,
-      walletAddressBytes,
+      encodedAddress,
       params.token,
       params.amount,
       spokeProvider.chainConfig.chain.id
@@ -9722,26 +9775,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9793,16 +9852,16 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const encodedAddress = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildWithdrawData(
       hubWallet,
-      walletAddressBytes,
+      encodedAddress,
       params.token,
       params.amount,
       spokeProvider.chainConfig.chain.id
@@ -9851,26 +9910,32 @@ var MoneyMarketService = class _MoneyMarketService {
       if (!txResult.ok) {
         return txResult;
       }
-      const packetResult = await relayTxAndWaitPacket(
-        txResult.value,
-        spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
-        spokeProvider,
-        this.config.relayerApiEndpoint,
-        timeout
-      );
-      if (!packetResult.ok) {
-        return {
-          ok: false,
-          error: {
-            code: packetResult.error.code,
-            data: {
-              error: packetResult.error,
-              payload: txResult.value
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const packetResult = await relayTxAndWaitPacket(
+          txResult.value,
+          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          spokeProvider,
+          this.config.relayerApiEndpoint,
+          timeout
+        );
+        if (!packetResult.ok) {
+          return {
+            ok: false,
+            error: {
+              code: packetResult.error.code,
+              data: {
+                error: packetResult.error,
+                payload: txResult.value
+              }
             }
-          }
-        };
+          };
+        }
+        intentTxHash = packetResult.value.dst_tx_hash;
+      } else {
+        intentTxHash = txResult.value;
       }
-      return { ok: true, value: [txResult.value, packetResult.value.dst_tx_hash] };
+      return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
       return {
         ok: false,
@@ -9924,15 +9989,13 @@ var MoneyMarketService = class _MoneyMarketService {
       isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
       `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
     );
-    const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
+    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const hubWallet = await WalletAbstractionService.getUserHubWalletAddress(
-      spokeProvider.chainConfig.chain.id,
-      walletAddressBytes,
-      this.hubProvider,
-      spokeProvider
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
     );
     const data = this.buildRepayData(params.token, hubWallet, params.amount, spokeProvider.chainConfig.chain.id);
-    const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const txResult = await SpokeService.deposit(
       {
         from: walletAddress,
@@ -11641,6 +11704,18 @@ function isMoneyMarketWithdrawUnknownError(error) {
 function isMoneyMarketRepayUnknownError(error) {
   return typeof error === "object" && error !== null && "code" in error && error.code === "REPAY_UNKNOWN_ERROR";
 }
+function isIcxMigrateParams(value) {
+  return typeof value === "object" && value !== null && "address" in value && "amount" in value && "to" in value;
+}
+function isUnifiedBnUSDMigrateParams(value) {
+  return typeof value === "object" && value !== null && "srcChainId" in value && "srcbnUSD" in value && "dstChainId" in value && "dstbnUSD" in value && "amount" in value && "to" in value;
+}
+function isBalnMigrateParams(value) {
+  return typeof value === "object" && value !== null && "amount" in value && "lockupPeriod" in value && "to" in value && "stake" in value;
+}
+function isIcxCreateRevertMigrationParams(value) {
+  return typeof value === "object" && value !== null && "amount" in value && "to" in value;
+}
 
 // src/services/spoke/SpokeService.ts
 var SpokeService = class {
@@ -12523,15 +12598,15 @@ var SolverService = class {
    *   // handle error
    * }
    */
-  async swap(payload, spokeProvider, fee, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
-    return this.createAndSubmitIntent(payload, spokeProvider, fee, timeout);
+  async swap(payload, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+    return this.createAndSubmitIntent(payload, spokeProvider, this.config.partnerFee, 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
+   * @returns {Promise<Result<[SolverExecutionResponse, Intent, Hex], IntentError<IntentErrorCode>>>} The solver execution response, intent, and packet data
    *
    * @example
    * const payload = {
@@ -12560,49 +12635,55 @@ var SolverService = class {
    *   // handle error
    * }
    */
-  async createAndSubmitIntent(payload, spokeProvider, fee, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async createAndSubmitIntent(payload, spokeProvider, fee = this.config.partnerFee, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
       const createIntentResult = await this.createIntent(payload, spokeProvider, fee, false);
       if (!createIntentResult.ok) {
         return createIntentResult;
       }
       const [spokeTxHash, intent, data] = createIntentResult.value;
-      const intentRelayChainId = getIntentRelayChainId(payload.srcChain).toString();
-      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
+      let intentTxHash = null;
+      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+        const intentRelayChainId = getIntentRelayChainId(payload.srcChain).toString();
+        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 this.submitIntent(submitPayload);
+        if (!submitResult.ok) {
+          return submitResult;
         }
-      } : {
-        action: "submit",
-        params: {
-          chain_id: intentRelayChainId,
-          tx_hash: spokeTxHash
+        const packet = await waitUntilIntentExecuted({
+          intentRelayChainId,
+          spokeTxHash,
+          timeout,
+          apiUrl: this.config.relayerApiEndpoint
+        });
+        if (!packet.ok) {
+          return {
+            ok: false,
+            error: packet.error
+          };
         }
-      };
-      const submitResult = await this.submitIntent(submitPayload);
-      if (!submitResult.ok) {
-        return submitResult;
-      }
-      const packet = await waitUntilIntentExecuted({
-        intentRelayChainId,
-        spokeTxHash,
-        timeout,
-        apiUrl: this.config.relayerApiEndpoint
-      });
-      if (!packet.ok) {
-        return {
-          ok: false,
-          error: packet.error
-        };
+        intentTxHash = packet.value.dst_tx_hash;
+      } else {
+        intentTxHash = spokeTxHash;
       }
       const result = await this.postExecution({
-        intent_tx_hash: packet.value.dst_tx_hash
+        intent_tx_hash: intentTxHash
       });
       if (!result.ok) {
         return {
@@ -12615,7 +12696,7 @@ var SolverService = class {
       }
       return {
         ok: true,
-        value: [result.value, intent, packet.value]
+        value: [result.value, intent, intentTxHash]
       };
     } catch (error) {
       return {
@@ -12785,12 +12866,7 @@ var SolverService = class {
         "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,
-        this.hubProvider,
-        spokeProvider
-      );
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
         {
           ...params,
@@ -12840,13 +12916,9 @@ var SolverService = class {
     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 walletAddress = await spokeProvider.walletProvider.getWalletAddress();
+      const walletAddressBytes = encodeAddress(spokeProvider.chainConfig.chain.id, walletAddress);
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const calls = [];
       const intentsContract = this.config.intentsContract;
       calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
@@ -13471,9 +13543,25 @@ var MigrationService = class {
         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 || spokeProvider instanceof SuiSpokeProvider || spokeProvider instanceof StellarSpokeProvider,
-          "Spoke provider must be an instance of IconSpokeProvider, SuiSpokeProvider, or StellarSpokeProvider"
+          isIcxMigrateParams(params) || isBalnMigrateParams(params) || isUnifiedBnUSDMigrateParams(params),
+          "Invalid params"
         );
+        if (spokeProvider instanceof IconSpokeProvider && (isIcxMigrateParams(params) || isBalnMigrateParams(params))) {
+          return {
+            ok: true,
+            value: true
+          };
+        }
+        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
+          const evmSpokeProvider = spokeProvider;
+          return await Erc20Service.isAllowanceValid(
+            params.srcbnUSD,
+            params.amount,
+            await evmSpokeProvider.walletProvider.getWalletAddress(),
+            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
+            evmSpokeProvider
+          );
+        }
         return {
           ok: true,
           value: true
@@ -13482,19 +13570,28 @@ var MigrationService = class {
       if (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);
-        return await Erc20Service.isAllowanceValid(
-          this.hubProvider.chainConfig.addresses.sodaToken,
-          params.amount,
-          wallet,
-          userRouter,
-          spokeProvider
-        );
+        invariant2__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
+          const wallet = await spokeProvider.walletProvider.getWalletAddress();
+          const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          return await Erc20Service.isAllowanceValid(
+            this.hubProvider.chainConfig.addresses.sodaToken,
+            params.amount,
+            wallet,
+            userRouter,
+            spokeProvider
+          );
+        }
+        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
+          const evmSpokeProvider = spokeProvider;
+          return await Erc20Service.isAllowanceValid(
+            params.srcbnUSD,
+            params.amount,
+            await evmSpokeProvider.walletProvider.getWalletAddress(),
+            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
+            evmSpokeProvider
+          );
+        }
       }
       return {
         ok: false,
@@ -13528,25 +13625,65 @@ var MigrationService = class {
    */
   async approve(params, action, spokeProvider, raw) {
     try {
+      if (action === "migrate") {
+        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(isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
+          const evmSpokeProvider = spokeProvider;
+          const result = await Erc20Service.approve(
+            params.srcbnUSD,
+            params.amount,
+            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
+            evmSpokeProvider,
+            raw
+          );
+          return {
+            ok: true,
+            value: result
+          };
+        }
+        return {
+          ok: false,
+          error: new Error("Invalid params for migrate action")
+        };
+      }
       if (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
-        );
+        invariant2__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
+        if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
+          const wallet = await spokeProvider.walletProvider.getWalletAddress();
+          const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          const result = await Erc20Service.approve(
+            this.hubProvider.chainConfig.addresses.sodaToken,
+            params.amount,
+            userRouter,
+            spokeProvider,
+            raw
+          );
+          return {
+            ok: true,
+            value: result
+          };
+        }
+        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
+          const evmSpokeProvider = spokeProvider;
+          const result = await Erc20Service.approve(
+            params.srcbnUSD,
+            params.amount,
+            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
+            evmSpokeProvider,
+            raw
+          );
+          return {
+            ok: true,
+            value: result
+          };
+        }
         return {
-          ok: true,
-          value: result
+          ok: false,
+          error: new Error("Invalid params or chain type for revert action")
         };
       }
       return {
@@ -13561,27 +13698,37 @@ var MigrationService = class {
     }
   }
   /**
-   * Migrates legacy bnUSD tokens to new bnUSD tokens on the hub chain (sonic).
-   * This function handles the migration of legacy bnUSD tokens to new bnUSD tokens.
+   * Migrates bnUSD tokens between legacy and new formats across supported spoke chains via the hub chain (sonic).
+   * Handles both legacy-to-new and new-to-legacy bnUSD migrations, enforcing validation and relaying the transaction.
    *
-   * @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.
+   * @param params - Migration parameters, including source/destination chain IDs, token addresses, amount, and recipient.
+   * @param spokeProvider - The SpokeProvider instance for the source chain.
+   * @param timeout - Optional timeout in milliseconds for the relay operation (default: 60 seconds).
+   * @param unchecked - Optional flag to skip validation checks (default: false).
    * @returns {Promise<Result<[string, 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.
-   *
+   *   Result containing a tuple: [spokeTxHash, hubTxHash] if successful, or an error describing the failure.
    *
    * @example
-   * // Example: Migrate legacy bnUSD tokens to new bnUSD tokens on the hub chain (sonic)
+   * // Migrate legacy bnUSD to new bnUSD
    * const result = await sodax.migration.migratebnUSD({
-   *   address: 'cx88fd7df7ddff82f7cc735c871dc519838cb235bb', // mock legacy bnUSD address
-   *   srcChainID: '0x1.icon', // source chain ID (e.g., ICON_MAINNET_CHAIN_ID)
-   *   amount: 1000000000000000000n,
-   *   to: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd', // recipient address
-   *   dstChainID: 'sonic', // destination hub chain ID (e.g., SONIC_MAINNET_CHAIN_ID)
+   *   srcChainId: '0x1.icon', // Source chain ID (legacy)
+   *   dstChainId: 'sonic',    // Destination chain ID (new)
+   *   srcbnUSD: 'cx...',      // Legacy bnUSD token address
+   *   dstbnUSD: '0x...',      // New bnUSD token address
+   *   amount: 1000n,          // Amount to migrate
+   *   to: '0x...',            // Recipient address on destination chain
    * }, iconSpokeProvider);
    *
+   * // Reverse migration: new bnUSD to legacy bnUSD
+   * const result = await sodax.migration.migratebnUSD({
+   *   srcChainId: 'sonic',    // Source chain ID (new)
+   *   dstChainId: '0x1.icon', // Destination chain ID (legacy)
+   *   srcbnUSD: '0x...',      // New bnUSD token address
+   *   dstbnUSD: 'cx...',      // Legacy bnUSD token address
+   *   amount: 1000n,          // Amount to migrate
+   *   to: 'hx...',            // Recipient address on destination chain
+   * }, sonicSpokeProvider);
+   *
    * if (result.ok) {
    *   // result.value is a tuple: [spokeTxHash, hubTxHash]
    *   const [spokeTxHash, hubTxHash] = result.value;
@@ -13592,9 +13739,9 @@ var MigrationService = class {
    *   console.error('[migrateBnUSD] error', result.error);
    * }
    */
-  async migratebnUSD(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
+  async migratebnUSD(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT, unchecked = false) {
     try {
-      const txResult = await this.createMigratebnUSDIntent(params, spokeProvider);
+      const txResult = await this.createMigratebnUSDIntent(params, spokeProvider, unchecked);
       if (!txResult.ok) {
         return {
           ok: false,
@@ -13625,70 +13772,6 @@ var MigrationService = class {
       };
     }
   }
-  /**
-   * Reverses the migration of legacy bnUSD tokens to new bnUSD tokens on the hub chain (sonic).
-   * This function handles the reversal of the migration of legacy bnUSD tokens to new bnUSD tokens.
-   *
-   * @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<[string, Hex], MigrationError<'REVERT_MIGRATION_FAILED'> | MigrationError<'CREATE_REVERT_MIGRATION_INTENT_FAILED'> | RelayError>>}
-   * Returns a Result containing a tuple of [spokeTxHash, hubTxHash] if successful,
-   * or an error describing why the revert migration or relay failed.
-   *
-   *
-   * @example
-   * // Example: Reverse the migration of legacy bnUSD tokens to new bnUSD tokens on the hub chain (sonic)
-   * const result = await sodax.migration.reverseMigratebnUSD({
-   *   srcChainID: 'sonic', // source chain ID (e.g., SONIC_MAINNET_CHAIN_ID)
-   *   amount: 1000000000000000000n,
-   *   to: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd', // The spoke chain address that will receive the migrated legacy bnUSD tokens
-   *   dstChainID: '0x1.icon', // destination chain ID of type bnUSDLegacySpokeChainId (e.g., ICON_MAINNET_CHAIN_ID)
-   * }, iconSpokeProvider);
-   *
-   * if (result.ok) {
-   *   // result.value is a tuple: [spokeTxHash, hubTxHash]
-   *   const [spokeTxHash, hubTxHash] = result.value;
-   *   console.log('[reverseMigrateBnUSD] hubTxHash', hubTxHash);
-   *   console.log('[reverseMigrateBnUSD] spokeTxHash', spokeTxHash);
-   * } else {
-   *   // Handle revert migration error
-   *   console.error('[reverseMigrateBnUSD] error', result.error);
-   * }
-   */
-  async reverseMigratebnUSD(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
-    try {
-      const txResult = await this.createRevertMigratebnUSDIntent(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: "REVERT_MIGRATION_FAILED",
-          data: {
-            payload: params,
-            error
-          }
-        }
-      };
-    }
-  }
   /**
    * Migrates ICX tokens to SODA tokens on the hub chain (sonic).
    * This function handles the migration of ICX tokens to SODA tokens.
@@ -13881,62 +13964,6 @@ var MigrationService = class {
       };
     }
   }
-  /**
-   * Creates a revert migration intent and submits (relays) it to the spoke chain.
-   * @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<bnUSDLegacyMigrationProviders, R>>>} - Returns the raw transaction payload or transaction hash
-   *
-   * @example
-   * const result = await migrationService.createRevertMigratebnUSDIntent(
-   *   {
-   *     srcChainID: 'sonic', // The source chain ID where the new bnUSD token exists (hub chain)
-   *     amount: 1000n,     // The amount of new bnUSD tokens to migrate back
-   *     to: '0x...',       // The spoke chain address that will receive the migrated legacy bnUSD tokens
-   *     dstChainID: '0x1.icon',  // The destination chain ID for the migration (spoke chain)
-   *   },
-   *   spokeProvider, // IconSpokeProvider instance
-   *   true // Optional raw flag to return the raw transaction hash instead of the transaction receipt
-   * );
-   *
-   */
-  async createRevertMigratebnUSDIntent(params, spokeProvider, raw) {
-    try {
-      const { legacybnUSD, newbnUSD } = migrationConfig.bnUSD[params.dstChainID];
-      const migrationData = this.bnUSDMigrationService.revertMigrationData({
-        ...params,
-        legacybnUSD: legacybnUSD.address,
-        newbnUSD
-      });
-      const txResult = await SpokeService.deposit(
-        {
-          from: await spokeProvider.walletProvider.getWalletAddressBytes(),
-          token: newbnUSD,
-          amount: params.amount,
-          data: migrationData
-        },
-        spokeProvider,
-        this.hubProvider,
-        raw
-      );
-      return {
-        ok: true,
-        value: txResult
-      };
-    } catch (error) {
-      return {
-        ok: false,
-        error: {
-          code: "CREATE_REVERT_MIGRATION_INTENT_FAILED",
-          data: {
-            payload: params,
-            error
-          }
-        }
-      };
-    }
-  }
   /**
    * Creates a BALN migration intent on spoke chain (icon).
    *
@@ -13991,39 +14018,112 @@ var MigrationService = class {
     }
   }
   /**
-   * Creates a bnUSD migration intent on spoke chain (icon).
+   * Creates a bnUSD migration or reverse migration (legacy bnUSD to new bnUSD or vice versa) intent on a spoke chain.
    *
-   * @param params - The parameters for the bnUSD 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<bnUSDLegacyMigrationProviders, R>>>} - Returns the raw transaction payload or transaction hash
+   * This function prepares the transaction data for migrating legacy bnUSD to new bnUSD,
+   * or for reverting (migrating new bnUSD back to legacy bnUSD), depending on the provided parameters.
+   * It performs validation on chain IDs and token addresses unless `unchecked` is set to true.
+   *
+   * @param params - The parameters for the bnUSD migration or reverse migration transaction.
+   * @param spokeProvider - The spoke provider instance for the source chain.
+   * @param unchecked - If true, skips input validation (use with caution).
+   * @param raw - If true, returns the raw transaction hash instead of the transaction receipt.
+   * @returns {Promise<Result<TxReturnType<S, R>, MigrationError<'CREATE_MIGRATION_INTENT_FAILED'>>>}
+   *   Returns a Result containing the transaction payload or hash, or an error if creation failed.
    *
    * @example
+   * // Migrate legacy bnUSD to new bnUSD
    * const result = await migrationService.createMigratebnUSDIntent(
    *   {
-   *     srcChainID: 'sonic', // The source chain ID where the legacy bnUSD token exists (spoke chain)
-   *     amount: 1000n,     // The amount of legacy bnUSD tokens to migrate
-   *     to: '0x...',       // The hub (sonic) chain address that will receive the migrated new bnUSD tokens
-   *     dstChainID: '0x1.icon',  // The destination chain ID for the migration (hub chain)
-   *   },
-   *   spokeProvider, // IconSpokeProvider instance
-   *   true // Optional raw flag to return the raw transaction hash instead of the transaction receipt
+   *     srcChainId: '0x1.icon', // Source chain ID (legacy bnUSD chain)
+   *     dstChainId: 'sonic',    // Destination chain ID (new bnUSD chain)
+   *     srcbnUSD: 'cx...',      // Legacy bnUSD token address
+   *     dstbnUSD: '0x...',      // New bnUSD token address
+   *     amount: 1000n,          // Amount to migrate
+   *     to: '0x...',            // Recipient address on destination chain
+   *   } satisfies UnifiedBnUSDMigrateParams,
+   *   spokeProvider, // SpokeProvider instance
+   *   false,         // Optional unchecked flag (validation is skipped)
+   *   true           // Optional raw flag
    * );
    *
+   * // Reverse migration: new bnUSD to legacy bnUSD
+   * const result = await migrationService.createMigratebnUSDIntent(
+   *   {
+   *     srcChainId: 'sonic',    // Source chain ID (new bnUSD chain)
+   *     dstChainId: '0x1.icon', // Destination chain ID (legacy bnUSD chain)
+   *     srcbnUSD: '0x...',      // New bnUSD token address
+   *     dstbnUSD: 'cx...',      // Legacy bnUSD token address
+   *     amount: 1000n,          // Amount to migrate
+   *     to: 'hx...',            // Recipient address on destination chain
+   *   } satisfies UnifiedBnUSDMigrateParams,
+   *   spokeProvider
+   * );
    */
-  async createMigratebnUSDIntent(params, spokeProvider, raw) {
+  async createMigratebnUSDIntent(params, spokeProvider, unchecked = false, raw) {
     try {
-      const { legacybnUSD, newbnUSD } = migrationConfig.bnUSD[params.srcChainID];
-      const migrationData = this.bnUSDMigrationService.migrateData({
-        ...params,
-        to: encodeAddress(this.hubProvider.chainConfig.chain.id, params.to),
-        legacybnUSD: legacybnUSD.address,
-        newbnUSD
-      });
+      if (!unchecked) {
+        invariant2__default.default(isValidSpokeChainId(params.srcChainId), "Invalid spoke source chain ID");
+        invariant2__default.default(isValidSpokeChainId(params.dstChainId), "Invalid spoke destination chain ID");
+        invariant2__default.default(params.srcbnUSD.length > 0, "Legacy bnUSD token address is required");
+        invariant2__default.default(params.dstbnUSD.length > 0, "New bnUSD token address is required");
+        invariant2__default.default(params.amount > 0, "Amount must be greater than 0");
+        invariant2__default.default(params.to.length > 0, "Recipient address is required");
+        invariant2__default.default(
+          !(isLegacybnUSDToken(params.srcbnUSD) && isLegacybnUSDToken(params.dstbnUSD)),
+          "srcbnUSD and dstbnUSD cannot both be legacy bnUSD tokens"
+        );
+      }
+      let migrationData;
+      if (isLegacybnUSDToken(params.srcbnUSD)) {
+        if (!unchecked) {
+          invariant2__default.default(
+            isLegacybnUSDChainId(params.srcChainId),
+            "srcChainId must be a legacy bnUSD chain (icon, sui, stellar) if srcbnUSD is a legacy bnUSD token"
+          );
+          invariant2__default.default(
+            isNewbnUSDChainId(params.dstChainId),
+            "dstChainId must be a new bnUSD chain (all spoke chains besides Icon) if dstbnUSD is a legacy bnUSD token"
+          );
+        }
+        migrationData = this.bnUSDMigrationService.migrateData({
+          srcChainId: params.srcChainId,
+          legacybnUSD: params.srcbnUSD,
+          newbnUSD: params.dstbnUSD,
+          dstChainId: params.dstChainId,
+          amount: params.amount,
+          to: encodeAddress(params.dstChainId, params.to)
+        });
+      } else if (isLegacybnUSDToken(params.dstbnUSD)) {
+        if (!unchecked) {
+          invariant2__default.default(
+            isLegacybnUSDChainId(params.dstChainId),
+            "dstChainId must be a legacy bnUSD chain (sui, stellar, icon) if dstbnUSD is a legacy bnUSD token"
+          );
+          invariant2__default.default(
+            isNewbnUSDToken(params.srcbnUSD),
+            "srcbnUSD must be a new bnUSD token if dstbnUSD is a legacy bnUSD token"
+          );
+          invariant2__default.default(
+            isNewbnUSDChainId(params.srcChainId),
+            "srcChainId must be a new bnUSD chain (all spoke chains besides Icon) if srcbnUSD is a new bnUSD token"
+          );
+        }
+        migrationData = this.bnUSDMigrationService.revertMigrationData({
+          srcChainId: params.srcChainId,
+          legacybnUSD: params.dstbnUSD,
+          newbnUSD: params.srcbnUSD,
+          dstChainId: params.dstChainId,
+          amount: params.amount,
+          to: encodeAddress(params.dstChainId, params.to)
+        });
+      } else {
+        throw new Error("srcbnUSD or dstbnUSD must be a legacy bnUSD token");
+      }
       const txResult = await SpokeService.deposit(
         {
           from: await spokeProvider.walletProvider.getWalletAddress(),
-          token: legacybnUSD.address,
+          token: params.srcbnUSD,
           amount: params.amount,
           data: migrationData
         },
@@ -14194,7 +14294,7 @@ var BnUSDMigrationService = class {
    */
   migrateData(params) {
     const calls = [];
-    const assetConfig = getHubAssetInfo(params.srcChainID, params.legacybnUSD);
+    const assetConfig = getHubAssetInfo(params.srcChainId, params.legacybnUSD);
     invariant2__default.default(assetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
     const bnUSDVault = getMoneyMarketConfig(types.SONIC_MAINNET_CHAIN_ID).bnUSDVault;
     calls.push(Erc20Service.encodeApprove(assetConfig.asset, assetConfig.vault, params.amount));
@@ -14206,7 +14306,7 @@ var BnUSDMigrationService = class {
       calls.push(Erc20Service.encodeTransfer(bnUSDVault, params.to, translatedAmount));
       return encodeContractCalls(calls);
     }
-    const dstAssetConfig = getHubAssetInfo(this.hubProvider.chainConfig.chain.id, params.newbnUSD);
+    const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.newbnUSD);
     invariant2__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
@@ -14237,19 +14337,17 @@ var BnUSDMigrationService = class {
   revertMigrationData(params) {
     const calls = [];
     const bnUSDVault = getMoneyMarketConfig(types.SONIC_MAINNET_CHAIN_ID).bnUSDVault;
-    console.log("params.newbnUSD", params.newbnUSD);
-    console.log("bnUSDVault", bnUSDVault);
     let decimals = 18;
     if (params.newbnUSD.toLowerCase() !== bnUSDVault.toLowerCase()) {
-      const assetConfig = getHubAssetInfo(params.srcChainID, params.newbnUSD);
+      const assetConfig = getHubAssetInfo(params.srcChainId, params.newbnUSD);
       invariant2__default.default(assetConfig, `hub asset not found for new bnUSD token: ${params.newbnUSD}`);
       decimals = assetConfig.decimal;
       calls.push(Erc20Service.encodeApprove(assetConfig.asset, bnUSDVault, params.amount));
       calls.push(EvmVaultTokenService.encodeDeposit(bnUSDVault, assetConfig.asset, params.amount));
     }
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(decimals, params.amount);
-    const dstAssetConfig = getHubAssetInfo(params.dstChainID, params.legacybnUSD);
-    invariant2__default.default(dstAssetConfig, `hub asset not found for legacy bnUSD token: ${params.legacybnUSD}`);
+    const dstAssetConfig = getHubAssetInfo(params.dstChainId, params.legacybnUSD);
+    invariant2__default.default(dstAssetConfig, `hub asset not found for new bnUSD token: ${params.legacybnUSD}`);
     calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, dstAssetConfig.vault, translatedAmount));
     calls.push(EvmVaultTokenService.encodeWithdraw(dstAssetConfig.vault, dstAssetConfig.asset, translatedAmount));
     const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
@@ -14568,6 +14666,7 @@ var SolverIntentErrorCode = /* @__PURE__ */ ((SolverIntentErrorCode2) => {
 exports.BalnSwapService = BalnSwapService;
 exports.BigIntToHex = BigIntToHex;
 exports.BnUSDMigrationService = BnUSDMigrationService;
+exports.ChainIdToIntentRelayChainId = ChainIdToIntentRelayChainId;
 exports.DEFAULT_MAX_RETRY = DEFAULT_MAX_RETRY;
 exports.DEFAULT_RELAYER_API_ENDPOINT = DEFAULT_RELAYER_API_ENDPOINT;
 exports.DEFAULT_RELAY_TX_TIMEOUT = DEFAULT_RELAY_TX_TIMEOUT;
@@ -14614,6 +14713,9 @@ exports.VAULT_TOKEN_DECIMALS = VAULT_TOKEN_DECIMALS;
 exports.WalletAbstractionService = WalletAbstractionService;
 exports.assetManagerAbi = assetManagerAbi;
 exports.balnSwapAbi = balnSwapAbi;
+exports.bnUSDLegacySpokeChainIds = bnUSDLegacySpokeChainIds;
+exports.bnUSDLegacyTokens = bnUSDLegacyTokens;
+exports.bnUSDNewTokens = bnUSDNewTokens;
 exports.calculateFeeAmount = calculateFeeAmount;
 exports.calculatePercentageFeeAmount = calculatePercentageFeeAmount;
 exports.chainIdToHubAssetsMap = chainIdToHubAssetsMap;
@@ -14621,6 +14723,7 @@ exports.connectionAbi = connectionAbi;
 exports.encodeAddress = encodeAddress;
 exports.encodeContractCalls = encodeContractCalls;
 exports.erc20Abi = erc20Abi;
+exports.getAllLegacybnUSDTokens = getAllLegacybnUSDTokens;
 exports.getEvmViemChain = getEvmViemChain;
 exports.getHubAssetInfo = getHubAssetInfo;
 exports.getHubChainConfig = getHubChainConfig;
@@ -14642,6 +14745,7 @@ exports.hubAssets = hubAssets;
 exports.hubVaults = hubVaults;
 exports.hubVaultsAddressSet = hubVaultsAddressSet;
 exports.intentRelayChainIdToSpokeChainIdMap = intentRelayChainIdToSpokeChainIdMap;
+exports.isBalnMigrateParams = isBalnMigrateParams;
 exports.isConfiguredMoneyMarketConfig = isConfiguredMoneyMarketConfig;
 exports.isConfiguredSolverConfig = isConfiguredSolverConfig;
 exports.isEvmHubChainConfig = isEvmHubChainConfig;
@@ -14653,6 +14757,8 @@ exports.isEvmUninitializedConfig = isEvmUninitializedConfig;
 exports.isEvmUninitializedPrivateKeyConfig = isEvmUninitializedPrivateKeyConfig;
 exports.isIconAddress = isIconAddress;
 exports.isIconSpokeProvider = isIconSpokeProvider;
+exports.isIcxCreateRevertMigrationParams = isIcxCreateRevertMigrationParams;
+exports.isIcxMigrateParams = isIcxMigrateParams;
 exports.isInjectiveSpokeProvider = isInjectiveSpokeProvider;
 exports.isIntentCreationFailedError = isIntentCreationFailedError;
 exports.isIntentCreationUnknownError = isIntentCreationUnknownError;
@@ -14660,6 +14766,8 @@ exports.isIntentPostExecutionFailedError = isIntentPostExecutionFailedError;
 exports.isIntentRelayChainId = isIntentRelayChainId;
 exports.isIntentSubmitTxFailedError = isIntentSubmitTxFailedError;
 exports.isJsonRpcPayloadResponse = isJsonRpcPayloadResponse;
+exports.isLegacybnUSDChainId = isLegacybnUSDChainId;
+exports.isLegacybnUSDToken = isLegacybnUSDToken;
 exports.isMoneyMarketBorrowUnknownError = isMoneyMarketBorrowUnknownError;
 exports.isMoneyMarketCreateBorrowIntentFailedError = isMoneyMarketCreateBorrowIntentFailedError;
 exports.isMoneyMarketCreateRepayIntentFailedError = isMoneyMarketCreateRepayIntentFailedError;
@@ -14674,6 +14782,8 @@ exports.isMoneyMarketSupplyUnknownError = isMoneyMarketSupplyUnknownError;
 exports.isMoneyMarketSupportedToken = isMoneyMarketSupportedToken;
 exports.isMoneyMarketWithdrawUnknownError = isMoneyMarketWithdrawUnknownError;
 exports.isNativeToken = isNativeToken;
+exports.isNewbnUSDChainId = isNewbnUSDChainId;
+exports.isNewbnUSDToken = isNewbnUSDToken;
 exports.isPartnerFeeAmount = isPartnerFeeAmount;
 exports.isPartnerFeePercentage = isPartnerFeePercentage;
 exports.isResponseAddressType = isResponseAddressType;
@@ -14683,16 +14793,17 @@ exports.isSolverSupportedToken = isSolverSupportedToken;
 exports.isSonicSpokeProvider = isSonicSpokeProvider;
 exports.isStellarSpokeProvider = isStellarSpokeProvider;
 exports.isSuiSpokeProvider = isSuiSpokeProvider;
+exports.isUnifiedBnUSDMigrateParams = isUnifiedBnUSDMigrateParams;
 exports.isValidChainHubAsset = isValidChainHubAsset;
 exports.isValidHubAsset = isValidHubAsset;
 exports.isValidIntentRelayChainId = isValidIntentRelayChainId;
 exports.isValidOriginalAssetAddress = isValidOriginalAssetAddress;
 exports.isValidSpokeChainId = isValidSpokeChainId;
 exports.isWaitUntilIntentExecutedFailed = isWaitUntilIntentExecutedFailed;
-exports.migrationConfig = migrationConfig;
 exports.moneyMarketReserveAssets = moneyMarketReserveAssets;
 exports.moneyMarketReserveHubAssetsSet = moneyMarketReserveHubAssetsSet;
 exports.moneyMarketSupportedTokens = moneyMarketSupportedTokens;
+exports.newbnUSDSpokeChainIds = newbnUSDSpokeChainIds;
 exports.originalAssetTohubAssetMap = originalAssetTohubAssetMap;
 exports.poolAbi = poolAbi;
 exports.randomUint256 = randomUint256;