@defisaver/positions-sdk 2.1.50 → 2.1.51-aave-v4-dev
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/cjs/aaveV4/index.d.ts +7 -0
- package/cjs/aaveV4/index.js +167 -0
- package/cjs/config/contracts.d.ts +1277 -0
- package/cjs/config/contracts.js +9 -0
- package/cjs/contracts.d.ts +23120 -0
- package/cjs/contracts.js +2 -1
- package/cjs/helpers/aaveV4Helpers/index.d.ts +13 -0
- package/cjs/helpers/aaveV4Helpers/index.js +109 -0
- package/cjs/helpers/index.d.ts +1 -0
- package/cjs/helpers/index.js +2 -1
- package/cjs/index.d.ts +2 -1
- package/cjs/index.js +3 -1
- package/cjs/markets/aaveV4/index.d.ts +7 -0
- package/cjs/markets/aaveV4/index.js +22 -0
- package/cjs/markets/index.d.ts +1 -0
- package/cjs/markets/index.js +3 -1
- package/cjs/markets/morphoBlue/index.d.ts +2 -0
- package/cjs/markets/morphoBlue/index.js +19 -2
- package/cjs/portfolio/index.js +20 -0
- package/cjs/types/aaveV4.d.ts +129 -0
- package/cjs/types/aaveV4.js +11 -0
- package/cjs/types/index.d.ts +1 -0
- package/cjs/types/index.js +1 -0
- package/cjs/types/morphoBlue.d.ts +1 -0
- package/cjs/types/morphoBlue.js +1 -0
- package/cjs/types/portfolio.d.ts +4 -0
- package/esm/aaveV4/index.d.ts +7 -0
- package/esm/aaveV4/index.js +158 -0
- package/esm/config/contracts.d.ts +1277 -0
- package/esm/config/contracts.js +8 -0
- package/esm/contracts.d.ts +23120 -0
- package/esm/contracts.js +1 -0
- package/esm/helpers/aaveV4Helpers/index.d.ts +13 -0
- package/esm/helpers/aaveV4Helpers/index.js +100 -0
- package/esm/helpers/index.d.ts +1 -0
- package/esm/helpers/index.js +1 -0
- package/esm/index.d.ts +2 -1
- package/esm/index.js +2 -1
- package/esm/markets/aaveV4/index.d.ts +7 -0
- package/esm/markets/aaveV4/index.js +16 -0
- package/esm/markets/index.d.ts +1 -0
- package/esm/markets/index.js +1 -0
- package/esm/markets/morphoBlue/index.d.ts +2 -0
- package/esm/markets/morphoBlue/index.js +16 -0
- package/esm/portfolio/index.js +21 -1
- package/esm/types/aaveV4.d.ts +129 -0
- package/esm/types/aaveV4.js +8 -0
- package/esm/types/index.d.ts +1 -0
- package/esm/types/index.js +1 -0
- package/esm/types/morphoBlue.d.ts +1 -0
- package/esm/types/morphoBlue.js +1 -0
- package/esm/types/portfolio.d.ts +4 -0
- package/package.json +1 -1
- package/src/aaveV4/index.ts +169 -0
- package/src/config/contracts.ts +8 -0
- package/src/contracts.ts +3 -1
- package/src/helpers/aaveV4Helpers/index.ts +121 -0
- package/src/helpers/index.ts +1 -0
- package/src/index.ts +2 -0
- package/src/markets/aaveV4/index.ts +19 -0
- package/src/markets/index.ts +1 -0
- package/src/markets/morphoBlue/index.ts +17 -0
- package/src/portfolio/index.ts +20 -0
- package/src/types/aaveV4.ts +142 -0
- package/src/types/index.ts +2 -1
- package/src/types/morphoBlue.ts +2 -0
- package/src/types/portfolio.ts +4 -0
package/esm/contracts.js
CHANGED
|
@@ -132,3 +132,4 @@ export const StkAAVEViem = createViemContractFromConfigFunc('StkAAVE');
|
|
|
132
132
|
export const YearnViewContractViem = createViemContractFromConfigFunc('YearnView');
|
|
133
133
|
export const MakerDsrContractViem = createViemContractFromConfigFunc('MakerDsr');
|
|
134
134
|
export const SkySavingsContractView = createViemContractFromConfigFunc('SkySavings');
|
|
135
|
+
export const AaveV4ViewContractViem = createViemContractFromConfigFunc('AaveV4View');
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { AaveV4AggregatedPositionData, AaveV4AssetsData, AaveV4ReserveAssetData, AaveV4UsedReserveAsset, AaveV4UsedReserveAssets } from '../../types';
|
|
2
|
+
import { NetworkNumber } from '../../types/common';
|
|
3
|
+
export declare const aaveV4GetCollateralFactor: (assetData: AaveV4ReserveAssetData, usedAssetData: AaveV4UsedReserveAsset, useUserCollateralFactor?: boolean) => number;
|
|
4
|
+
export declare const isLeveragedPosAaveV4: (usedAssets: AaveV4UsedReserveAssets, dustLimit?: number) => {
|
|
5
|
+
leveragedType: string;
|
|
6
|
+
leveragedAsset: string;
|
|
7
|
+
};
|
|
8
|
+
export declare const aaveV4GetAggregatedPositionData: ({ usedAssets, assetsData, network, useUserCollateralFactor, }: {
|
|
9
|
+
usedAssets: AaveV4UsedReserveAssets;
|
|
10
|
+
assetsData: AaveV4AssetsData;
|
|
11
|
+
network: NetworkNumber;
|
|
12
|
+
useUserCollateralFactor?: boolean;
|
|
13
|
+
}) => AaveV4AggregatedPositionData;
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import Dec from 'decimal.js';
|
|
2
|
+
import { calcLeverageLiqPrice, getAssetsTotal, STABLE_ASSETS } from '../../moneymarket';
|
|
3
|
+
export const aaveV4GetCollateralFactor = (assetData, usedAssetData, useUserCollateralFactor = false) => (useUserCollateralFactor ? usedAssetData.collateralFactor : assetData.collateralFactor);
|
|
4
|
+
export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
|
|
5
|
+
let borrowUnstable = 0;
|
|
6
|
+
let supplyStable = 0;
|
|
7
|
+
let borrowStable = 0;
|
|
8
|
+
let supplyUnstable = 0;
|
|
9
|
+
let longAsset = '';
|
|
10
|
+
let shortAsset = '';
|
|
11
|
+
Object.values(usedAssets).forEach(({ symbol, suppliedUsd, borrowedUsd, collateral, reserveId, }) => {
|
|
12
|
+
const spokeAsset = `${symbol}-${reserveId}`;
|
|
13
|
+
const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
|
|
14
|
+
const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
|
|
15
|
+
if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral)
|
|
16
|
+
supplyStable += 1;
|
|
17
|
+
if (isBorrowed && STABLE_ASSETS.includes(symbol))
|
|
18
|
+
borrowStable += 1;
|
|
19
|
+
if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
|
|
20
|
+
borrowUnstable += 1;
|
|
21
|
+
shortAsset = spokeAsset;
|
|
22
|
+
}
|
|
23
|
+
if (isSupplied && !STABLE_ASSETS.includes(symbol) && collateral) {
|
|
24
|
+
supplyUnstable += 1;
|
|
25
|
+
longAsset = spokeAsset;
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
|
|
29
|
+
const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
|
|
30
|
+
// lsd -> liquid staking derivative
|
|
31
|
+
const isLsdLeveraged = supplyUnstable === 1 && borrowUnstable === 1 && shortAsset === 'ETH' && ['stETH', 'wstETH', 'cbETH', 'rETH', 'ezETH', 'weETH'].includes(longAsset);
|
|
32
|
+
if (isLong) {
|
|
33
|
+
return {
|
|
34
|
+
leveragedType: 'long',
|
|
35
|
+
leveragedAsset: longAsset,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
if (isShort) {
|
|
39
|
+
return {
|
|
40
|
+
leveragedType: 'short',
|
|
41
|
+
leveragedAsset: shortAsset,
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
if (isLsdLeveraged) {
|
|
45
|
+
return {
|
|
46
|
+
leveragedType: 'lsd-leverage',
|
|
47
|
+
leveragedAsset: longAsset,
|
|
48
|
+
};
|
|
49
|
+
}
|
|
50
|
+
return {
|
|
51
|
+
leveragedType: '',
|
|
52
|
+
leveragedAsset: '',
|
|
53
|
+
};
|
|
54
|
+
};
|
|
55
|
+
export const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useUserCollateralFactor = false, }) => {
|
|
56
|
+
var _a;
|
|
57
|
+
const payload = {};
|
|
58
|
+
payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
|
|
59
|
+
payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);
|
|
60
|
+
payload.borrowLimitUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ symbol, suppliedUsd, reserveId }) => new Dec(suppliedUsd).mul(aaveV4GetCollateralFactor(assetsData[`${symbol}-${reserveId}`], usedAssets[`${symbol}-${reserveId}`], useUserCollateralFactor)));
|
|
61
|
+
payload.liquidationLimitUsd = payload.borrowLimitUsd;
|
|
62
|
+
payload.borrowedUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowedUsd }) => borrowedUsd);
|
|
63
|
+
payload.drawnUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ drawnUsd }) => drawnUsd);
|
|
64
|
+
payload.premiumUsd = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ premiumUsd }) => premiumUsd);
|
|
65
|
+
const leftToBorrowUsd = new Dec(payload.borrowLimitUsd).sub(payload.borrowedUsd);
|
|
66
|
+
payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
|
|
67
|
+
payload.ratio = +payload.suppliedUsd ? new Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
|
|
68
|
+
payload.collRatio = +payload.suppliedUsd ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
|
|
69
|
+
payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
|
|
70
|
+
payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
|
|
71
|
+
const { leveragedType, leveragedAsset } = isLeveragedPosAaveV4(usedAssets);
|
|
72
|
+
payload.leveragedType = leveragedType;
|
|
73
|
+
payload.leveragedAsset = leveragedAsset;
|
|
74
|
+
payload.liquidationPrice = '';
|
|
75
|
+
if (leveragedType !== '') {
|
|
76
|
+
const leveragedAssetData = Object.values(assetsData).find((asset) => asset.symbol === leveragedAsset);
|
|
77
|
+
let assetPrice = (leveragedAssetData === null || leveragedAssetData === void 0 ? void 0 : leveragedAssetData.price) || '0';
|
|
78
|
+
if (leveragedType === 'lsd-leverage') {
|
|
79
|
+
// Treat ETH like a stablecoin in a long stETH position
|
|
80
|
+
const ethPrice = ((_a = Object.values(assetsData).find((asset) => asset.symbol === 'ETH')) === null || _a === void 0 ? void 0 : _a.price) || '0';
|
|
81
|
+
payload.leveragedLsdAssetRatio = new Dec((leveragedAssetData === null || leveragedAssetData === void 0 ? void 0 : leveragedAssetData.price) || '0').div(ethPrice).toDP(18).toString();
|
|
82
|
+
assetPrice = new Dec(assetPrice).div(ethPrice).toString();
|
|
83
|
+
}
|
|
84
|
+
payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, assetPrice, payload.borrowedUsd, payload.liquidationLimitUsd);
|
|
85
|
+
}
|
|
86
|
+
payload.minCollRatio = new Dec(payload.suppliedCollateralUsd).div(payload.borrowLimitUsd).mul(100).toString();
|
|
87
|
+
payload.collLiquidationRatio = new Dec(payload.suppliedCollateralUsd).div(payload.liquidationLimitUsd).mul(100).toString();
|
|
88
|
+
// payload.healthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
|
|
89
|
+
payload.minHealthRatio = new Dec(payload.liquidationLimitUsd).div(payload.borrowLimitUsd).toDP(4).toString();
|
|
90
|
+
// TODO: Re-implement netApy calculation
|
|
91
|
+
// const { netApy, incentiveUsd, totalInterestUsd } = calculateNetApy({
|
|
92
|
+
// usedAssets,
|
|
93
|
+
// assetsData,
|
|
94
|
+
// optionalData: { healthRatio: payload.healthRatio },
|
|
95
|
+
// });
|
|
96
|
+
payload.netApy = '0';
|
|
97
|
+
payload.incentiveUsd = '0';
|
|
98
|
+
payload.totalInterestUsd = '0';
|
|
99
|
+
return payload;
|
|
100
|
+
};
|
package/esm/helpers/index.d.ts
CHANGED
package/esm/helpers/index.js
CHANGED
package/esm/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import './setup';
|
|
2
2
|
import * as fluid from './fluid';
|
|
3
|
+
import * as aaveV4 from './aaveV4';
|
|
3
4
|
import * as aaveV3 from './aaveV3';
|
|
4
5
|
import * as aaveV2 from './aaveV2';
|
|
5
6
|
import * as compoundV3 from './compoundV3';
|
|
@@ -21,4 +22,4 @@ import * as portfolio from './portfolio';
|
|
|
21
22
|
import * as claiming from './claiming';
|
|
22
23
|
import * as savings from './savings';
|
|
23
24
|
export * from './types';
|
|
24
|
-
export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
|
|
25
|
+
export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
|
package/esm/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import './setup';
|
|
2
2
|
import * as fluid from './fluid';
|
|
3
|
+
import * as aaveV4 from './aaveV4';
|
|
3
4
|
import * as aaveV3 from './aaveV3';
|
|
4
5
|
import * as aaveV2 from './aaveV2';
|
|
5
6
|
import * as compoundV3 from './compoundV3';
|
|
@@ -21,4 +22,4 @@ import * as portfolio from './portfolio';
|
|
|
21
22
|
import * as claiming from './claiming';
|
|
22
23
|
import * as savings from './savings';
|
|
23
24
|
export * from './types';
|
|
24
|
-
export { aaveV2, aaveV3, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
|
|
25
|
+
export { aaveV2, aaveV3, aaveV4, compoundV2, compoundV3, spark, curveUsd, liquity, liquityV2, maker, exchange, staking, moneymarket, markets, helpers, morphoBlue, llamaLend, eulerV2, fluid, portfolio, claiming, savings, };
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { AaveV4SpokeInfo, AaveV4SpokesType } from '../../types';
|
|
2
|
+
import { NetworkNumber } from '../../types/common';
|
|
3
|
+
export declare const AAVE_V4_CORE_SPOKE: (networkId: NetworkNumber) => AaveV4SpokeInfo;
|
|
4
|
+
export declare const AaveV4Spokes: (networkId: NetworkNumber) => {
|
|
5
|
+
readonly aave_v4_core_spoke: AaveV4SpokeInfo;
|
|
6
|
+
};
|
|
7
|
+
export declare const getAaveV4SpokeTypeInfo: (type: AaveV4SpokesType, network?: NetworkNumber) => AaveV4SpokeInfo;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { AaveV4SpokesType } from '../../types';
|
|
2
|
+
import { NetworkNumber } from '../../types/common';
|
|
3
|
+
export const AAVE_V4_CORE_SPOKE = (networkId) => ({
|
|
4
|
+
chainIds: [NetworkNumber.Eth],
|
|
5
|
+
label: 'Core Spoke',
|
|
6
|
+
value: AaveV4SpokesType.AaveV4CoreSpoke,
|
|
7
|
+
url: 'core',
|
|
8
|
+
address: '0xBa97c5E52cd5BC3D7950Ae70779F8FfE92d40CdC',
|
|
9
|
+
hubs: [
|
|
10
|
+
'0xaD905aD5EA5B98cD50AE40Cfe368344686a21366',
|
|
11
|
+
],
|
|
12
|
+
});
|
|
13
|
+
export const AaveV4Spokes = (networkId) => ({
|
|
14
|
+
[AaveV4SpokesType.AaveV4CoreSpoke]: AAVE_V4_CORE_SPOKE(networkId),
|
|
15
|
+
});
|
|
16
|
+
export const getAaveV4SpokeTypeInfo = (type, network) => (Object.assign({}, AaveV4Spokes(network !== null && network !== void 0 ? network : NetworkNumber.Eth))[type]);
|
package/esm/markets/index.d.ts
CHANGED
|
@@ -7,3 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
|
|
|
7
7
|
export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
|
|
8
8
|
export { EulerV2Markets } from './euler';
|
|
9
9
|
export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
|
|
10
|
+
export { AaveV4Spokes } from './aaveV4';
|
package/esm/markets/index.js
CHANGED
|
@@ -7,3 +7,4 @@ export { LlamaLendMarkets } from './llamaLend';
|
|
|
7
7
|
export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
|
|
8
8
|
export { EulerV2Markets } from './euler';
|
|
9
9
|
export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
|
|
10
|
+
export { AaveV4Spokes } from './aaveV4';
|
|
@@ -33,6 +33,7 @@ export declare const MORPHO_BLUE_SYRUPUSDC_USDC_915: (networkId?: NetworkNumber)
|
|
|
33
33
|
export declare const MORPHO_BLUE_LBTC_USDC_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
34
34
|
export declare const MORPHO_BLUE_LBTC_CBBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
35
35
|
export declare const MORPHO_BLUE_SUSDS_USDT_965: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
36
|
+
export declare const MORPHO_BLUE_MORPHO_USDC_625: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
36
37
|
export declare const MORPHO_BLUE_CBETH_USDC_860_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
37
38
|
export declare const MORPHO_BLUE_CBETH_USDC_860_BASE_1c21c59d: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
38
39
|
export declare const MORPHO_BLUE_WSTETH_ETH_945_BASE: (networkId?: NetworkNumber) => MorphoBlueMarketData;
|
|
@@ -84,6 +85,7 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
|
|
|
84
85
|
readonly morphobluelbtcusdc_860: MorphoBlueMarketData;
|
|
85
86
|
readonly morphobluelbtccbbtc_945: MorphoBlueMarketData;
|
|
86
87
|
readonly morphobluesusdsusdt_965: MorphoBlueMarketData;
|
|
88
|
+
readonly morphobluemorphousdc_625: MorphoBlueMarketData;
|
|
87
89
|
readonly morphobluewstetheth_945: MorphoBlueMarketData;
|
|
88
90
|
readonly morphobluewstetheth_945_exchange_rate: MorphoBlueMarketData;
|
|
89
91
|
readonly morphobluewstetheth_965_exchange_rate: MorphoBlueMarketData;
|
|
@@ -501,6 +501,21 @@ export const MORPHO_BLUE_SUSDS_USDT_965 = (networkId = NetworkNumber.Eth) => ({
|
|
|
501
501
|
marketId: '0x3274643db77a064abd3bc851de77556a4ad2e2f502f4f0c80845fa8f909ecf0b',
|
|
502
502
|
protocolName: 'morpho-blue',
|
|
503
503
|
});
|
|
504
|
+
export const MORPHO_BLUE_MORPHO_USDC_625 = (networkId = NetworkNumber.Eth) => ({
|
|
505
|
+
chainIds: [1],
|
|
506
|
+
label: 'Morpho',
|
|
507
|
+
shortLabel: 'MORPHO/USDC',
|
|
508
|
+
value: MorphoBlueVersions.MorphoBlueMORPHOUSDC_625,
|
|
509
|
+
url: 'morphousdc-6d95bf5f',
|
|
510
|
+
loanToken: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
|
|
511
|
+
collateralToken: '0x58D97B57BB95320F9a05dC918Aef65434969c2B2',
|
|
512
|
+
oracle: '0xEEcD66e6C723c1506532a5f646cC8a502c026A2E',
|
|
513
|
+
oracleType: MorphoBlueOracleType.MARKET_RATE,
|
|
514
|
+
irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
|
|
515
|
+
lltv: 0.625,
|
|
516
|
+
marketId: '0x6d95bf5fad1b0427205ee2b595f80b52e22394173de0832efa79fde88abb8525',
|
|
517
|
+
protocolName: 'morpho-blue',
|
|
518
|
+
});
|
|
504
519
|
// ###### BASE ########
|
|
505
520
|
export const MORPHO_BLUE_CBETH_USDC_860_BASE = (networkId = NetworkNumber.Eth) => ({
|
|
506
521
|
chainIds: [NetworkNumber.Base],
|
|
@@ -890,6 +905,7 @@ export const MorphoBlueMarkets = (networkId) => ({
|
|
|
890
905
|
[MorphoBlueVersions.MorphoBlueLBTCUSDC_860]: MORPHO_BLUE_LBTC_USDC_860(networkId),
|
|
891
906
|
[MorphoBlueVersions.MorphoBlueLBTCCbBTC_945]: MORPHO_BLUE_LBTC_CBBTC_945(networkId),
|
|
892
907
|
[MorphoBlueVersions.MorphoBluesUSDSUSDT_965]: MORPHO_BLUE_SUSDS_USDT_965(networkId),
|
|
908
|
+
[MorphoBlueVersions.MorphoBlueMORPHOUSDC_625]: MORPHO_BLUE_MORPHO_USDC_625(networkId),
|
|
893
909
|
// wstETH/WETH
|
|
894
910
|
[MorphoBlueVersions.MorphoBlueWstEthEth_945]: MORPHO_BLUE_WSTETH_ETH_945(networkId),
|
|
895
911
|
[MorphoBlueVersions.MorphoBlueWstEthEth_945_Exchange_Rate]: MORPHO_BLUE_WSTETH_ETH_945_EXCHANGE_RATE(networkId),
|
package/esm/portfolio/index.js
CHANGED
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import Dec from 'decimal.js';
|
|
11
11
|
import { NetworkNumber } from '../types/common';
|
|
12
|
-
import { AaveMarkets, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
|
|
12
|
+
import { AaveMarkets, AaveV4Spokes, CompoundMarkets, CrvUsdMarkets, EulerV2Markets, LiquityV2Markets, LlamaLendMarkets, MorphoBlueMarkets, SparkMarkets, } from '../markets';
|
|
13
13
|
import { _getMorphoBlueAccountData, _getMorphoBlueMarketData, getMorphoEarn } from '../morphoBlue';
|
|
14
14
|
import { AaveVersions, CompoundVersions, } from '../types';
|
|
15
15
|
import { _getCompoundV3AccountData, _getCompoundV3MarketsData } from '../compoundV3';
|
|
@@ -34,6 +34,7 @@ import { fetchSparkAirdropRewards, fetchSparkRewards } from '../claiming/spark';
|
|
|
34
34
|
import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
|
|
35
35
|
import { getKingRewards } from '../claiming/king';
|
|
36
36
|
import { fetchEthenaAirdropRewards } from '../claiming/ethena';
|
|
37
|
+
import { _getAaveV4AccountData, _getAaveV4SpokeData } from '../aaveV4';
|
|
37
38
|
export function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
|
|
38
39
|
return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
|
|
39
40
|
const isMainnet = network === NetworkNumber.Eth;
|
|
@@ -50,6 +51,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
50
51
|
const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
|
|
51
52
|
const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
|
|
52
53
|
const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
|
|
54
|
+
const aaveV4Spokes = Object.values(AaveV4Spokes(network)).filter((market) => market.chainIds.includes(network));
|
|
53
55
|
const args = [network, { batch: { multicall: { batchSize: isSim ? 500000 : 2500000 } } }];
|
|
54
56
|
const client = getViemProvider(provider, ...args);
|
|
55
57
|
const defaultClient = getViemProvider(defaultProvider, ...args);
|
|
@@ -64,6 +66,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
64
66
|
const crvUsdMarketsData = {};
|
|
65
67
|
const llamaLendMarketsData = {};
|
|
66
68
|
const liquityV2MarketsData = {};
|
|
69
|
+
const aaveV4SpokesData = {};
|
|
67
70
|
const markets = {
|
|
68
71
|
morphoMarketsData,
|
|
69
72
|
compoundV3MarketsData,
|
|
@@ -75,6 +78,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
75
78
|
crvUsdMarketsData,
|
|
76
79
|
llamaLendMarketsData,
|
|
77
80
|
liquityV2MarketsData,
|
|
81
|
+
aaveV4SpokesData,
|
|
78
82
|
};
|
|
79
83
|
const positions = {};
|
|
80
84
|
const stakingPositions = {};
|
|
@@ -83,6 +87,7 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
83
87
|
for (const address of allAddresses) {
|
|
84
88
|
positions[address.toLowerCase()] = {
|
|
85
89
|
aaveV3: {},
|
|
90
|
+
aaveV4: {},
|
|
86
91
|
morphoBlue: {},
|
|
87
92
|
compoundV3: {},
|
|
88
93
|
spark: {},
|
|
@@ -148,6 +153,10 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
148
153
|
const marketData = yield _getAaveV3MarketData(client, network, market);
|
|
149
154
|
aaveV3MarketsData[market.value] = marketData;
|
|
150
155
|
})),
|
|
156
|
+
...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
|
|
157
|
+
const spokeData = yield _getAaveV4SpokeData(client, network, spoke);
|
|
158
|
+
aaveV4SpokesData[spoke.value] = spokeData;
|
|
159
|
+
})),
|
|
151
160
|
...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
152
161
|
const marketData = yield _getAaveV2MarketsData(client, network, market);
|
|
153
162
|
aaveV2MarketsData[market.value] = marketData;
|
|
@@ -417,6 +426,17 @@ export function getPortfolioData(provider_1, network_1, defaultProvider_1, addre
|
|
|
417
426
|
positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
|
|
418
427
|
}
|
|
419
428
|
}))).flat(),
|
|
429
|
+
...aaveV4Spokes.map((spoke) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
430
|
+
try {
|
|
431
|
+
const accData = yield _getAaveV4AccountData(client, network, aaveV4SpokesData[spoke.value], address);
|
|
432
|
+
if (new Dec(accData.suppliedUsd).gt(0))
|
|
433
|
+
positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
|
|
434
|
+
}
|
|
435
|
+
catch (error) {
|
|
436
|
+
console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
|
|
437
|
+
positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
|
|
438
|
+
}
|
|
439
|
+
}))).flat(),
|
|
420
440
|
...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
421
441
|
try {
|
|
422
442
|
const [accDataPromise, earnDataPromise] = yield Promise.allSettled([
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import { EthAddress, IncentiveData, NetworkNumber } from './common';
|
|
2
|
+
export declare enum AaveV4SpokesType {
|
|
3
|
+
AaveV4CoreSpoke = "aave_v4_core_spoke"
|
|
4
|
+
}
|
|
5
|
+
export declare enum AaveV4HubsType {
|
|
6
|
+
AaveV4CoreHub = "aave_v4_core_hub"
|
|
7
|
+
}
|
|
8
|
+
export interface AaveV4SpokeInfo {
|
|
9
|
+
chainIds: NetworkNumber[];
|
|
10
|
+
label: string;
|
|
11
|
+
value: AaveV4SpokesType;
|
|
12
|
+
url: string;
|
|
13
|
+
address: EthAddress;
|
|
14
|
+
hubs: EthAddress[];
|
|
15
|
+
}
|
|
16
|
+
export interface AaveV4HubAssetOnChainData {
|
|
17
|
+
assetId: number;
|
|
18
|
+
drawnRate: bigint;
|
|
19
|
+
}
|
|
20
|
+
export interface AaveV4HubOnChainData {
|
|
21
|
+
assets: Record<number, AaveV4HubAssetOnChainData>;
|
|
22
|
+
}
|
|
23
|
+
export interface AaveV4ReserveAssetOnChain {
|
|
24
|
+
underlying: EthAddress;
|
|
25
|
+
hub: EthAddress;
|
|
26
|
+
assetId: number;
|
|
27
|
+
decimals: number;
|
|
28
|
+
paused: boolean;
|
|
29
|
+
frozen: boolean;
|
|
30
|
+
borrowable: boolean;
|
|
31
|
+
collateralRisk: number;
|
|
32
|
+
collateralFactor: number;
|
|
33
|
+
maxLiquidationBonus: number;
|
|
34
|
+
liquidationFee: number;
|
|
35
|
+
price: bigint;
|
|
36
|
+
totalSupplied: bigint;
|
|
37
|
+
totalDrawn: bigint;
|
|
38
|
+
totalPremium: bigint;
|
|
39
|
+
totalDebt: bigint;
|
|
40
|
+
supplyCap: bigint;
|
|
41
|
+
borrowCap: bigint;
|
|
42
|
+
deficitRay: bigint;
|
|
43
|
+
spokeActive: boolean;
|
|
44
|
+
spokePaused: boolean;
|
|
45
|
+
}
|
|
46
|
+
export interface AaveV4ReserveAssetData {
|
|
47
|
+
symbol: string;
|
|
48
|
+
underlying: EthAddress;
|
|
49
|
+
hub: EthAddress;
|
|
50
|
+
assetId: number;
|
|
51
|
+
reserveId: number;
|
|
52
|
+
paused: boolean;
|
|
53
|
+
frozen: boolean;
|
|
54
|
+
borrowable: boolean;
|
|
55
|
+
collateralRisk: number;
|
|
56
|
+
collateralFactor: number;
|
|
57
|
+
liquidationFee: number;
|
|
58
|
+
price: string;
|
|
59
|
+
totalSupplied: string;
|
|
60
|
+
totalDrawn: string;
|
|
61
|
+
totalPremium: string;
|
|
62
|
+
totalDebt: string;
|
|
63
|
+
supplyCap: string;
|
|
64
|
+
borrowCap: string;
|
|
65
|
+
spokeActive: boolean;
|
|
66
|
+
spokePaused: boolean;
|
|
67
|
+
drawnRate: string;
|
|
68
|
+
supplyRate: string;
|
|
69
|
+
supplyIncentives: IncentiveData[];
|
|
70
|
+
borrowIncentives: IncentiveData[];
|
|
71
|
+
canBeBorrowed: boolean;
|
|
72
|
+
canBeSupplied: boolean;
|
|
73
|
+
canBeWithdrawn: boolean;
|
|
74
|
+
canBePayBacked: boolean;
|
|
75
|
+
utilization: string;
|
|
76
|
+
}
|
|
77
|
+
export type AaveV4AssetsData = Record<string, AaveV4ReserveAssetData>;
|
|
78
|
+
export interface AaveV4SpokeData {
|
|
79
|
+
assetsData: AaveV4AssetsData;
|
|
80
|
+
oracle: EthAddress;
|
|
81
|
+
oracleDecimals: number;
|
|
82
|
+
address: EthAddress;
|
|
83
|
+
}
|
|
84
|
+
export interface AaveV4UsedReserveAsset {
|
|
85
|
+
symbol: string;
|
|
86
|
+
assetId: number;
|
|
87
|
+
reserveId: number;
|
|
88
|
+
supplied: string;
|
|
89
|
+
suppliedUsd: string;
|
|
90
|
+
drawn: string;
|
|
91
|
+
drawnUsd: string;
|
|
92
|
+
premium: string;
|
|
93
|
+
premiumUsd: string;
|
|
94
|
+
borrowed: string;
|
|
95
|
+
borrowedUsd: string;
|
|
96
|
+
isSupplied: boolean;
|
|
97
|
+
isBorrowed: boolean;
|
|
98
|
+
collateral: boolean;
|
|
99
|
+
collateralFactor: number;
|
|
100
|
+
}
|
|
101
|
+
export interface AaveV4AggregatedPositionData {
|
|
102
|
+
suppliedUsd: string;
|
|
103
|
+
suppliedCollateralUsd: string;
|
|
104
|
+
borrowLimitUsd: string;
|
|
105
|
+
liquidationLimitUsd: string;
|
|
106
|
+
borrowedUsd: string;
|
|
107
|
+
drawnUsd: string;
|
|
108
|
+
premiumUsd: string;
|
|
109
|
+
leftToBorrowUsd: string;
|
|
110
|
+
ratio: string;
|
|
111
|
+
collRatio: string;
|
|
112
|
+
liqRatio: string;
|
|
113
|
+
liqPercent: string;
|
|
114
|
+
leveragedType: string;
|
|
115
|
+
leveragedAsset: string;
|
|
116
|
+
liquidationPrice: string;
|
|
117
|
+
leveragedLsdAssetRatio?: string;
|
|
118
|
+
minCollRatio: string;
|
|
119
|
+
collLiquidationRatio: string;
|
|
120
|
+
minHealthRatio: string;
|
|
121
|
+
netApy: string;
|
|
122
|
+
incentiveUsd: string;
|
|
123
|
+
totalInterestUsd: string;
|
|
124
|
+
}
|
|
125
|
+
export type AaveV4UsedReserveAssets = Record<string, AaveV4UsedReserveAsset>;
|
|
126
|
+
export interface AaveV4AccountData extends AaveV4AggregatedPositionData {
|
|
127
|
+
usedAssets: AaveV4UsedReserveAssets;
|
|
128
|
+
healthFactor: string;
|
|
129
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export var AaveV4SpokesType;
|
|
2
|
+
(function (AaveV4SpokesType) {
|
|
3
|
+
AaveV4SpokesType["AaveV4CoreSpoke"] = "aave_v4_core_spoke";
|
|
4
|
+
})(AaveV4SpokesType || (AaveV4SpokesType = {}));
|
|
5
|
+
export var AaveV4HubsType;
|
|
6
|
+
(function (AaveV4HubsType) {
|
|
7
|
+
AaveV4HubsType["AaveV4CoreHub"] = "aave_v4_core_hub";
|
|
8
|
+
})(AaveV4HubsType || (AaveV4HubsType = {}));
|
package/esm/types/index.d.ts
CHANGED
package/esm/types/index.js
CHANGED
|
@@ -34,6 +34,7 @@ export declare enum MorphoBlueVersions {
|
|
|
34
34
|
MorphoBlueSUSDeDAI_945 = "morphobluesusdedai_945",
|
|
35
35
|
MorphoBlueUSDeDAI_860 = "morphoblueusdedai_860",
|
|
36
36
|
MorphoBlueUSDeDAI_915 = "morphoblueusdedai_915",
|
|
37
|
+
MorphoBlueMORPHOUSDC_625 = "morphobluemorphousdc_625",
|
|
37
38
|
MorphoBlueCbEthUSDC_860_Base = "morphobluecbethusdc_860_base",
|
|
38
39
|
MorphoBlueCbEthUSDC_860_Base_1c21c59d = "morphobluecbethusdc_860_base_1c21c59d",
|
|
39
40
|
MorphoBlueWstEthUSDC_860_Base = "morphobluewstethusdc_860_base",
|
package/esm/types/morphoBlue.js
CHANGED
|
@@ -40,6 +40,7 @@ export var MorphoBlueVersions;
|
|
|
40
40
|
// USDe/DAI
|
|
41
41
|
MorphoBlueVersions["MorphoBlueUSDeDAI_860"] = "morphoblueusdedai_860";
|
|
42
42
|
MorphoBlueVersions["MorphoBlueUSDeDAI_915"] = "morphoblueusdedai_915";
|
|
43
|
+
MorphoBlueVersions["MorphoBlueMORPHOUSDC_625"] = "morphobluemorphousdc_625";
|
|
43
44
|
// BASE
|
|
44
45
|
MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base"] = "morphobluecbethusdc_860_base";
|
|
45
46
|
MorphoBlueVersions["MorphoBlueCbEthUSDC_860_Base_1c21c59d"] = "morphobluecbethusdc_860_base_1c21c59d";
|
package/esm/types/portfolio.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
|
|
2
|
+
import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
|
|
2
3
|
import { EthAddress } from './common';
|
|
3
4
|
import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
|
|
4
5
|
import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
|
|
@@ -51,6 +52,9 @@ export interface PortfolioPositionsDataForAddress {
|
|
|
51
52
|
[key: string]: FluidVaultData;
|
|
52
53
|
};
|
|
53
54
|
};
|
|
55
|
+
aaveV4: {
|
|
56
|
+
[key in AaveV4SpokesType]?: PortfolioProtocolData<AaveV4AccountData>;
|
|
57
|
+
};
|
|
54
58
|
}
|
|
55
59
|
export interface PortfolioPositionsData {
|
|
56
60
|
[key: EthAddress]: PortfolioPositionsDataForAddress;
|