@defisaver/positions-sdk 2.1.42 → 2.1.43-aave-v4-dev-1

package/cjs/contracts.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AaveRewardsControllerViem = exports.SparkRewardsControllerViem = exports.UUPSViem = exports.LiquityStabilityPoolViem = exports.LiquityLQTYStakingViem = exports.AaveUmbrellaViewViem = exports.AaveIncentivesControllerViem = exports.FluidViewContractViem = exports.LiquityV2LegacyViewContractViem = exports.LiquityV2ViewContractViem = exports.LiquityActivePoolContractViem = exports.LiquityPriceFeedContractViem = exports.LiquityTroveManagerContractViem = exports.LiquityCollSurplusPoolContractViem = exports.LiquityViewContractViem = exports.BTCPriceFeedContractViem = exports.WeETHPriceFeedContractViem = exports.ComptrollerContractViem = exports.CompoundLoanInfoContractViem = exports.McdJugContractViem = exports.McdDogContractViem = exports.McdSpotterContractViem = exports.McdVatContractViem = exports.McdViewContractViem = exports.McdGetCdpsContractViem = exports.LlamaLendViewContractViem = exports.CrvUSDFactoryContractViem = exports.CrvUSDViewContractViem = exports.EulerV2ViewContractViem = exports.SparkIncentiveDataProviderContractViem = exports.SparkViewContractViem = exports.CompV3ViewContractViem = exports.WstETHPriceFeedContractViem = exports.USDCPriceFeedContractViem = exports.ETHPriceFeedContractViem = exports.COMPPriceFeedContractViem = exports.DFSFeedRegistryContractViem = exports.FeedRegistryContractViem = exports.AaveIncentiveDataProviderV3ContractViem = exports.AaveV3ViewContractViem = exports.AaveLoanInfoV2ContractViem = exports.MorphoBlueViewContractViem = exports.getYearnV3VaultContractViem = exports.getErc20ContractViem = exports.getSparkSavingsVaultContractViem = exports.getYearnVaultContractViem = exports.getMorphoVaultContractViem = exports.createViemContractFromConfigFunc = exports.getConfigContractAbi = exports.getConfigContractAddress = void 0;
-exports.SkySavingsContractView = exports.MakerDsrContractViem = exports.YearnViewContractViem = exports.StkAAVEViem = exports.LiquityV2sBoldVaultViem = void 0;
+exports.AaveV4ViewContractViem = exports.SkySavingsContractView = exports.MakerDsrContractViem = exports.YearnViewContractViem = exports.StkAAVEViem = exports.LiquityV2sBoldVaultViem = void 0;
 const viem_1 = require("viem");
 const configRaw = __importStar(require("./config/contracts"));
 // @ts-ignore
@@ -177,3 +177,4 @@ exports.StkAAVEViem = (0, exports.createViemContractFromConfigFunc)('StkAAVE');
 exports.YearnViewContractViem = (0, exports.createViemContractFromConfigFunc)('YearnView');
 exports.MakerDsrContractViem = (0, exports.createViemContractFromConfigFunc)('MakerDsr');
 exports.SkySavingsContractView = (0, exports.createViemContractFromConfigFunc)('SkySavings');
+exports.AaveV4ViewContractViem = (0, exports.createViemContractFromConfigFunc)('AaveV4View');

package/cjs/index.d.ts

@@ -1,5 +1,6 @@
 import './setup';
 import * as fluid from './fluid';
+import * as aaveV4 from './aaveV4';
 import * as aaveV3 from './aaveV3';
 import * as aaveV2 from './aaveV2';
 import * as compoundV3 from './compoundV3';
@@ -21,4 +22,4 @@ import * as portfolio from './portfolio';
 import * as claiming from './claiming';
 import * as savings from './savings';
 export * from './types';
-export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
+export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };

package/cjs/index.js

