@defisaver/positions-sdk 2.1.96 → 2.1.98-aave-v4-apy-2

package/cjs/helpers/aaveV4Helpers/index.d.ts

@@ -1,4 +1,4 @@
-import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, LeverageType, NetworkNumber } from '../../types';
+import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4SpokeInfo, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets, EthereumProvider, LeverageType, NetworkNumber } from '../../types';
 export declare const calcUserRiskPremiumBps: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => number;
 export declare const getApyAfterValuesEstimation: (usedAssets: AaveV4UsedReserveAssets, assetsData: AaveV4AssetsData) => Record<string, {
     borrowRate: string;
@@ -23,3 +23,13 @@ export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData,
     network: NetworkNumber;
     useUserCollateralFactor?: boolean;
 }) => AaveV4AggregatedPositionData;
+export declare const getAaveV4ApyAfterValuesEstimation: (selectedSpoke: AaveV4SpokeInfo, assetsData: AaveV4AssetsData, actions: [{
+    action: string;
+    amount: string;
+    asset: string;
+}], provider: EthereumProvider, network: NetworkNumber) => Promise<{
+    [key: string]: {
+        supplyRate: string;
+        borrowRate: string;
+    };
+}>;

package/cjs/helpers/aaveV4Helpers/index.js

@@ -1,13 +1,26 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = exports.calculateNetApyAaveV4 = exports.getApyAfterValuesEstimation = exports.calcUserRiskPremiumBps = void 0;
+exports.getAaveV4ApyAfterValuesEstimation = exports.aaveV4GetAggregatedPositionData = exports.isLeveragedPosAaveV4 = exports.aaveV4GetCollateralFactor = exports.calculateNetApyAaveV4 = exports.getApyAfterValuesEstimation = exports.calcUserRiskPremiumBps = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
 const moneymarket_1 = require("../../moneymarket");
 const staking_1 = require("../../staking");
 const types_1 = require("../../types");
+const constants_1 = require("../../constants");
+const contracts_1 = require("../../contracts");
+const viem_1 = require("../../services/viem");
 const calcUserRiskPremiumBps = (usedAssets, assetsData) => {
     const collaterals = [];
     const debts = [];
@@ -231,3 +244,47 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
     return payload;
 };
 exports.aaveV4GetAggregatedPositionData = aaveV4GetAggregatedPositionData;
