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

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)}`;
 }
@@ -11201,7 +11212,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 +11722,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 +11773,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));
@@ -14695,6 +14704,10 @@ var UiPoolDataProviderService = class {
       args: [this.poolAddressesProvider, userAddress]
     });
   }
+  /**
+   * Get the reserves data humanized
+   * @returns {Promise<ReservesDataHumanized>} - The reserves data humanized
+   */
   async getReservesHumanized() {
     const [reservesRaw, poolBaseCurrencyRaw] = await this.getReservesData();
     const reservesData = reservesRaw.map((reserveRaw, index) => {
@@ -14796,7 +14809,7 @@ var LendingPoolService = class {
   }
   /**
    * Get the normalized income for a reserve
-   * @param asset The address of the asset
+   * @param asset - The address of the asset
    * @returns {Promise<bigint>} - Normalized income
    */
   async getReserveNormalizedIncome(asset) {
@@ -14813,48 +14826,94 @@ var LendingPoolService = class {
 var MoneyMarketDataService = class {
   uiPoolDataProviderService;
   lendingPoolService;
+  hubProvider;
   constructor(hubProvider) {
+    this.hubProvider = hubProvider;
     this.uiPoolDataProviderService = new UiPoolDataProviderService(hubProvider);
     this.lendingPoolService = new LendingPoolService(hubProvider);
   }
   /**
    * LendingPool
    */
+  /**
+   * Get the normalized income for a reserve
+   * @param asset - The address of the asset
+   * @returns {Promise<bigint>} - Normalized income
+   */
   async getReserveNormalizedIncome(asset) {
     return this.lendingPoolService.getReserveNormalizedIncome(asset);
   }
+  /**
+   * Get the reserve data for an asset
+   * @param asset - The address of the asset
+   * @returns {Promise<ReserveDataLegacy>} - The reserve data
+   */
   async getReserveData(asset) {
     return this.lendingPoolService.getReserveData(asset);
   }
   /**
    * UiPoolDataProvider
    */
+  /**
+   * Get the reserves list
+   * @returns {Promise<readonly Address[]>} - List of reserve asset addresses
+   */
   async getReservesList() {
     return this.uiPoolDataProviderService.getReservesList();
   }
+  /**
+   * Get the reserves data
+   * @returns {Promise<readonly [readonly AggregatedReserveData[], BaseCurrencyInfo]>} - The reserves data
+   */
   async getReservesData() {
     return this.uiPoolDataProviderService.getReservesData();
   }
-  async getUserReservesData(userAddress) {
-    return this.uiPoolDataProviderService.getUserReservesData(userAddress);
+  /**
+   * Get the user reserves data
+   * @param spokeProvider - The spoke provider
+   * @returns {Promise<readonly [readonly UserReserveData[], number]>} - The user reserves data
+   */
+  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);
+    return this.uiPoolDataProviderService.getUserReservesData(hubWalletAddress);
   }
+  /**
+   * Get the list of all eModes in the pool
+   * @returns {Promise<readonly EModeData[]>} - Array of eMode data
+   */
   async getEModes() {
     return this.uiPoolDataProviderService.getEModes();
   }
+  /**
+   * Get the list of all eModes in the pool humanized
+   * @returns {Promise<EmodeDataHumanized[]>} - Array of eMode data humanized
+   */
   async getEModesHumanized() {
     return this.uiPoolDataProviderService.getEModesHumanized();
   }
+  /**
+   * Get the reserves data humanized
+   * @returns {Promise<ReservesDataHumanized>} - The reserves data humanized
+   */
   async getReservesHumanized() {
     return this.uiPoolDataProviderService.getReservesHumanized();
   }
-  async getUserReservesHumanized(userAddress) {
-    return this.uiPoolDataProviderService.getUserReservesHumanized(userAddress);
+  /**
+   * Get the user reserves humanized
+   * @param spokeProvider - The spoke provider
+   * @returns {Promise<{userReserves: UserReserveDataHumanized[], userEmodeCategoryId: number}>} - The user reserves humanized
+   */
+  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);
+    return this.uiPoolDataProviderService.getUserReservesHumanized(hubWalletAddress);
   }
   /**
    * Utils for building requests
    */
   /**
-   * @description builds the request for the formatReserves function
+   * @description Util function to build the request for the formatReserves function
    */
   buildReserveDataWithPrice(reserves) {
     const currentUnixTimestamp = Math.floor(Date.now() / 1e3);
@@ -14867,7 +14926,7 @@ var MoneyMarketDataService = class {
     };
   }
   /**
-   * @description builds the request for the formatReserves function
+   * @description Util function to build the request for the formatReserves function
    */
   buildUserSummaryRequest(reserves, formattedReserves, userReserves) {
     const currentUnixTimestamp = Math.floor(Date.now() / 1e3);
@@ -16162,6 +16221,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;