@@ -36,10 +36,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV3 = exports.aaveV2 = void 0;
+exports.savings = exports.claiming = exports.portfolio = exports.fluid = exports.eulerV2 = exports.llamaLend = exports.morphoBlue = exports.helpers = exports.markets = exports.moneymarket = exports.staking = exports.exchange = exports.maker = exports.liquityV2 = exports.liquity = exports.curveUsd = exports.spark = exports.compoundV3 = exports.compoundV2 = exports.aaveV4 = exports.aaveV3 = exports.aaveV2 = void 0;
 require("./setup");
 const fluid = __importStar(require("./fluid"));
 exports.fluid = fluid;
+const aaveV4 = __importStar(require("./aaveV4"));
+exports.aaveV4 = aaveV4;
 const aaveV3 = __importStar(require("./aaveV3"));
 exports.aaveV3 = aaveV3;
 const aaveV2 = __importStar(require("./aaveV2"));

package/cjs/markets/aaveV4/index.d.ts

@@ -0,0 +1,6 @@
+import { AaveV4SpokeInfo } from '../../types';
+import { NetworkNumber } from '../../types/common';
+export declare const AAVE_V4_CORE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
+export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
+    readonly aave_v4_core_spoke: AaveV4SpokeInfo;
+};

package/cjs/markets/aaveV4/index.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AaveV4Spokes = exports.AAVE_V4_CORE_SPOKE = void 0;
+const types_1 = require("../../types");
+const common_1 = require("../../types/common");
+const AAVE_V4_CORE_SPOKE = (networkId) => ({
+    chainIds: [common_1.NetworkNumber.Eth],
+    label: 'Core Spoke',
+    value: types_1.AaveV4SpokesType.AaveV4CoreSpoke,
+    url: 'core',
+    address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
+    hubs: [
+        '0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
+    ],
+});
+exports.AAVE_V4_CORE_SPOKE = AAVE_V4_CORE_SPOKE;
+const AaveV4Spokes = (networkId) => ({
+    [types_1.AaveV4SpokesType.AaveV4CoreSpoke]: (0, exports.AAVE_V4_CORE_SPOKE)(networkId),
+});
+exports.AaveV4Spokes = AaveV4Spokes;

package/cjs/markets/index.d.ts

@@ -7,3 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
 export { EulerV2Markets } from './euler';
 export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
+export { AaveV4Spokes } from './aaveV4';

package/cjs/markets/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
+exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.EulerV2Markets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.findMorphoBlueMarket = exports.MorphoBlueMarkets = exports.CrvUsdMarkets = exports.SparkMarkets = exports.v3USDTCollAssets = exports.v3USDCeCollAssets = exports.v3USDCCollAssets = exports.v3USDbCCollAssets = exports.v3ETHCollAssets = exports.compoundV2CollateralAssets = exports.CompoundMarkets = exports.getAaveV3MarketByMarketAddress = exports.aaveV3AssetsDefaultMarket = exports.aaveV2AssetsDefaultMarket = exports.aaveV1AssetsDefaultMarket = exports.AaveMarkets = void 0;
 var aave_1 = require("./aave");
 Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
 Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
@@ -35,3 +35,5 @@ Object.defineProperty(exports, "getFluidVersionsDataForNetwork", { enumerable: t
 Object.defineProperty(exports, "getFluidMarketInfoById", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoById; } });
 Object.defineProperty(exports, "getFTokenAddress", { enumerable: true, get: function () { return fluid_1.getFTokenAddress; } });
 Object.defineProperty(exports, "getFluidMarketInfoByAddress", { enumerable: true, get: function () { return fluid_1.getFluidMarketInfoByAddress; } });
+var aaveV4_1 = require("./aaveV4");
+Object.defineProperty(exports, "AaveV4Spokes", { enumerable: true, get: function () { return aaveV4_1.AaveV4Spokes; } });

package/cjs/savings/morphoVaults/options.js