+const getAaveV4ApyAfterValuesEstimationInner = (selectedSpoke, assetsData, actions, client, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const params = actions.map(({ action, asset, amount }) => {
+        const isDebtAsset = constants_1.borrowOperations.includes(action);
+        const assetData = assetsData[asset];
+        const amountInWei = (0, tokens_1.assetAmountInWei)(amount, assetData.symbol);
+        let liquidityAdded;
+        let liquidityTaken;
+        if (isDebtAsset) {
+            liquidityAdded = action === 'payback' ? amountInWei : '0';
+            liquidityTaken = action === 'borrow' ? amountInWei : '0';
+        }
+        else {
+            liquidityAdded = action === 'collateral' ? amountInWei : '0';
+            liquidityTaken = action === 'withdraw' ? amountInWei : '0';
+        }
+        return {
+            reserveId: BigInt(assetData.reserveId),
+            liquidityAdded: BigInt(liquidityAdded),
+            liquidityTaken: BigInt(liquidityTaken),
+            isDebtAsset,
+        };
+    });
+    const viewContract = (0, contracts_1.AaveV4ViewContractViem)(client, network);
+    const data = yield viewContract.read.getApyAfterValuesEstimation([selectedSpoke.address, params]);
+    const rates = {};
+    data.forEach((item) => {
+        const { hubDrawnRateEstimation, hubTotalDrawnEstimation, hubTotalLiquidityEstimation, hubSwept, liquidityFee, reserveId, } = item;
+        const drawnRate = new decimal_js_1.default(hubDrawnRateEstimation.toString()).div(new decimal_js_1.default(10).pow(27));
+        const borrowApr = drawnRate.mul(100);
+        const assetData = Object.values(assetsData).find(({ reserveId: rId }) => rId === Number(reserveId));
+        const totalDrawn = new decimal_js_1.default(hubTotalDrawnEstimation.toString());
+        const swept = new decimal_js_1.default(hubSwept.toString());
+        const hubUtilizationDenominator = totalDrawn.add(swept).add(hubTotalLiquidityEstimation.toString());
+        const hubUtilization = hubUtilizationDenominator.isZero() ? new decimal_js_1.default(0) : totalDrawn.div(hubUtilizationDenominator);
+        const supplyApr = borrowApr.mul(hubUtilization).mul((assetData === null || assetData === void 0 ? void 0 : assetData.premiumMultiplier) || '0').mul(new decimal_js_1.default(1).minus((assetData === null || assetData === void 0 ? void 0 : assetData.liquidityFee) || '0'));
+        rates[`${assetData === null || assetData === void 0 ? void 0 : assetData.symbol}-${assetData === null || assetData === void 0 ? void 0 : assetData.reserveId}`] = {
+            borrowRate: (0, moneymarket_1.aprToApy)(borrowApr.toString()),
+            supplyRate: (0, moneymarket_1.aprToApy)(supplyApr.toString()),
+        };
+    });
+    return rates;
+});
+const getAaveV4ApyAfterValuesEstimation = (selectedSpoke, assetsData, actions, provider, network) => __awaiter(void 0, void 0, void 0, function* () { return getAaveV4ApyAfterValuesEstimationInner(selectedSpoke, assetsData, actions, (0, viem_1.getViemProvider)(provider, network), network); });
+exports.getAaveV4ApyAfterValuesEstimation = getAaveV4ApyAfterValuesEstimation;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -139,73 +139,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

package/cjs/savings/morphoVaults/index.js

@@ -54,23 +54,23 @@ const morphoVaultsOptions = __importStar(require("./options"));
 exports.morphoVaultsOptions = morphoVaultsOptions;
 const viem_1 = require("../../services/viem");
 const contracts_1 = require("../../contracts");
-const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
-vaultByAddress(chainId: 1, address: "${vaultAddress}") {
-    id,
-    dailyApy,
-    dailyApys {
-    apy, netApy
-    },
-    monthlyApys {
-    apy, netApy
-    },
-    liquidity {
-    underlying, usd,
-    },
-    asset {
-    priceUsd
-    }
-}
+const vaultDataQuery = (vaultAddress) => `query vaultByAddress {
+vaultByAddress(chainId: 1, address: "${vaultAddress}") {
+    id,
+    dailyApy,
+    dailyApys {
+    apy, netApy
+    },
+    monthlyApys {
+    apy, netApy
+    },
+    liquidity {
+    underlying, usd,
+    },
+    asset {
+    priceUsd
+    }
+}
 }`;
 const MORPHO_BLUE_API = 'https://blue-api.morpho.org/graphql';
 const _getMorphoVaultData = (provider, network, morphoVault, accounts) => __awaiter(void 0, void 0, void 0, function* () {

package/cjs/services/utils.d.ts

@@ -16,7 +16,7 @@ export declare const bytesToString: (hex: string) => string;
  * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
  */
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
-export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;
+export declare const isEnabledOnBitmap: (bitmap: string | bigint | number, assetId: string | bigint | number) => boolean;
 export declare const MAXUINT: string;
 export declare const isMaxUint: (amount: string) => boolean;
 export declare const isMainnetNetwork: (network: NetworkNumber) => network is NetworkNumber.Eth;

package/cjs/services/utils.js

@@ -47,8 +47,9 @@ const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
     return new decimal_js_1.default(minOutput).plus(new decimal_js_1.default(slope).mul(new decimal_js_1.default(input).minus(minInput))).toDP(2).toNumber();
 };
 exports.mapRange = mapRange;
+const isEnabledOnBitmap = (bitmap, assetId) => (
 // eslint-disable-next-line no-bitwise
-const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
+((BigInt(bitmap) >> BigInt(assetId)) & BigInt(1)) === BigInt(1));
 exports.isEnabledOnBitmap = isEnabledOnBitmap;
 exports.MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 const isMaxUint = (amount) => (0, exports.compareAddresses)(exports.MAXUINT, amount);

package/cjs/types/aaveV4.d.ts

@@ -107,6 +107,8 @@ export interface AaveV4ReserveAssetData {
     utilization: string;
     /** Hub `liquidity` for this assetId (underlying amount), used for pool-level borrow/withdraw limits */
     hubLiquidity: string;
+    premiumMultiplier: string;
+    liquidityFee: string;
 }
 export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
 export interface AaveV4UsedReserveAsset {

package/esm/aaveV3/index.js

@@ -98,11 +98,11 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             const symbol = market.assets[i];
             // eslint-disable-next-line guard-for-in
             for (const eModeIndex in eModeCategoriesData) {
-                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
+                if (isEnabledOnBitmap(eModeCategoriesData[eModeIndex].collateralBitmap, Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].collateralAssets.push(symbol);
-                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].borrowableBitmap), Number(tokenMarket.assetId)))
+                if (isEnabledOnBitmap(eModeCategoriesData[eModeIndex].borrowableBitmap, Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].borrowAssets.push(symbol);
-                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].ltvzeroBitmap), Number(tokenMarket.assetId)))
+                if (isEnabledOnBitmap(eModeCategoriesData[eModeIndex].ltvzeroBitmap, Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].ltvZeroAssets.push(symbol);
             }
             const borrowCap = tokenMarket.borrowCap.toString();

