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

package/dist/index.cjs

@@ -6186,6 +6186,17 @@ function calculateFeeAmount(inputAmount, fee) {
   }
   return feeAmount;
 }
+function adjustAmountByFee(amount, fee, quoteType) {
+  invariant10__default.default(amount > 0n, "Amount must be greater than 0");
+  invariant10__default.default(quoteType === "exact_input" || quoteType === "exact_output", "Invalid quote type");
+  if (quoteType === "exact_input") {
+    return amount - calculateFeeAmount(amount, fee);
+  }
+  if (quoteType === "exact_output") {
+    return amount + calculateFeeAmount(amount, fee);
+  }
+  throw new Error("Invalid quote type");
+}
 function BigIntToHex(value) {
   return `0x${value.toString(16)}`;
 }
@@ -7179,7 +7190,7 @@ var getAllLegacybnUSDTokens = () => {
 var hubAssets = {
   [types.SONIC_MAINNET_CHAIN_ID]: {
     [spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].nativeToken]: {
-      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.wS.address,
+      asset: spokeChainConfig[types.SONIC_MAINNET_CHAIN_ID].supportedTokens.S.address,
       decimal: 18,
       symbol: "S",
       name: "Sonic",
@@ -10061,7 +10072,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,
@@ -10095,7 +10106,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;
@@ -10310,12 +10321,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
     );
@@ -10333,17 +10348,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);
   }
 };
@@ -11201,7 +11205,7 @@ var SolverService = class {
   async getQuote(payload) {
     payload = {
       ...payload,
-      amount: payload.amount - this.getFee(payload.amount)
+      amount: adjustAmountByFee(payload.amount, this.config.partnerFee, payload.quote_type)
     };
     return SolverApiService.getQuote(payload, this.config);
   }
@@ -11711,8 +11715,7 @@ var SolverService = class {
         params.srcAddress.toLowerCase() === walletAddress.toLowerCase(),
         "srcAddress must be the same as wallet address"
       );
-      const walletAddressBytes = encodeAddress(params.srcChain, walletAddress);
-      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddressBytes : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
+      const creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(
         {
           ...params,
@@ -11763,8 +11766,7 @@ var SolverService = class {
       invariant10__default.default(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
       invariant10__default.default(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
       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 creatorHubWalletAddress = spokeProvider.chainConfig.chain.id === this.hubProvider.chainConfig.chain.id ? walletAddress : await WalletAbstractionService.getUserHubWalletAddress(walletAddress, spokeProvider, this.hubProvider);
       const calls = [];
       const intentsContract = this.config.intentsContract;
       calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
@@ -13851,7 +13853,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({
@@ -14866,7 +14868,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);
   }
   /**
@@ -14897,7 +14903,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);
   }
   /**
@@ -15635,13 +15645,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,
@@ -15805,9 +15833,14 @@ var MoneyMarketService = class _MoneyMarketService {
     const calls = [];
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10__default.default(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);
@@ -15837,10 +15870,15 @@ var MoneyMarketService = class _MoneyMarketService {
     );
     const assetConfig = getHubAssetInfo(spokeChainId, token);
     invariant10__default.default(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()) {
@@ -15961,10 +15999,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);
@@ -16212,6 +16255,7 @@ exports.WAD = WAD;
 exports.WAD_RAY_RATIO = WAD_RAY_RATIO;
 exports.WEI_DECIMALS = WEI_DECIMALS;
 exports.WalletAbstractionService = WalletAbstractionService;
+exports.adjustAmountByFee = adjustAmountByFee;
 exports.assetManagerAbi = assetManagerAbi;
 exports.balnSwapAbi = balnSwapAbi;
 exports.binomialApproximatedRayPow = binomialApproximatedRayPow;