@@ -118,7 +118,7 @@ exports.MORPHO_VAULT_STEAKHOUSE_ETH = {
 exports.MORPHO_VAULT_STEAKHOUSE_PYUSD = {
     type: types_1.MorphoVaultType.MorphoVaultSteakhousePYUSD,
     name: 'Steakhouse PYUSD',
-    address: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB',
+    address: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a',
     asset: 'PYUSD',
     deploymentBlock: 19043398,
     isLegacy: false,

package/cjs/types/aaveV4.d.ts

@@ -0,0 +1,73 @@
+import { EthAddress, NetworkNumber } from './common';
+export declare enum AaveV4SpokesType {
+    AaveV4CoreSpoke = "aave_v4_core_spoke"
+}
+export declare enum AaveV4HubsType {
+    AaveV4CoreHub = "aave_v4_core_hub"
+}
+export interface AaveV4SpokeInfo {
+    chainIds: NetworkNumber[];
+    label: string;
+    value: AaveV4SpokesType;
+    url: string;
+    address: EthAddress;
+    hubs: EthAddress[];
+}
+export interface AaveV4HubAssetOnChainData {
+    assetId: number;
+    drawnRate: bigint;
+}
+export interface AaveV4HubOnChainData {
+    assets: Record<number, AaveV4HubAssetOnChainData>;
+}
+export interface AaveV4ReserveAssetOnChain {
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    decimals: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    maxLiquidationBonus: number;
+    liquidationFee: number;
+    price: bigint;
+    totalSupplied: bigint;
+    totalDrawn: bigint;
+    totalPremium: bigint;
+    totalDebt: bigint;
+    supplyCap: bigint;
+    borrowCap: bigint;
+    deficitRay: bigint;
+    spokeActive: boolean;
+    spokePaused: boolean;
+}
+export interface AaveV4ReserveAssetData {
+    symbol: string;
+    underlying: EthAddress;
+    hub: EthAddress;
+    assetId: number;
+    paused: boolean;
+    frozen: boolean;
+    borrowable: boolean;
+    collateralRisk: number;
+    collateralFactor: number;
+    liquidationFee: number;
+    price: string;
+    totalSupplied: string;
+    totalDrawn: string;
+    totalPremium: string;
+    totalDebt: string;
+    supplyCap: string;
+    borrowCap: string;
+    spokeActive: boolean;
+    spokePaused: boolean;
+    drawnRate: string;
+}
+export interface AaveV4SpokeData {
+    assetsData: Record<string, AaveV4ReserveAssetData>;
+    oracle: EthAddress;
+    oracleDecimals: number;
+    address: EthAddress;
+}

package/cjs/types/aaveV4.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AaveV4HubsType = exports.AaveV4SpokesType = void 0;
+var AaveV4SpokesType;
+(function (AaveV4SpokesType) {
+    AaveV4SpokesType["AaveV4CoreSpoke"] = "aave_v4_core_spoke";
+})(AaveV4SpokesType || (exports.AaveV4SpokesType = AaveV4SpokesType = {}));
+var AaveV4HubsType;
+(function (AaveV4HubsType) {
+    AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
+})(AaveV4HubsType || (exports.AaveV4HubsType = AaveV4HubsType = {}));

package/cjs/types/index.d.ts

@@ -13,3 +13,4 @@ export * from './portfolio';
 export * from './merit';
 export * from './merkl';
 export * from './savings';
+export * from './aaveV4';

package/cjs/types/index.js

@@ -29,3 +29,4 @@ __exportStar(require("./portfolio"), exports);
 __exportStar(require("./merit"), exports);
 __exportStar(require("./merkl"), exports);
 __exportStar(require("./savings"), exports);
+__exportStar(require("./aaveV4"), exports);

package/esm/aaveV4/index.d.ts

@@ -0,0 +1,7 @@
+import { Client } from 'viem';
+import { AaveV4SpokeData, AaveV4SpokeInfo } from '../types';
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
+export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
+export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;
+export declare function getAaveV4AccountData(provider: EthereumProvider, network: NetworkNumber, marketData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<any>;

package/esm/aaveV4/index.js

@@ -0,0 +1,90 @@
+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());
+    });
+};
+import Dec from 'decimal.js';
+import { assetAmountInEth, getAssetInfoByAddress } from '@defisaver/tokens';
+import { getViemProvider } from '../services/viem';
+import { AaveV4ViewContractViem } from '../contracts';
+const fetchHubData = (viewContract, hubAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    const hubData = yield viewContract.read.getHubAllAssetsData([hubAddress]);
+    console.log('hubData', hubData);
+    return {
+        assets: hubData.reduce((acc, assetOnChainData) => {
+            acc[assetOnChainData.assetId] = {
+                assetId: assetOnChainData.assetId,
+                drawnRate: assetOnChainData.drawnRate,
+            };
+            return acc;
+        }, {}),
+    };
+});
+const formatReserveAsset = (reserveAsset, hubAsset, oracleDecimals) => {
+    const assetInfo = getAssetInfoByAddress(reserveAsset.underlying);
+    return ({
+        symbol: assetInfo.symbol,
+        underlying: reserveAsset.underlying,
+        hub: reserveAsset.hub,
+        assetId: reserveAsset.assetId,
+        paused: reserveAsset.paused,
+        frozen: reserveAsset.frozen,
+        borrowable: reserveAsset.borrowable,
+        collateralRisk: new Dec(reserveAsset.collateralRisk).div(10000).toNumber(),
+        collateralFactor: new Dec(reserveAsset.collateralFactor).div(10000).toNumber(),
+        liquidationFee: new Dec(reserveAsset.liquidationFee).div(10000).toNumber(),
+        price: new Dec(reserveAsset.price).div(new Dec(10).pow(oracleDecimals)).toString(),
+        totalSupplied: assetAmountInEth(reserveAsset.totalSupplied.toString(), assetInfo.symbol),
+        totalDrawn: assetAmountInEth(reserveAsset.totalDrawn.toString(), assetInfo.symbol),
+        totalPremium: assetAmountInEth(reserveAsset.totalPremium.toString(), assetInfo.symbol),
+        totalDebt: assetAmountInEth(reserveAsset.totalDebt.toString(), assetInfo.symbol),
+        supplyCap: assetAmountInEth(reserveAsset.supplyCap.toString(), assetInfo.symbol),
+        borrowCap: assetAmountInEth(reserveAsset.borrowCap.toString(), assetInfo.symbol),
+        spokeActive: reserveAsset.spokeActive,
+        spokePaused: reserveAsset.spokePaused,
+        drawnRate: new Dec(hubAsset.drawnRate).div(new Dec(10).pow(27)).toString(),
+    });
+};
+export function _getAaveV4SpokeData(provider_1, network_1, market_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+        const hubsData = {};
+        const [spokeData] = yield Promise.all([
+            viewContract.read.getSpokeDataFull([market.address]),
+            ...market.hubs.map((hubAddress) => __awaiter(this, void 0, void 0, function* () {
+                hubsData[hubAddress] = yield fetchHubData(viewContract, hubAddress);
+            })),
+        ]);
+        const reserveAssetsArray = spokeData[1].map((reserveAssetOnChain) => formatReserveAsset(reserveAssetOnChain, hubsData[reserveAssetOnChain.hub].assets[reserveAssetOnChain.assetId], +spokeData[0].oracleDecimals.toString()));
+        return {
+            assetsData: reserveAssetsArray.reduce((acc, reserveAsset) => {
+                acc[reserveAsset.symbol] = reserveAsset;
+                return acc;
+            }, {}),
+            oracle: spokeData[0].oracle,
+            oracleDecimals: +spokeData[0].oracleDecimals.toString(),
+            address: market.address,
+        };
+    });
+}
+export function getAaveV4SpokeData(provider_1, network_1, spoke_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, spoke, blockNumber = 'latest') {
+        return _getAaveV4SpokeData(getViemProvider(provider, network), network, spoke, blockNumber);
+    });
+}
+export function _getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, marketData, address, blockNumber = 'latest') {
+        const viewContract = AaveV4ViewContractViem(provider, network, blockNumber);
+        const loanData = yield viewContract.read.getLoanData([marketData.address, address]);
+        console.log('loanData', loanData);
+    });
+}
+export function getAaveV4AccountData(provider_1, network_1, marketData_1, address_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, marketData, address, blockNumber = 'latest') {
+        return _getAaveV4AccountData(getViemProvider(provider, network), network, marketData, address, blockNumber);
+    });
+}