package/esm/aaveV4/index.js

@@ -121,6 +121,8 @@ const formatReserveAsset = (reserveAsset, hubAsset, reserveId, oracleDecimals, n
         canBePayBacked: reserveAsset.spokeActive && !reserveAsset.spokeHalted && !reserveAsset.paused,
         utilization,
         hubLiquidity,
+        premiumMultiplier: premiumMultiplier.toString(),
+        liquidityFee: liquidityFee.toString(),
     });
 });
 export function _getAaveV4SpokeData(provider_1, network_1, market_1) {

package/esm/config/contracts.d.ts

@@ -97696,6 +97696,66 @@ export declare const YearnV3Vault: {
 };
 export declare const AaveV4View: {
     readonly abi: readonly [{
+        readonly inputs: readonly [{
+            readonly internalType: "address";
+            readonly name: "_spoke";
+            readonly type: "address";
+        }, {
+            readonly components: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "reserveId";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "liquidityAdded";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "liquidityTaken";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "bool";
+                readonly name: "isDebtAsset";
+                readonly type: "bool";
+            }];
+            readonly internalType: "struct AaveV4View.LiquidityChangeParams[]";
+            readonly name: "_reserveParams";
+            readonly type: "tuple[]";
+        }];
+        readonly name: "getApyAfterValuesEstimation";
+        readonly outputs: readonly [{
+            readonly components: readonly [{
+                readonly internalType: "uint256";
+                readonly name: "reserveId";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "hubDrawnRateEstimation";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "hubTotalDrawnEstimation";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "hubTotalLiquidityEstimation";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint256";
+                readonly name: "hubSwept";
+                readonly type: "uint256";
+            }, {
+                readonly internalType: "uint16";
+                readonly name: "liquidityFee";
+                readonly type: "uint16";
+            }];
+            readonly internalType: "struct AaveV4View.EstimatedRates[]";
+            readonly name: "";
+            readonly type: "tuple[]";
+        }];
+        readonly stateMutability: "view";
+        readonly type: "function";
+    }, {
         readonly inputs: readonly [{
             readonly internalType: "address";
             readonly name: "_eoa";
@@ -99241,7 +99301,7 @@ export declare const AaveV4View: {
     }];
     readonly networks: {
         readonly "1": {
-            readonly address: "0x274C0f0164A82B8771145651A8331A909c939e42";
+            readonly address: "0xeCa884900ccC0481F1b65707a80eb294d1245F68";
         };
     };
 };