@sodax/sdk 0.0.1-rc.23 → 0.0.1-rc.24

package/dist/index.d.cts

@@ -6123,7 +6123,7 @@ declare class SonicSpokeService {
      */
     static isBorrowApproved(from: Address, borrowInfo: BorrowInfo, spokeProvider: SonicSpokeProvider, spender?: HubAddress): Promise<Result<boolean>>;
     static approveBorrow<R extends boolean = false>(from: Address, borrowInfo: BorrowInfo, spokeProvider: SonicSpokeProvider, raw?: R): PromiseEvmTxReturnType<R>;
-    static buildWithdrawData(from: Address, withdrawInfo: WithdrawInfo, amount: bigint, spokeProvider: SonicSpokeProvider, moneyMarketService: MoneyMarketService): Promise<Hex$1>;
+    static buildWithdrawData(from: Address, withdrawInfo: WithdrawInfo, amount: bigint, spokeProvider: SonicSpokeProvider, moneyMarketService: MoneyMarketService, userRouterAddress?: HubAddress): Promise<Hex$1>;
 }
 
 type CreateIntentParams = {

package/dist/index.d.ts

@@ -6123,7 +6123,7 @@ declare class SonicSpokeService {
      */
     static isBorrowApproved(from: Address, borrowInfo: BorrowInfo, spokeProvider: SonicSpokeProvider, spender?: HubAddress): Promise<Result<boolean>>;
     static approveBorrow<R extends boolean = false>(from: Address, borrowInfo: BorrowInfo, spokeProvider: SonicSpokeProvider, raw?: R): PromiseEvmTxReturnType<R>;
-    static buildWithdrawData(from: Address, withdrawInfo: WithdrawInfo, amount: bigint, spokeProvider: SonicSpokeProvider, moneyMarketService: MoneyMarketService): Promise<Hex$1>;
+    static buildWithdrawData(from: Address, withdrawInfo: WithdrawInfo, amount: bigint, spokeProvider: SonicSpokeProvider, moneyMarketService: MoneyMarketService, userRouterAddress?: HubAddress): Promise<Hex$1>;
 }
 
 type CreateIntentParams = {

package/dist/index.mjs

@@ -7162,7 +7162,7 @@ var getAllLegacybnUSDTokens = () => {
 var hubAssets = {
   [SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[SONIC_MAINNET_CHAIN_ID].nativeToken]: {
-      asset: spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
+      asset: spokeChainConfig[SONIC_MAINNET_CHAIN_ID].supportedTokens.S.address,
       decimal: 18,
       symbol: "S",
       name: "Sonic",
@@ -10044,7 +10044,7 @@ var SonicSpokeService = class _SonicSpokeService {
         params.data
       )[0]
     );
-    if (params.token === spokeProvider.chainConfig.nativeToken) {
+    if (params.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
       const wrapCall = {
         address: spokeProvider.chainConfig.addresses.wrappedSonic,
         value: params.amount,
@@ -10078,7 +10078,7 @@ var SonicSpokeService = class _SonicSpokeService {
       from: params.from,
       to: spokeProvider.chainConfig.addresses.walletRouter,
       data: txData,
-      value: params.token === spokeProvider.chainConfig.nativeToken ? params.amount : 0n
+      value: params.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? params.amount : 0n
     };
     if (raw) {
       return rawTx;
@@ -10293,12 +10293,16 @@ var SonicSpokeService = class _SonicSpokeService {
     }
     return spokeProvider.walletProvider.sendTransaction(rawTx);
   }
-  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService) {
-    const userRouter = await _SonicSpokeService.getUserRouter(from, spokeProvider);
+  static async buildWithdrawData(from, withdrawInfo, amount, spokeProvider, moneyMarketService, userRouterAddress) {
+    const userRouter = userRouterAddress ?? await _SonicSpokeService.getUserRouter(from, spokeProvider);
+    let token = withdrawInfo.token;
+    if (withdrawInfo.token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase()) {
+      token = spokeProvider.chainConfig.addresses.wrappedSonic;
+    }
     const withdrawCall = moneyMarketService.buildWithdrawData(
       userRouter,
       from,
-      withdrawInfo.token,
+      token,
       amount,
       spokeProvider.chainConfig.chain.id
     );
@@ -10316,17 +10320,6 @@ var SonicSpokeService = class _SonicSpokeService {
       ],
       withdrawCall
     )[0];
-    const transferFromCall = Erc20Service.encodeTransferFrom(
-      withdrawInfo.aTokenAddress,
-      from,
-      userRouter,
-      withdrawInfo.aTokenAmount
-    );
-    calls.unshift({
-      address: transferFromCall.address,
-      value: transferFromCall.value,
-      data: transferFromCall.data
-    });
     return encodeContractCalls(calls);
   }
 };
@@ -13832,7 +13825,7 @@ function calculateAllUserIncentives({
       (reserve2) => reserve2.underlyingAsset === userIncentive.underlyingAsset
     );
     const userReserve = userReserves.find(
-      (userReserve2) => userReserve2.reserve.underlyingAsset === userIncentive.underlyingAsset
+      (userReserve2) => userReserve2.reserve.underlyingAsset.toLowerCase() === userIncentive.underlyingAsset.toLowerCase()
     );
     if (reserve) {
       const reserveRewards = calculateUserReserveIncentives({
@@ -14847,7 +14840,11 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesData(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
+    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
+    );
     return this.uiPoolDataProviderService.getUserReservesData(hubWalletAddress);
   }
   /**
@@ -14878,7 +14875,11 @@ var MoneyMarketDataService = class {
    */
   async getUserReservesHumanized(spokeProvider) {
     const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
-    const hubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
+    const hubWalletAddress = await WalletAbstractionService.getUserHubWalletAddress(
+      walletAddress,
+      spokeProvider,
+      this.hubProvider
+    );
     return this.uiPoolDataProviderService.getUserReservesHumanized(hubWalletAddress);
   }
   /**
@@ -15616,13 +15617,31 @@ var MoneyMarketService = class _MoneyMarketService {
       spokeProvider,
       this.hubProvider
     );
-    const data = this.buildWithdrawData(
-      hubWallet,
-      encodedAddress,
-      params.token,
-      params.amount,
-      spokeProvider.chainConfig.chain.id
-    );
+    let data;
+    if (spokeProvider instanceof SonicSpokeProvider) {
+      const withdrawInfo = await SonicSpokeService.getWithdrawInfo(
+        params.token,
+        params.amount,
+        spokeProvider,
+        this.data
+      );
+      data = await SonicSpokeService.buildWithdrawData(
+        walletAddress,
+        withdrawInfo,
+        params.amount,
+        spokeProvider,
+        this,
+        hubWallet
+      );
+    } else {
+      data = this.buildWithdrawData(
+        hubWallet,
+        encodedAddress,
+        params.token,
+        params.amount,
+        spokeProvider.chainConfig.chain.id
+      );
+    }
     const txResult = await SpokeService.callWallet(hubWallet, data, spokeProvider, this.hubProvider, raw);
     return {
       ok: true,
@@ -15786,9 +15805,14 @@ var MoneyMarketService = class _MoneyMarketService {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const lendingPool = this.config.lendingPool;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
     calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, amount);
@@ -15818,10 +15842,15 @@ var MoneyMarketService = class _MoneyMarketService {
     );
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10(assetConfig, `hub asset not found for spoke chain token (token): ${token}`);
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     const feeAmount = calculateFeeAmount(amount, this.config.partnerFee);
     const calls = [];
     if (bnUSDVault && bnUSD && bnUSDVault.toLowerCase() === vaultAddress.toLowerCase()) {
@@ -15942,10 +15971,15 @@ var MoneyMarketService = class _MoneyMarketService {
     if (!assetConfig) {
       throw new Error("[buildRepayData] Hub asset not found");
     }
-    const assetAddress = assetConfig.asset;
+    let assetAddress = assetConfig.asset;
     const vaultAddress = assetConfig.vault;
     const bnUSDVault = this.config.bnUSDVault;
     const bnUSD = this.config.bnUSD;
+    if (spokeChainId === this.hubProvider.chainConfig.chain.id) {
+      if (token.toLowerCase() === spokeChainConfig[this.hubProvider.chainConfig.chain.id].nativeToken.toLowerCase()) {
+        assetAddress = spokeChainConfig[this.hubProvider.chainConfig.chain.id].supportedTokens.wS.address;
+      }
+    }
     calls.push(Erc20Service.encodeApprove(assetAddress, vaultAddress, amount));
     calls.push(EvmVaultTokenService.encodeDeposit(vaultAddress, assetAddress, amount));
     const translatedAmount = EvmVaultTokenService.translateIncomingDecimals(assetConfig.decimal, amount);