@sodax/sdk 1.0.2-beta → 1.0.4-beta-rc1

package/dist/index.cjs

@@ -10237,8 +10237,6 @@ var LendingPoolService = class {
     });
   }
 };
-
-// src/moneyMarket/MoneyMarketDataService.ts
 var MoneyMarketDataService = class {
   uiPoolDataProviderService;
   lendingPoolService;
@@ -10251,6 +10249,34 @@ var MoneyMarketDataService = class {
   async getATokenData(aToken) {
     return Erc20Service.getErc20Token(aToken, this.hubProvider.publicClient);
   }
+  /**
+   * Fetches multiple aToken balances in a single multicall for better performance
+   * @param aTokens - Array of aToken addresses
+   * @param userAddress - User's hub wallet address to fetch balances for
+   * @returns Promise<Map<Address, bigint>> - Map of aToken address to balance
+   */
+  async getATokensBalances(aTokens, userAddress) {
+    const contracts = aTokens.map((aToken) => ({
+      address: aToken,
+      abi: viem.erc20Abi,
+      functionName: "balanceOf",
+      args: [userAddress]
+    }));
+    const results = await this.hubProvider.publicClient.multicall({
+      contracts,
+      allowFailure: false
+    });
+    const balanceMap = /* @__PURE__ */ new Map();
+    let resultIndex = 0;
+    for (const aToken of aTokens) {
+      const result = results[resultIndex];
+      if (result !== void 0) {
+        balanceMap.set(aToken, result);
+      }
+      resultIndex++;
+    }
+    return balanceMap;
+  }
   /**
    * LendingPool
    */
@@ -10296,7 +10322,7 @@ var MoneyMarketDataService = class {
   async getUserReservesData(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const spokeChainId = spokeProvider.chainConfig.chain.id;
-    const hubWalletAddress = await deriveUserWalletAddress(this.hubProvider, spokeChainId, walletAddress);
+    const hubWalletAddress = await HubService.getUserHubWalletAddress(walletAddress, spokeChainId, this.hubProvider);
     return this.uiPoolDataProviderService.getUserReservesData(hubWalletAddress);
   }
   /**
@@ -10328,7 +10354,7 @@ var MoneyMarketDataService = class {
   async getUserReservesHumanized(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
     const spokeChainId = spokeProvider.chainConfig.chain.id;
-    const hubWalletAddress = await deriveUserWalletAddress(this.hubProvider, spokeChainId, walletAddress);
+    const hubWalletAddress = await HubService.getUserHubWalletAddress(walletAddress, spokeChainId, this.hubProvider);
     return this.uiPoolDataProviderService.getUserReservesHumanized(hubWalletAddress);
   }
   /**
@@ -13893,65 +13919,25 @@ var MoneyMarketService = class _MoneyMarketService {
         );
       }
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      if (spokeProvider instanceof StellarSpokeProvider && (params.action === "supply" || params.action === "repay")) {
+      if (isStellarSpokeProviderType(spokeProvider) && (params.action === "supply" || params.action === "repay")) {
         return {
           ok: true,
           value: await StellarSpokeService.hasSufficientTrustline(params.token, params.amount, spokeProvider)
         };
       }
-      if (spokeProvider instanceof EvmSpokeProvider && (params.action === "supply" || params.action === "repay")) {
+      if ((isEvmSpokeProviderType(spokeProvider) || isSonicSpokeProviderType(spokeProvider)) && (params.action === "supply" || params.action === "repay")) {
+        const spender = isHubSpokeProvider(spokeProvider, this.hubProvider) ? await HubService.getUserRouter(
+          walletAddress,
+          this.hubProvider
+        ) : spokeProvider.chainConfig.addresses.assetManager;
         return await Erc20Service.isAllowanceValid(
           params.token,
           params.amount,
           walletAddress,
-          spokeProvider.chainConfig.addresses.assetManager,
+          spender,
           spokeProvider
         );
       }
-      if (spokeProvider instanceof SonicSpokeProvider && spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
-        if (params.action === "withdraw") {
-          const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
-            params.token,
-            params.amount,
-            params.toChainId ?? spokeProvider.chainConfig.chain.id,
-            this.data,
-            this.configService
-          );
-          return await SonicSpokeService.isWithdrawApproved(
-            walletAddress,
-            withdrawInfo,
-            spokeProvider
-          );
-        }
-        if (params.action === "borrow") {
-          const borrowInfo = await SonicSpokeService.getBorrowInfo(
-            params.token,
-            params.amount,
-            params.toChainId ?? spokeProvider.chainConfig.chain.id,
-            this.data,
-            this.configService,
-            this.config
-          );
-          return await SonicSpokeService.isBorrowApproved(
-            walletAddress,
-            borrowInfo,
-            spokeProvider
-          );
-        }
-        if (params.action === "supply" || params.action === "repay") {
-          const userRouter = await SonicSpokeService.getUserRouter(
-            walletAddress,
-            spokeProvider
-          );
-          return await Erc20Service.isAllowanceValid(
-            params.token,
-            params.amount,
-            walletAddress,
-            userRouter,
-            spokeProvider
-          );
-        }
-      }
       return {
         ok: true,
         value: true
@@ -14007,7 +13993,7 @@ var MoneyMarketService = class _MoneyMarketService {
         );
       }
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      if (spokeProvider instanceof StellarSpokeProvider) {
+      if (isStellarSpokeProviderType(spokeProvider)) {
         invariant6__default.default(
           params.action === "supply" || params.action === "repay",
           "Invalid action (only supply and repay are supported on stellar)"
@@ -14018,16 +14004,20 @@ var MoneyMarketService = class _MoneyMarketService {
           value: result
         };
       }
-      if (spokeProvider instanceof EvmSpokeProvider) {
+      if (isEvmSpokeProviderType(spokeProvider) || isSonicSpokeProviderType(spokeProvider)) {
         invariant6__default.default(
           params.action === "supply" || params.action === "repay",
           "Invalid action (only supply and repay are supported on evm)"
         );
         invariant6__default.default(viem.isAddress(params.token), "Invalid token address");
+        const spender = isHubSpokeProvider(spokeProvider, this.hubProvider) ? await HubService.getUserRouter(
+          walletAddress,
+          this.hubProvider
+        ) : spokeProvider.chainConfig.addresses.assetManager;
         const result = await Erc20Service.approve(
           params.token,
           params.amount,
-          spokeProvider.chainConfig.addresses.assetManager,
+          spender,
           spokeProvider,
           raw
         );
@@ -14036,69 +14026,6 @@ var MoneyMarketService = class _MoneyMarketService {
           value: result
         };
       }
-      if (spokeProvider instanceof SonicSpokeProvider && spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
-        invariant6__default.default(
-          params.action === "withdraw" || params.action === "borrow" || params.action === "supply" || params.action === "repay",
-          "Invalid action (only withdraw, borrow, supply and repay are supported on sonic)"
-        );
-        invariant6__default.default(viem.isAddress(params.token), "Invalid token address");
-        if (params.action === "withdraw") {
-          const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
-            params.token,
-            params.amount,
-            params?.toChainId ?? spokeProvider.chainConfig.chain.id,
-            this.data,
-            this.configService
-          );
-          const result = await SonicSpokeService.approveWithdraw(
-            walletAddress,
-            withdrawInfo,
-            spokeProvider,
-            raw
-          );
-          return {
-            ok: true,
-            value: result
-          };
-        }
-        if (params.action === "borrow") {
-          const borrowInfo = await SonicSpokeService.getBorrowInfo(
-            params.token,
-            params.amount,
-            params?.toChainId ?? spokeProvider.chainConfig.chain.id,
-            this.data,
-            this.configService,
-            this.config
-          );
-          const result = await SonicSpokeService.approveBorrow(
-            walletAddress,
-            borrowInfo,
-            spokeProvider,
-            raw
-          );
-          return {
-            ok: true,
-            value: result
-          };
-        }
-        if (params.action === "supply" || params.action === "repay") {
-          const userRouter = await SonicSpokeService.getUserRouter(
-            walletAddress,
-            spokeProvider
-          );
-          const result = await Erc20Service.approve(
-            params.token,
-            params.amount,
-            userRouter,
-            spokeProvider,
-            raw
-          );
-          return {
-            ok: true,
-            value: result
-          };
-        }
-      }
       return {
         ok: false,
         error: new Error("Approve only supported for EVM spoke chains")
@@ -14157,7 +14084,9 @@ var MoneyMarketService = class _MoneyMarketService {
         };
       }
       let intentTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
+      if (spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id) {
+        intentTxHash = txResult.value;
+      } else {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -14178,8 +14107,6 @@ var MoneyMarketService = class _MoneyMarketService {
           };
         }
         intentTxHash = packetResult.value.dst_tx_hash;
-      } else {
-        intentTxHash = txResult.value;
       }
       return { ok: true, value: [txResult.value, intentTxHash] };
     } catch (error) {
@@ -14240,13 +14167,15 @@ var MoneyMarketService = class _MoneyMarketService {
         this.configService.isMoneyMarketSupportedToken(fromChainId, params.token),
         `Unsupported spoke chain (${fromChainId}) token: ${params.token}`
       );
-      const fromHubWallet = await deriveUserWalletAddress(this.hubProvider, fromChainId, fromAddress);
-      const toHubWallet = await deriveUserWalletAddress(this.hubProvider, toChainId, toAddress);
+      const [fromHubWallet, toHubWallet] = await Promise.all([
+        HubService.getUserHubWalletAddress(fromAddress, fromChainId, this.hubProvider),
+        HubService.getUserHubWalletAddress(toAddress, toChainId, this.hubProvider)
+      ]);
       const data = this.buildSupplyData(fromChainId, params.token, params.amount, toHubWallet);
       const txResult = await SpokeService.deposit(
         {
           from: fromAddress,
-          to: fromChainId === this.hubProvider.chainConfig.chain.id ? void 0 : fromHubWallet,
+          to: fromHubWallet,
           token: params.token,
           amount: params.amount,
           data
@@ -14326,7 +14255,7 @@ var MoneyMarketService = class _MoneyMarketService {
       if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id || params.toChainId && params.toAddress && params.toChainId !== this.hubProvider.chainConfig.chain.id) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
-          spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
+          isSolanaSpokeProviderType(spokeProvider) ? txResult.data : void 0,
           spokeProvider,
           this.config.relayerApiEndpoint,
           timeout
@@ -14395,14 +14324,14 @@ var MoneyMarketService = class _MoneyMarketService {
     invariant6__default.default(params.action === "borrow", "Invalid action");
     invariant6__default.default(params.token.length > 0, "Token is required");
     invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
-    const fromChainId = spokeProvider.chainConfig.chain.id;
-    const fromAddress = await spokeProvider.walletProvider.getWalletAddress();
+    const fromChainId = params.fromChainId ?? spokeProvider.chainConfig.chain.id;
+    const fromAddress = params.fromAddress ?? await spokeProvider.walletProvider.getWalletAddress();
     const toChainId = params.toChainId ?? fromChainId;
     const toAddress = params.toAddress ?? fromAddress;
     const dstToken = this.configService.getMoneyMarketToken(toChainId, params.token);
     invariant6__default.default(dstToken, `Money market token not found for spoke chain (${toChainId}) token: ${params.token}`);
     const encodedToAddress = encodeAddress(toChainId, toAddress);
-    const fromHubWallet = await deriveUserWalletAddress(this.hubProvider, fromChainId, fromAddress);
+    const fromHubWallet = await HubService.getUserHubWalletAddress(fromAddress, fromChainId, this.hubProvider);
     const data = this.buildBorrowData(fromHubWallet, encodedToAddress, dstToken.address, params.amount, toChainId);
     let txResult;
     if (fromChainId === this.hubProvider.chainConfig.chain.id && isSonicSpokeProviderType(spokeProvider)) {
@@ -14548,29 +14477,9 @@ var MoneyMarketService = class _MoneyMarketService {
       `Unsupported spoke chain (${toChainId}) token: ${params.token}`
     );
     const encodedToAddress = encodeAddress(toChainId, toAddress);
-    const fromHubWallet = await deriveUserWalletAddress(this.hubProvider, fromChainId, fromAddress);
-    let data;
-    if (spokeProvider instanceof SonicSpokeProvider) {
-      const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
-        params.token,
-        params.amount,
-        toChainId,
-        this.data,
-        this.configService
-      );
-      data = await SonicSpokeService.buildWithdrawData(
-        fromAddress,
-        withdrawInfo,
-        params.amount,
-        encodedToAddress,
-        toChainId,
-        spokeProvider,
-        this
-      );
-    } else {
-      data = this.buildWithdrawData(fromHubWallet, encodedToAddress, params.token, params.amount, toChainId);
-    }
-    const txResult = spokeProvider instanceof SonicSpokeProvider ? await SonicSpokeService.callWallet(data, spokeProvider, raw) : await SpokeService.callWallet(fromHubWallet, data, spokeProvider, this.hubProvider, raw);
+    const fromHubWallet = await HubService.getUserHubWalletAddress(fromAddress, fromChainId, this.hubProvider);
+    const data = this.buildWithdrawData(fromHubWallet, encodedToAddress, params.token, params.amount, toChainId);
+    const txResult = isSonicSpokeProviderType(spokeProvider) ? await SonicSpokeService.callWallet(data, spokeProvider, raw) : await SpokeService.callWallet(fromHubWallet, data, spokeProvider, this.hubProvider, raw);
     return {
       ok: true,
       value: txResult,
@@ -14710,13 +14619,15 @@ var MoneyMarketService = class _MoneyMarketService {
       this.configService.isMoneyMarketSupportedToken(fromChainId, params.token),
       `Unsupported spoke chain (${fromChainId}) token: ${params.token}`
     );
-    const toHubWallet = await deriveUserWalletAddress(this.hubProvider, toChainId, toAddress);
-    const fromHubWallet = await deriveUserWalletAddress(this.hubProvider, fromChainId, fromAddress);
+    const [fromHubWallet, toHubWallet] = await Promise.all([
+      HubService.getUserHubWalletAddress(fromAddress, fromChainId, this.hubProvider),
+      HubService.getUserHubWalletAddress(toAddress, toChainId, this.hubProvider)
+    ]);
     const data = this.buildRepayData(fromChainId, params.token, params.amount, toHubWallet);
     const txResult = await SpokeService.deposit(
       {
         from: fromAddress,
-        to: fromChainId === this.hubProvider.chainConfig.chain.id ? void 0 : fromHubWallet,
+        to: fromHubWallet,
         token: params.token,
         amount: params.amount,
         data
@@ -14940,8 +14851,8 @@ var MoneyMarketService = class _MoneyMarketService {
     if (bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
       repayToken = bnUSD;
       if (assetAddress.toLowerCase() !== bnUSDVault.toLowerCase()) {
-        calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, translatedAmountIn));
-        calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, translatedAmountIn));
+        calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
+        calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
       }
       calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, bnUSD, translatedAmountIn));
     } else {
@@ -15195,6 +15106,8 @@ var Sodax = class {
 
 // src/shared/services/hub/WalletAbstractionService.ts
 var WalletAbstractionService = class {
+  constructor() {
+  }
   /**
    * Gets the hub wallet address for a user based on their spoke chain address.
    * @param address - The user's address on the spoke chain
@@ -15219,6 +15132,40 @@ var WalletAbstractionService = class {
     );
   }
 };
+
+// src/shared/services/hub/HubService.ts
+var HubService = class _HubService {
+  constructor() {
+  }
+  /**
+   * Get the derived address of a contract deployed with CREATE3.
+   * @param address - User's address on the specified chain as hex
+   * @param hubProvider - Hub provider
+   * @returns {HubAddress} The computed contract address as a EVM address (hex) string
+   */
+  static async getUserRouter(address, hubProvider) {
+    return hubProvider.publicClient.readContract({
+      address: hubProvider.chainConfig.addresses.walletRouter,
+      abi: sonicWalletFactoryAbi,
+      functionName: "getDeployedAddress",
+      args: [address]
+    });
+  }
+  /**
+   * 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 chainId - spoke chain id
+   * @param hubProvider - The provider for interacting with the hub chain
+   * @returns The user's hub wallet address
+   */
+  static async getUserHubWalletAddress(address, chainId, hubProvider) {
+    const encodedAddress = encodeAddress(chainId, address);
+    if (chainId === hubProvider.chainConfig.chain.id) {
+      return _HubService.getUserRouter(encodedAddress, hubProvider);
+    }
+    return EvmWalletAbstraction.getUserHubWalletAddress(chainId, encodedAddress, hubProvider);
+  }
+};
 var SuiSpokeService = class _SuiSpokeService {
   constructor() {
   }
@@ -15859,6 +15806,9 @@ function parseToStroops(amount) {
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function isHubSpokeProvider(spokeProvider, hubProvider) {
+  return spokeProvider.chainConfig.chain.id === hubProvider.chainConfig.chain.id;
+}
 
 // src/shared/types.ts
 var SolverIntentStatusCode = /* @__PURE__ */ ((SolverIntentStatusCode2) => {
@@ -16200,7 +16150,7 @@ var BridgeService = class {
       invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
       invariant6__default.default(params.srcAsset.length > 0, "Source asset is required");
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      if (spokeProvider instanceof EvmSpokeProvider) {
+      if (isEvmSpokeProviderType(spokeProvider)) {
         invariant6__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for EVM chain");
         const allowanceResult = await Erc20Service.isAllowanceValid(
           params.srcAsset,
@@ -16223,7 +16173,7 @@ var BridgeService = class {
           value: allowanceResult.value
         };
       }
-      if (spokeProvider instanceof StellarSpokeProvider) {
+      if (isStellarSpokeProviderType(spokeProvider)) {
         const allowanceResult = await StellarSpokeService.hasSufficientTrustline(
           params.srcAsset,
           params.amount,
@@ -16243,9 +16193,12 @@ var BridgeService = class {
           value: allowanceResult
         };
       }
-      if (spokeProvider instanceof SonicSpokeProvider) {
+      if (isSonicSpokeProviderType(spokeProvider)) {
         invariant6__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for Sonic chain");
-        const userRouter = await SonicSpokeService.getUserRouter(walletAddress, spokeProvider);
+        const userRouter = await SonicSpokeService.getUserRouter(
+          walletAddress,
+          spokeProvider
+        );
         const allowanceResult = await Erc20Service.isAllowanceValid(
           params.srcAsset,
           params.amount,
@@ -16297,7 +16250,7 @@ var BridgeService = class {
       invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
       invariant6__default.default(params.srcAsset.length > 0, "Source asset is required");
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-      if (spokeProvider instanceof EvmSpokeProvider) {
+      if (isEvmSpokeProviderType(spokeProvider)) {
         invariant6__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for EVM chain");
         const result = await Erc20Service.approve(
           params.srcAsset,
@@ -16311,14 +16264,14 @@ var BridgeService = class {
           value: result
         };
       }
-      if (spokeProvider instanceof StellarSpokeProvider) {
+      if (isStellarSpokeProviderType(spokeProvider)) {
         const result = await StellarSpokeService.requestTrustline(params.srcAsset, params.amount, spokeProvider, raw);
         return {
           ok: true,
           value: result
         };
       }
-      if (spokeProvider instanceof SonicSpokeProvider) {
+      if (isSonicSpokeProviderType(spokeProvider)) {
         invariant6__default.default(viem.isAddress(params.srcAsset), "Invalid source asset address for Sonic chain");
         const userRouter = await SonicSpokeService.getUserRouter(
           walletAddress,
@@ -17100,7 +17053,7 @@ var StakingService = class {
         const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
         const targetToken = params.action === "stake" || spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
         invariant6__default.default(targetToken, "Target token not found");
-        if (spokeProvider instanceof EvmSpokeProvider) {
+        if (isEvmSpokeProviderType(spokeProvider)) {
           const allowanceResult = await Erc20Service.isAllowanceValid(
             targetToken,
             params.amount,
@@ -17122,7 +17075,7 @@ var StakingService = class {
             value: allowanceResult.value
           };
         }
-        if (spokeProvider instanceof SonicSpokeProvider) {
+        if (isSonicSpokeProviderType(spokeProvider)) {
           const userRouter = await SonicSpokeService.getUserRouter(walletAddress, spokeProvider);
           const allowanceResult = await Erc20Service.isAllowanceValid(
             targetToken,
@@ -17145,7 +17098,7 @@ var StakingService = class {
             value: allowanceResult.value
           };
         }
-        if (spokeProvider instanceof StellarSpokeProvider) {
+        if (isStellarSpokeProviderType(spokeProvider)) {
           return {
             ok: true,
             value: await StellarSpokeService.hasSufficientTrustline(targetToken, params.amount, spokeProvider)
@@ -17191,7 +17144,7 @@ var StakingService = class {
         const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
         const targetToken = params.action === "stake" || spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id ? spokeProvider.chainConfig.supportedTokens.SODA?.address : this.hubProvider.chainConfig.addresses.xSoda;
         invariant6__default.default(targetToken, "Target token not found");
-        if (spokeProvider instanceof EvmSpokeProvider) {
+        if (isEvmSpokeProviderType(spokeProvider)) {
           const result = await Erc20Service.approve(
             targetToken,
             params.amount,
@@ -17204,7 +17157,7 @@ var StakingService = class {
             value: result
           };
         }
-        if (spokeProvider instanceof SonicSpokeProvider) {
+        if (isSonicSpokeProviderType(spokeProvider)) {
           const userRouter = await SonicSpokeService.getUserRouter(
             walletAddress,
             spokeProvider
@@ -17215,7 +17168,7 @@ var StakingService = class {
             value: result
           };
         }
-        if (spokeProvider instanceof StellarSpokeProvider) {
+        if (isStellarSpokeProviderType(spokeProvider)) {
           const result = await StellarSpokeService.requestTrustline(targetToken, params.amount, spokeProvider, raw);
           return {
             ok: true,
@@ -18860,23 +18813,23 @@ var MigrationService = class {
           isIcxMigrateParams(params) || isBalnMigrateParams(params) || isUnifiedBnUSDMigrateParams(params),
           "Invalid params"
         );
-        if (spokeProvider instanceof IconSpokeProvider && (isIcxMigrateParams(params) || isBalnMigrateParams(params))) {
+        if (isIconSpokeProviderType(spokeProvider) && (isIcxMigrateParams(params) || isBalnMigrateParams(params))) {
           return {
             ok: true,
             value: true
           };
         }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
-          const evmSpokeProvider = spokeProvider;
+        if (isUnifiedBnUSDMigrateParams(params) && isEvmSpokeProviderType(spokeProvider)) {
+          const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
           return await Erc20Service.isAllowanceValid(
             params.srcbnUSD,
             params.amount,
-            await evmSpokeProvider.walletProvider.getWalletAddress(),
-            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
-            evmSpokeProvider
+            walletAddress,
+            isSonicSpokeProviderType(spokeProvider) ? spokeProvider.chainConfig.bnUSD : spokeProvider.chainConfig.addresses.assetManager,
+            spokeProvider
           );
         }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider instanceof StellarSpokeProvider) {
+        if (isUnifiedBnUSDMigrateParams(params) && isStellarSpokeProviderType(spokeProvider)) {
           return {
             ok: true,
             value: await StellarSpokeService.hasSufficientTrustline(params.srcbnUSD, params.amount, spokeProvider)
@@ -18891,49 +18844,37 @@ var MigrationService = class {
         invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
         invariant6__default.default(params.to.length > 0, "To address is required");
         invariant6__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
-          const evmSpokeProvider = spokeProvider;
+        if (isUnifiedBnUSDMigrateParams(params) && isEvmSpokeProviderType(spokeProvider)) {
           let spender;
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
-          if (spokeProvider instanceof SonicSpokeProvider) {
-            spender = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          if (isSonicSpokeProviderType(spokeProvider)) {
+            spender = await SonicSpokeService.getUserRouter(
+              wallet,
+              spokeProvider
+            );
           } else {
-            spender = evmSpokeProvider.chainConfig.addresses.assetManager;
+            spender = spokeProvider.chainConfig.addresses.assetManager;
           }
           return await Erc20Service.isAllowanceValid(
             params.srcbnUSD,
             params.amount,
             wallet,
             spender,
-            evmSpokeProvider
-          );
-        }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
-          const evmSpokeProvider = spokeProvider;
-          let spender;
-          const wallet = await spokeProvider.walletProvider.getWalletAddress();
-          if (spokeProvider instanceof SonicSpokeProvider) {
-            spender = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
-          } else {
-            spender = evmSpokeProvider.chainConfig.addresses.assetManager;
-          }
-          return await Erc20Service.isAllowanceValid(
-            params.srcbnUSD,
-            params.amount,
-            wallet,
-            spender,
-            evmSpokeProvider
+            spokeProvider
           );
         }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider instanceof StellarSpokeProvider) {
+        if (isUnifiedBnUSDMigrateParams(params) && isStellarSpokeProviderType(spokeProvider)) {
           return {
             ok: true,
             value: await StellarSpokeService.hasSufficientTrustline(params.srcbnUSD, params.amount, spokeProvider)
           };
         }
-        if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
+        if (isSonicSpokeProviderType(spokeProvider) && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
-          const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          const userRouter = await SonicSpokeService.getUserRouter(
+            wallet,
+            spokeProvider
+          );
           return await Erc20Service.isAllowanceValid(
             this.hubProvider.chainConfig.addresses.sodaToken,
             params.amount,
@@ -18979,13 +18920,12 @@ var MigrationService = class {
         invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
         invariant6__default.default(params.to.length > 0, "To address is required");
         invariant6__default.default(isUnifiedBnUSDMigrateParams(params), "Invalid params");
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
-          const evmSpokeProvider = spokeProvider;
+        if (isUnifiedBnUSDMigrateParams(params) && isEvmSpokeProviderType(spokeProvider)) {
           const result = await Erc20Service.approve(
             params.srcbnUSD,
             params.amount,
-            evmSpokeProvider instanceof EvmSpokeProvider ? evmSpokeProvider.chainConfig.addresses.assetManager : evmSpokeProvider.chainConfig.bnUSD,
-            evmSpokeProvider,
+            isSonicSpokeProviderType(spokeProvider) ? spokeProvider.chainConfig.bnUSD : spokeProvider.chainConfig.addresses.assetManager,
+            spokeProvider,
             raw
           );
           return {
@@ -18993,7 +18933,7 @@ var MigrationService = class {
             value: result
           };
         }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider instanceof StellarSpokeProvider) {
+        if (isUnifiedBnUSDMigrateParams(params) && isStellarSpokeProviderType(spokeProvider)) {
           const result = await StellarSpokeService.requestTrustline(params.srcbnUSD, params.amount, spokeProvider, raw);
           return {
             ok: true,
@@ -19009,20 +18949,22 @@ var MigrationService = class {
         invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
         invariant6__default.default(params.to.length > 0, "To address is required");
         invariant6__default.default(isIcxCreateRevertMigrationParams(params) || isUnifiedBnUSDMigrateParams(params), "Invalid params");
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider.chainConfig.chain.type === "EVM") {
-          const evmSpokeProvider = spokeProvider;
+        if (isUnifiedBnUSDMigrateParams(params) && isEvmSpokeProviderType(spokeProvider)) {
           let spender;
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
-          if (spokeProvider instanceof SonicSpokeProvider) {
-            spender = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          if (isSonicSpokeProviderType(spokeProvider)) {
+            spender = await SonicSpokeService.getUserRouter(
+              wallet,
+              spokeProvider
+            );
           } else {
-            spender = evmSpokeProvider.chainConfig.addresses.assetManager;
+            spender = spokeProvider.chainConfig.addresses.assetManager;
           }
           const result = await Erc20Service.approve(
             params.srcbnUSD,
             params.amount,
             spender,
-            evmSpokeProvider,
+            spokeProvider,
             raw
           );
           return {
@@ -19030,16 +18972,19 @@ var MigrationService = class {
             value: result
           };
         }
-        if (isUnifiedBnUSDMigrateParams(params) && spokeProvider instanceof StellarSpokeProvider) {
+        if (isUnifiedBnUSDMigrateParams(params) && isStellarSpokeProviderType(spokeProvider)) {
           const result = await StellarSpokeService.requestTrustline(params.srcbnUSD, params.amount, spokeProvider, raw);
           return {
             ok: true,
             value: result
           };
         }
-        if (spokeProvider instanceof SonicSpokeProvider && isIcxCreateRevertMigrationParams(params)) {
+        if (isSonicSpokeProviderType(spokeProvider) && isIcxCreateRevertMigrationParams(params)) {
           const wallet = await spokeProvider.walletProvider.getWalletAddress();
-          const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+          const userRouter = await SonicSpokeService.getUserRouter(
+            wallet,
+            spokeProvider
+          );
           const result = await Erc20Service.approve(
             this.hubProvider.chainConfig.addresses.sodaToken,
             params.amount,
@@ -19112,7 +19057,7 @@ var MigrationService = class {
    */
   async migratebnUSD(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT, unchecked = false) {
     try {
-      const intentResult = await this.createMigratebnUSDIntent(params, spokeProvider, unchecked);
+      const intentResult = await this.createMigratebnUSDIntent(params, spokeProvider, unchecked, false);
       if (!intentResult.ok) {
         return {
           ok: false,
@@ -19199,7 +19144,7 @@ var MigrationService = class {
    */
   async migrateIcxToSoda(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.createMigrateIcxToSodaIntent(params, spokeProvider);
+      const txResult = await this.createMigrateIcxToSodaIntent(params, spokeProvider, false);
       if (!txResult.ok) {
         return {
           ok: false,
@@ -19263,7 +19208,7 @@ var MigrationService = class {
    */
   async revertMigrateSodaToIcx(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.createRevertSodaToIcxMigrationIntent(params, spokeProvider);
+      const txResult = await this.createRevertSodaToIcxMigrationIntent(params, spokeProvider, false);
       if (!txResult.ok) {
         return txResult;
       }
@@ -19326,7 +19271,7 @@ var MigrationService = class {
    */
   async migrateBaln(params, spokeProvider, timeout = DEFAULT_RELAY_TX_TIMEOUT) {
     try {
-      const txResult = await this.createMigrateBalnIntent(params, spokeProvider);
+      const txResult = await this.createMigrateBalnIntent(params, spokeProvider, false);
       if (!txResult.ok) {
         return {
           ok: false,
@@ -19589,7 +19534,7 @@ var MigrationService = class {
         params.address.toLowerCase() === spokeProvider.chainConfig.addresses.wICX.toLowerCase() || params.address.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase(),
         "Token must be wICX or native ICX token"
       );
-      invariant6__default.default(spokeProvider instanceof IconSpokeProvider, "Spoke provider must be an instance of IconSpokeProvider");
+      invariant6__default.default(isIconSpokeProviderType(spokeProvider), "Spoke provider must be an IconSpokeProviderType");
       const availableAmount = await this.icxMigration.getAvailableAmount();
       if (availableAmount < params.amount) {
         throw new Error(
@@ -19647,7 +19592,10 @@ var MigrationService = class {
   async createRevertSodaToIcxMigrationIntent(params, spokeProvider, raw) {
     try {
       const wallet = await spokeProvider.walletProvider.getWalletAddress();
-      const userRouter = await SonicSpokeService.getUserRouter(wallet, spokeProvider);
+      const userRouter = await SonicSpokeService.getUserRouter(
+        wallet,
+        spokeProvider
+      );
       const wICX = this.configService.spokeChainConfig[types.ICON_MAINNET_CHAIN_ID]?.addresses.wICX;
       invariant6__default.default(wICX, "wICX token not found");
       const data = this.icxMigration.revertMigration({
@@ -20078,6 +20026,7 @@ exports.EvmWalletAbstraction = EvmWalletAbstraction;
 exports.FEE_PERCENTAGE_SCALE = FEE_PERCENTAGE_SCALE;
 exports.HALF_RAY = HALF_RAY;
 exports.HALF_WAD = HALF_WAD;
+exports.HubService = HubService;
 exports.ICON_TX_RESULT_WAIT_MAX_RETRY = ICON_TX_RESULT_WAIT_MAX_RETRY;
 exports.IconBaseSpokeProvider = IconBaseSpokeProvider;
 exports.IconRawSpokeProvider = IconRawSpokeProvider;
@@ -20200,6 +20149,7 @@ exports.isEvmSpokeProviderType = isEvmSpokeProviderType;
 exports.isEvmUninitializedBrowserConfig = isEvmUninitializedBrowserConfig;
 exports.isEvmUninitializedConfig = isEvmUninitializedConfig;
 exports.isEvmUninitializedPrivateKeyConfig = isEvmUninitializedPrivateKeyConfig;
+exports.isHubSpokeProvider = isHubSpokeProvider;
 exports.isIconAddress = isIconAddress;
 exports.isIconRawSpokeProvider = isIconRawSpokeProvider;
 exports.isIconSpokeProvider = isIconSpokeProvider;