@sodax/sdk 1.0.1-beta-rc3 → 1.0.1-beta

package/dist/index.cjs

@@ -6933,6 +6933,11 @@ var ConfigService = class {
   getMoneyMarketTokens() {
     return this.sodaxConfig.supportedMoneyMarketTokens;
   }
+  getMoneyMarketToken(chainId, token) {
+    return this.sodaxConfig.supportedMoneyMarketTokens[chainId].find(
+      (t) => t.address.toLowerCase() === token.toLowerCase()
+    );
+  }
   getMoneyMarketReserveAssets() {
     return this.sodaxConfig.supportedMoneyMarketReserveAssets;
   }
@@ -6952,7 +6957,10 @@ var ConfigService = class {
     return this.supportedSodaVaultAssetsSet.has(vault.toLowerCase());
   }
   isValidVault(vault) {
-    return this.isValidSodaVaultAsset(vault);
+    if (typeof vault === "string") {
+      return this.isValidSodaVaultAsset(vault);
+    }
+    return this.isValidSodaVaultAsset(vault.address);
   }
   isValidChainHubAsset(chainId, hubAsset) {
     return this.chainIdToHubAssetsMap.get(chainId)?.has(hubAsset.toLowerCase()) ?? false;
@@ -13374,7 +13382,7 @@ var SonicSpokeService = class _SonicSpokeService {
     const aTokenAddress = (await dataService.getReserveData(vaultAddress)).aTokenAddress;
     return {
       aTokenAddress,
-      aTokenAmount: amount,
+      aTokenAmount: EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, amount),
       token
     };
   }
@@ -13387,12 +13395,15 @@ var SonicSpokeService = class _SonicSpokeService {
    * @param configService - The config service
    * @returns BorrowInfo containing variable debt token address and vault address
    */
-  static async getBorrowInfo(token, amount, chainId, dataService, configService) {
+  static async getBorrowInfo(token, amount, chainId, dataService, configService, moneyMarketConfig) {
     const assetConfig = configService.getHubAssetInfo(chainId, token);
     if (!assetConfig) {
       throw new Error("[SonicSpokeService.getBorrowInfo] Hub asset not found");
     }
-    const vaultAddress = assetConfig.vault;
+    let vaultAddress = assetConfig.vault;
+    if (moneyMarketConfig.bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
+      vaultAddress = moneyMarketConfig.bnUSD;
+    }
     const reserveData = await dataService.getReserveData(vaultAddress);
     const variableDebtTokenAddress = reserveData.variableDebtTokenAddress;
     return {
@@ -13604,10 +13615,18 @@ var MoneyMarketService = class _MoneyMarketService {
     try {
       invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
       invariant6__default.default(params.token.length > 0, "Token is required");
-      invariant6__default.default(
-        this.configService.isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
-        `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
-      );
+      if (params.action === "withdraw" || params.action === "borrow") {
+        const toChainId = params.toChainId ?? spokeProvider.chainConfig.chain.id;
+        invariant6__default.default(
+          this.configService.isMoneyMarketSupportedToken(toChainId, params.token),
+          `Unsupported spoke chain (${toChainId}) token: ${params.token}`
+        );
+      } else {
+        invariant6__default.default(
+          this.configService.isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
+          `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
+        );
+      }
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       if (spokeProvider instanceof StellarSpokeProvider && (params.action === "supply" || params.action === "repay")) {
         return {
@@ -13645,7 +13664,8 @@ var MoneyMarketService = class _MoneyMarketService {
             params.amount,
             params.toChainId ?? spokeProvider.chainConfig.chain.id,
             this.data,
-            this.configService
+            this.configService,
+            this.config
           );
           return await SonicSpokeService.isBorrowApproved(
             walletAddress,
@@ -13709,10 +13729,18 @@ var MoneyMarketService = class _MoneyMarketService {
     try {
       invariant6__default.default(params.amount > 0n, "Amount must be greater than 0");
       invariant6__default.default(params.token.length > 0, "Token is required");
-      invariant6__default.default(
-        this.configService.isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
-        `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
-      );
+      if (params.action === "withdraw" || params.action === "borrow") {
+        const toChainId = params.toChainId ?? spokeProvider.chainConfig.chain.id;
+        invariant6__default.default(
+          this.configService.isMoneyMarketSupportedToken(toChainId, params.token),
+          `Unsupported spoke chain (${toChainId}) token: ${params.token}`
+        );
+      } else {
+        invariant6__default.default(
+          this.configService.isMoneyMarketSupportedToken(spokeProvider.chainConfig.chain.id, params.token),
+          `Unsupported spoke chain (${spokeProvider.chainConfig.chain.id}) token: ${params.token}`
+        );
+      }
       const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
       if (spokeProvider instanceof StellarSpokeProvider) {
         invariant6__default.default(
@@ -13774,7 +13802,8 @@ var MoneyMarketService = class _MoneyMarketService {
             params.amount,
             params?.toChainId ?? spokeProvider.chainConfig.chain.id,
             this.data,
-            this.configService
+            this.configService,
+            this.config
           );
           const result = await SonicSpokeService.approveBorrow(
             walletAddress,
@@ -13863,7 +13892,7 @@ var MoneyMarketService = class _MoneyMarketService {
         };
       }
       let intentTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -14028,10 +14057,8 @@ var MoneyMarketService = class _MoneyMarketService {
           }
         };
       }
-      const fromChainId = spokeProvider.chainConfig.chain.id;
-      const toChainId = params.toChainId ?? fromChainId;
       let intentTxHash = null;
-      if (toChainId !== types.SONIC_MAINNET_CHAIN_ID) {
+      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,
@@ -14107,13 +14134,11 @@ var MoneyMarketService = class _MoneyMarketService {
     const fromAddress = await spokeProvider.walletProvider.getWalletAddress();
     const toChainId = params.toChainId ?? fromChainId;
     const toAddress = params.toAddress ?? fromAddress;
-    invariant6__default.default(
-      this.configService.isMoneyMarketSupportedToken(toChainId, params.token),
-      `Unsupported spoke chain (${toChainId}) token: ${params.token}`
-    );
+    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 data = this.buildBorrowData(fromHubWallet, encodedToAddress, params.token, params.amount, toChainId);
+    const data = this.buildBorrowData(fromHubWallet, encodedToAddress, dstToken.address, params.amount, toChainId);
     let txResult;
     if (fromChainId === this.hubProvider.chainConfig.chain.id && isSonicSpokeProviderType(spokeProvider)) {
       txResult = await SonicSpokeService.callWallet(data, spokeProvider, raw);
@@ -14176,10 +14201,8 @@ var MoneyMarketService = class _MoneyMarketService {
           }
         };
       }
-      const fromChainId = spokeProvider.chainConfig.chain.id;
-      const toChainId = params.toChainId ?? fromChainId;
       let intentTxHash = null;
-      if (toChainId !== types.SONIC_MAINNET_CHAIN_ID) {
+      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id || params.toChainId && params.toAddress && params.toChainId !== this.hubProvider.chainConfig.chain.id && params.toAddress !== this.hubProvider.chainConfig.addresses.walletRouter) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -14340,7 +14363,7 @@ var MoneyMarketService = class _MoneyMarketService {
         };
       }
       let intentTxHash = null;
-      if (spokeProvider.chainConfig.chain.id !== types.SONIC_MAINNET_CHAIN_ID) {
+      if (spokeProvider.chainConfig.chain.id !== this.hubProvider.chainConfig.chain.id) {
         const packetResult = await relayTxAndWaitPacket(
           txResult.value,
           spokeProvider instanceof SolanaSpokeProvider ? txResult.data : void 0,
@@ -14459,8 +14482,10 @@ var MoneyMarketService = class _MoneyMarketService {
     const fromHubAsset = this.configService.getHubAssetInfo(fromChainId, fromToken);
     invariant6__default.default(fromHubAsset, `hub asset not found for source chain token (token): ${fromToken}`);
     const lendingPool = this.config.lendingPool;
-    calls.push(Erc20Service.encodeApprove(fromHubAsset.asset, fromHubAsset.vault, amount));
-    calls.push(EvmVaultTokenService.encodeDeposit(fromHubAsset.vault, fromHubAsset.asset, amount));
+    if (!this.configService.isValidVault(fromHubAsset.asset)) {
+      calls.push(Erc20Service.encodeApprove(fromHubAsset.asset, fromHubAsset.vault, amount));
+      calls.push(EvmVaultTokenService.encodeDeposit(fromHubAsset.vault, fromHubAsset.asset, amount));
+    }
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(fromHubAsset.decimal, amount);
     calls.push(Erc20Service.encodeApprove(fromHubAsset.vault, lendingPool, translatedAmount));
     calls.push(
@@ -14482,29 +14507,44 @@ var MoneyMarketService = class _MoneyMarketService {
    */
   buildBorrowData(fromHubAddress, toAddress, toToken, amount, toChainId) {
     const toHubAsset = this.configService.getHubAssetInfo(toChainId, toToken);
+    const dstToken = this.configService.getMoneyMarketToken(toChainId, toToken);
     invariant6__default.default(toHubAsset, `hub asset not found for target chain token (toToken): ${toToken}`);
+    invariant6__default.default(dstToken, `Money market token not found for spoke chain (${toChainId}) token: ${toToken}`);
     const assetAddress = toHubAsset.asset;
     const vaultAddress = toHubAsset.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
-    const feeAmount = calculateFeeAmount(amount, this.config.partnerFee);
+    const translatedInAmount = EvmVaultTokenService.translateIncomingDecimals(toHubAsset.decimal, amount);
+    const feeAmount = calculateFeeAmount(translatedInAmount, this.config.partnerFee);
     const calls = [];
-    if (bnUSDVault && bnUSD && bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
+    if (bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
       calls.push(
         _MoneyMarketService.encodeBorrow(
-          { asset: bnUSD, amount, interestRateMode: 2n, referralCode: 0, onBehalfOf: fromHubAddress },
+          {
+            asset: bnUSD,
+            amount: translatedInAmount,
+            interestRateMode: 2n,
+            referralCode: 0,
+            onBehalfOf: fromHubAddress
+          },
           this.config.lendingPool
         )
       );
-      calls.push(Erc20Service.encodeApprove(bnUSD, bnUSDVault, amount));
-      calls.push(EvmVaultTokenService.encodeDeposit(bnUSDVault, bnUSD, amount));
+      calls.push(Erc20Service.encodeApprove(bnUSD, bnUSDVault, translatedInAmount));
+      calls.push(EvmVaultTokenService.encodeDeposit(bnUSDVault, bnUSD, translatedInAmount));
       if (this.config.partnerFee && feeAmount) {
         calls.push(Erc20Service.encodeTransfer(bnUSDVault, this.config.partnerFee.address, feeAmount));
       }
     } else {
       calls.push(
         _MoneyMarketService.encodeBorrow(
-          { asset: vaultAddress, amount, interestRateMode: 2n, referralCode: 0, onBehalfOf: fromHubAddress },
+          {
+            asset: vaultAddress,
+            amount: translatedInAmount,
+            interestRateMode: 2n,
+            referralCode: 0,
+            onBehalfOf: fromHubAddress
+          },
           this.config.lendingPool
         )
       );
@@ -14512,8 +14552,21 @@ var MoneyMarketService = class _MoneyMarketService {
         calls.push(Erc20Service.encodeTransfer(vaultAddress, this.config.partnerFee.address, feeAmount));
       }
     }
-    calls.push(EvmVaultTokenService.encodeWithdraw(vaultAddress, assetAddress, amount - feeAmount));
-    const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(toHubAsset.decimal, amount - feeAmount);
+    if (toToken.toLowerCase() !== vaultAddress.toLowerCase()) {
+      calls.push(EvmVaultTokenService.encodeWithdraw(vaultAddress, assetAddress, translatedInAmount - feeAmount));
+    }
+    let translatedAmountOut;
+    if (this.configService.isValidVault(toToken)) {
+      translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
+        toHubAsset.decimal,
+        translatedInAmount - feeAmount
+      );
+    } else {
+      translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(
+        dstToken.decimals,
+        translatedInAmount - feeAmount
+      );
+    }
     if (toChainId === this.hubProvider.chainConfig.chain.id) {
       if (assetAddress.toLowerCase() === this.configService.spokeChainConfig[toChainId].addresses.wrappedSonic.toLowerCase()) {
         const withdrawToCall = {
@@ -14553,17 +14606,27 @@ var MoneyMarketService = class _MoneyMarketService {
   buildWithdrawData(fromHubAddress, toAddress, toToken, amount, toChainId) {
     const calls = [];
     const toHubAsset = this.configService.getHubAssetInfo(toChainId, toToken);
+    const dstToken = this.configService.getMoneyMarketToken(toChainId, toToken);
     invariant6__default.default(toHubAsset, `hub asset not found for target chain token (toToken): ${toToken}`);
+    invariant6__default.default(dstToken, `Money market token not found for spoke chain (${toChainId}) token: ${toToken}`);
     const assetAddress = toHubAsset.asset;
     const vaultAddress = toHubAsset.vault;
+    const translatedInAmount = EvmVaultTokenService.translateIncomingDecimals(toHubAsset.decimal, amount);
     calls.push(
       _MoneyMarketService.encodeWithdraw(
-        { asset: vaultAddress, amount, to: fromHubAddress },
+        { asset: vaultAddress, amount: translatedInAmount, to: fromHubAddress },
         this.config.lendingPool
       )
     );
-    calls.push(EvmVaultTokenService.encodeWithdraw(vaultAddress, assetAddress, amount));
-    const translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(toHubAsset.decimal, amount);
+    if (!this.configService.isValidVault(toToken)) {
+      calls.push(EvmVaultTokenService.encodeWithdraw(vaultAddress, assetAddress, translatedInAmount));
+    }
+    let translatedAmountOut;
+    if (this.configService.isValidVault(toToken)) {
+      translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(toHubAsset.decimal, translatedInAmount);
+    } else {
+      translatedAmountOut = EvmVaultTokenService.translateOutgoingDecimals(dstToken.decimals, translatedInAmount);
+    }
     if (toChainId === this.hubProvider.chainConfig.chain.id) {
       if (assetAddress.toLowerCase() === this.configService.spokeChainConfig[toChainId].addresses.wrappedSonic.toLowerCase()) {
         const withdrawToCall = {
@@ -14607,18 +14670,23 @@ var MoneyMarketService = class _MoneyMarketService {
     const vaultAddress = fromHubAsset.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
-    calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
-    calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
-    const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(fromHubAsset.decimal, amount);
+    const translatedAmountIn = EvmVaultTokenService.translateIncomingDecimals(fromHubAsset.decimal, amount);
     let repayToken = vaultAddress;
-    if (bnUSDVault && bnUSD && bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
+    if (bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
       repayToken = bnUSD;
-      calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, bnUSD, translatedAmount));
+      if (assetAddress.toLowerCase() !== bnUSDVault.toLowerCase()) {
+        calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, translatedAmountIn));
+        calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, translatedAmountIn));
+      }
+      calls.push(EvmVaultTokenService.encodeWithdraw(bnUSDVault, bnUSD, translatedAmountIn));
+    } else {
+      calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
+      calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
     }
-    calls.push(Erc20Service.encodeApprove(repayToken, this.config.lendingPool, translatedAmount));
+    calls.push(Erc20Service.encodeApprove(repayToken, this.config.lendingPool, translatedAmountIn));
     calls.push(
       _MoneyMarketService.encodeRepay(
-        { asset: repayToken, amount: translatedAmount, interestRateMode: 2n, onBehalfOf: toHubAddress },
+        { asset: repayToken, amount: translatedAmountIn, interestRateMode: 2n, onBehalfOf: toHubAddress },
         this.config.lendingPool
       )
     );