@defisaver/positions-sdk 2.1.152-shifter-v2-dev-dev → 2.1.153-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/fluid/index.d.ts +0 -2
- package/cjs/fluid/index.js +1 -36
- package/cjs/maker/index.d.ts +2 -7
- package/cjs/maker/index.js +10 -27
- package/cjs/markets/index.d.ts +0 -1
- package/cjs/markets/index.js +1 -3
- package/cjs/portfolio/index.d.ts +1 -5
- package/cjs/portfolio/index.js +0 -287
- package/cjs/types/portfolio.d.ts +10 -26
- package/esm/fluid/index.d.ts +0 -2
- package/esm/fluid/index.js +0 -33
- package/esm/maker/index.d.ts +2 -7
- package/esm/maker/index.js +11 -26
- package/esm/markets/index.d.ts +0 -1
- package/esm/markets/index.js +0 -1
- package/esm/portfolio/index.d.ts +1 -5
- package/esm/portfolio/index.js +3 -289
- package/esm/types/portfolio.d.ts +10 -26
- package/package.json +1 -1
- package/src/fluid/index.ts +0 -40
- package/src/maker/index.ts +28 -56
- package/src/markets/index.ts +1 -2
- package/src/portfolio/index.ts +2 -270
- package/src/types/portfolio.ts +12 -31
- package/cjs/markets/maker/index.d.ts +0 -1
- package/cjs/markets/maker/index.js +0 -13
- package/esm/markets/maker/index.d.ts +0 -1
- package/esm/markets/maker/index.js +0 -10
- package/src/markets/maker/index.ts +0 -10
package/cjs/fluid/index.d.ts
CHANGED
|
@@ -221,5 +221,3 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
|
|
|
221
221
|
nftId: string;
|
|
222
222
|
} | undefined;
|
|
223
223
|
}[]>;
|
|
224
|
-
export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
|
|
225
|
-
export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
|
package/cjs/fluid/index.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.
|
|
15
|
+
exports._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
|
|
16
16
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
17
17
|
const tokens_1 = require("@defisaver/tokens");
|
|
18
18
|
const common_1 = require("../types/common");
|
|
@@ -1410,38 +1410,3 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
|
|
|
1410
1410
|
})).filter(md => md.marketData !== undefined);
|
|
1411
1411
|
});
|
|
1412
1412
|
exports._getUserPositionsPortfolio = _getUserPositionsPortfolio;
|
|
1413
|
-
const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
|
|
1414
|
-
const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
|
|
1415
|
-
if (versions.length === 0)
|
|
1416
|
-
return {};
|
|
1417
|
-
const view = (0, contracts_1.FluidViewContractViem)(provider, network);
|
|
1418
|
-
const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
|
|
1419
|
-
const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
|
|
1420
|
-
const vaultTokens = [(0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken0, network).symbol, (0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken0, network).symbol];
|
|
1421
|
-
if (vaultData.supplyToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.supplyToken1))
|
|
1422
|
-
vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken1, network).symbol);
|
|
1423
|
-
if (vaultData.borrowToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.borrowToken1))
|
|
1424
|
-
vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken1, network).symbol);
|
|
1425
|
-
return vaultTokens;
|
|
1426
|
-
}).flat()));
|
|
1427
|
-
// ETH and WBTC needed for other tokens prices
|
|
1428
|
-
if (!tokens.includes('ETH'))
|
|
1429
|
-
tokens.push('ETH');
|
|
1430
|
-
if (!tokens.includes('WBTC'))
|
|
1431
|
-
tokens.push('WBTC');
|
|
1432
|
-
const [tokenPrices, merklCampaigns] = yield Promise.all([
|
|
1433
|
-
getTokensPricesForPortfolio(tokens, provider, network),
|
|
1434
|
-
(0, merkl_1.getFluidMerklCampaigns)(network),
|
|
1435
|
-
]);
|
|
1436
|
-
const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
|
|
1437
|
-
const marketsData = {};
|
|
1438
|
-
parsedMarketsData.forEach((marketData, i) => {
|
|
1439
|
-
if (!marketData)
|
|
1440
|
-
return;
|
|
1441
|
-
marketsData[versions[i].value] = (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns);
|
|
1442
|
-
});
|
|
1443
|
-
return marketsData;
|
|
1444
|
-
});
|
|
1445
|
-
exports._getAllFluidMarketDataPortfolio = _getAllFluidMarketDataPortfolio;
|
|
1446
|
-
const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataPortfolio)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network); });
|
|
1447
|
-
exports.getAllFluidMarketDataPortfolio = getAllFluidMarketDataPortfolio;
|
package/cjs/maker/index.d.ts
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import { Client, PublicClient } from 'viem';
|
|
2
2
|
import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
|
|
3
|
-
import { CdpData, CdpInfo
|
|
3
|
+
import { CdpData, CdpInfo } from '../types';
|
|
4
4
|
export declare const _getMakerAccountBalances: (provider: PublicClient, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
|
|
5
5
|
export declare const getMakerAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
|
|
6
6
|
export declare const _getUserCdps: (provider: Client, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
|
|
7
7
|
export declare const getUserCdps: (provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
|
|
8
|
-
export declare const
|
|
9
|
-
export declare const getMakerIlksData: (provider: EthereumProvider, network: NetworkNumber, ilkLabels: string[]) => Promise<Record<string, IlkInfo>>;
|
|
10
|
-
/**
|
|
11
|
-
* @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
|
|
12
|
-
*/
|
|
13
|
-
export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo, ilkInfo?: IlkInfo) => Promise<CdpData>;
|
|
8
|
+
export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo) => Promise<CdpData>;
|
|
14
9
|
export declare const getMakerCdpData: (provider: EthereumProvider, network: NetworkNumber, cdp: CdpInfo) => Promise<CdpData>;
|
package/cjs/maker/index.js
CHANGED
|
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
12
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.getMakerCdpData = exports._getMakerCdpData = exports.
|
|
15
|
+
exports.getMakerCdpData = exports._getMakerCdpData = exports.getUserCdps = exports._getUserCdps = exports.getMakerAccountBalances = exports._getMakerAccountBalances = void 0;
|
|
16
16
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
17
17
|
const tokens_1 = require("@defisaver/tokens");
|
|
18
18
|
const contracts_1 = require("../contracts");
|
|
@@ -90,39 +90,22 @@ const _getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void
|
|
|
90
90
|
exports._getUserCdps = _getUserCdps;
|
|
91
91
|
const getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getUserCdps)((0, viem_1.getViemProvider)(provider, network), network, userAddress); });
|
|
92
92
|
exports.getUserCdps = getUserCdps;
|
|
93
|
-
const
|
|
93
|
+
const _getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, void 0, function* () {
|
|
94
94
|
const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
|
|
95
95
|
const spotterContract = (0, contracts_1.McdSpotterContractViem)(provider, network);
|
|
96
96
|
const dogContract = (0, contracts_1.McdDogContractViem)(provider, network);
|
|
97
97
|
const jugContract = (0, contracts_1.McdJugContractViem)(provider, network);
|
|
98
|
-
const par = yield
|
|
99
|
-
const ilksInfo = yield Promise.all(ilkLabels.map((ilkLabel) => __awaiter(void 0, void 0, void 0, function* () {
|
|
100
|
-
const ilk = (0, tokens_1.stringToBytes)(ilkLabel);
|
|
101
|
-
const [[_, mat], [artGlobal, rate, spot, line], [duty], futureRate, chop,] = yield Promise.all([
|
|
102
|
-
spotterContract.read.ilks([ilk]),
|
|
103
|
-
vatContract.read.ilks([ilk]),
|
|
104
|
-
jugContract.read.ilks([ilk]),
|
|
105
|
-
jugContract.read.drip([ilk]),
|
|
106
|
-
dogContract.read.chop([ilk]),
|
|
107
|
-
]);
|
|
108
|
-
return (0, makerHelpers_1.parseCollateralInfo)(ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
|
|
109
|
-
})));
|
|
110
|
-
return Object.fromEntries(ilksInfo.map((ilkInfo) => [ilkInfo.ilkLabel, ilkInfo]));
|
|
111
|
-
});
|
|
112
|
-
exports._getMakerIlksData = _getMakerIlksData;
|
|
113
|
-
const getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getMakerIlksData)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, ilkLabels); });
|
|
114
|
-
exports.getMakerIlksData = getMakerIlksData;
|
|
115
|
-
/**
|
|
116
|
-
* @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
|
|
117
|
-
*/
|
|
118
|
-
const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0, void 0, void 0, function* () {
|
|
119
|
-
const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
|
|
120
|
-
const [[ink, art], coll, fetchedIlkInfo,] = yield Promise.all([
|
|
98
|
+
const [[ink, art], coll, par, [_, mat], [artGlobal, rate, spot, line], [duty], futureRate, chop,] = yield Promise.all([
|
|
121
99
|
vatContract.read.urns([cdp.ilk, cdp.urn]),
|
|
122
100
|
vatContract.read.gem([cdp.ilk, cdp.urn]),
|
|
123
|
-
|
|
101
|
+
spotterContract.read.par(),
|
|
102
|
+
spotterContract.read.ilks([cdp.ilk]),
|
|
103
|
+
vatContract.read.ilks([cdp.ilk]),
|
|
104
|
+
jugContract.read.ilks([cdp.ilk]),
|
|
105
|
+
jugContract.read.drip([cdp.ilk]),
|
|
106
|
+
dogContract.read.chop([cdp.ilk]),
|
|
124
107
|
]);
|
|
125
|
-
const collInfo =
|
|
108
|
+
const collInfo = (0, makerHelpers_1.parseCollateralInfo)(cdp.ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), duty.toString(), futureRate.toString(), chop.toString());
|
|
126
109
|
const collateral = (0, tokens_1.assetAmountInEth)(ink.toString(), `MCD-${cdp.asset}`);
|
|
127
110
|
const collateralUsd = new decimal_js_1.default(collateral).mul(collInfo.assetPrice).toString();
|
|
128
111
|
const debt = new decimal_js_1.default(art).times(collInfo.currentRate).div(1e27).floor()
|
package/cjs/markets/index.d.ts
CHANGED
|
@@ -8,4 +8,3 @@ export { LlamaLendMarkets } from './llamaLend';
|
|
|
8
8
|
export { LiquityV2Markets, findLiquityV2MarketByAddress } from './liquityV2';
|
|
9
9
|
export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById, getFTokenAddress, getFluidMarketInfoByAddress, } from './fluid';
|
|
10
10
|
export { AaveV4Spokes, findAaveV4SpokeByAddress } from './aaveV4';
|
|
11
|
-
export { MakerActiveIlks } from './maker';
|
package/cjs/markets/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.findAaveV4SpokeByAddress = exports.AaveV4Spokes = exports.getFluidMarketInfoByAddress = exports.getFTokenAddress = exports.getFluidMarketInfoById = exports.getFluidVersionsDataForNetwork = exports.FluidMarkets = exports.findLiquityV2MarketByAddress = exports.LiquityV2Markets = exports.LlamaLendMarkets = exports.morphoMidnightVisibleCollaterals = exports.morphoMidnightMarketCollateralParams = exports.isTenorMidnightMarket = exports.findMorphoMidnightMarket = exports.MorphoMidnightMarkets = 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;
|
|
4
4
|
var aave_1 = require("./aave");
|
|
5
5
|
Object.defineProperty(exports, "AaveMarkets", { enumerable: true, get: function () { return aave_1.AaveMarkets; } });
|
|
6
6
|
Object.defineProperty(exports, "aaveV1AssetsDefaultMarket", { enumerable: true, get: function () { return aave_1.aaveV1AssetsDefaultMarket; } });
|
|
@@ -42,5 +42,3 @@ Object.defineProperty(exports, "getFluidMarketInfoByAddress", { enumerable: true
|
|
|
42
42
|
var aaveV4_1 = require("./aaveV4");
|
|
43
43
|
Object.defineProperty(exports, "AaveV4Spokes", { enumerable: true, get: function () { return aaveV4_1.AaveV4Spokes; } });
|
|
44
44
|
Object.defineProperty(exports, "findAaveV4SpokeByAddress", { enumerable: true, get: function () { return aaveV4_1.findAaveV4SpokeByAddress; } });
|
|
45
|
-
var maker_1 = require("./maker");
|
|
46
|
-
Object.defineProperty(exports, "MakerActiveIlks", { enumerable: true, get: function () { return maker_1.MakerActiveIlks; } });
|
package/cjs/portfolio/index.d.ts
CHANGED
|
@@ -1,13 +1,9 @@
|
|
|
1
1
|
import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
|
|
2
|
-
import {
|
|
2
|
+
import { PortfolioPositionsData } from '../types';
|
|
3
3
|
export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean): Promise<{
|
|
4
4
|
positions: PortfolioPositionsData;
|
|
5
5
|
stakingPositions: any;
|
|
6
6
|
rewardsData: any;
|
|
7
7
|
markets: any;
|
|
8
8
|
}>;
|
|
9
|
-
export declare function getShifterPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim?: boolean): Promise<{
|
|
10
|
-
positions: PortfolioPositionsData;
|
|
11
|
-
markets: PortfolioMarketsData;
|
|
12
|
-
}>;
|
|
13
9
|
export * from './discovery';
|
package/cjs/portfolio/index.js
CHANGED
|
@@ -27,7 +27,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.getPortfolioData = getPortfolioData;
|
|
30
|
-
exports.getShifterPortfolioData = getShifterPortfolioData;
|
|
31
30
|
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
32
31
|
const common_1 = require("../types/common");
|
|
33
32
|
const markets_1 = require("../markets");
|
|
@@ -624,290 +623,4 @@ function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1)
|
|
|
624
623
|
};
|
|
625
624
|
});
|
|
626
625
|
}
|
|
627
|
-
function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
|
|
628
|
-
return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
|
|
629
|
-
const isMainnet = network === common_1.NetworkNumber.Eth;
|
|
630
|
-
const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
|
|
631
|
-
const morphoMarkets = Object.values((0, markets_1.MorphoBlueMarkets)(network)).filter((market) => market.chainIds.includes(network));
|
|
632
|
-
const morphoMidnightMarkets = Object.values((0, markets_1.MorphoMidnightMarkets)(network)).filter((market) => market.chainIds.includes(network));
|
|
633
|
-
const compoundV3Markets = Object.values((0, markets_1.CompoundMarkets)(network)).filter((market) => market.chainIds.includes(network) && market.value !== types_1.CompoundVersions.CompoundV2);
|
|
634
|
-
const sparkMarkets = Object.values((0, markets_1.SparkMarkets)(network)).filter((market) => market.chainIds.includes(network));
|
|
635
|
-
const aaveV3Markets = [types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
|
|
636
|
-
const aaveV2Markets = [types_1.AaveVersions.AaveV2].map((version) => (0, markets_1.AaveMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
|
|
637
|
-
const compoundV2Markets = [types_1.CompoundVersions.CompoundV2].map((version) => (0, markets_1.CompoundMarkets)(network)[version]).filter((market) => market.chainIds.includes(network));
|
|
638
|
-
const crvUsdMarkets = Object.values((0, markets_1.CrvUsdMarkets)(network)).filter((market) => market.chainIds.includes(network));
|
|
639
|
-
const llamaLendMarkets = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network) ? Object.values((0, markets_1.LlamaLendMarkets)(network)).filter((market) => market.chainIds.includes(network)) : [];
|
|
640
|
-
const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
|
|
641
|
-
const aaveV4Spokes = Object.values((0, markets_1.AaveV4Spokes)(network)).filter((market) => market.chainIds.includes(network));
|
|
642
|
-
const args = [network, { batch: { multicall: { batchSize: isSim ? 2000 : 2500000 } } }];
|
|
643
|
-
const client = (0, viem_1.getViemProvider)(provider, ...args);
|
|
644
|
-
const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
|
|
645
|
-
const markets = {
|
|
646
|
-
morphoMarketsData: {},
|
|
647
|
-
morphoMidnightMarketsData: {},
|
|
648
|
-
compoundV3MarketsData: {},
|
|
649
|
-
sparkMarketsData: {},
|
|
650
|
-
aaveV3MarketsData: {},
|
|
651
|
-
aaveV2MarketsData: {},
|
|
652
|
-
compoundV2MarketsData: {},
|
|
653
|
-
crvUsdMarketsData: {},
|
|
654
|
-
llamaLendMarketsData: {},
|
|
655
|
-
liquityV2MarketsData: {},
|
|
656
|
-
aaveV4SpokesData: {},
|
|
657
|
-
fluidMarketsData: {},
|
|
658
|
-
makerMarketsData: {},
|
|
659
|
-
};
|
|
660
|
-
const makerCdps = {};
|
|
661
|
-
const positions = {};
|
|
662
|
-
for (const address of addresses) {
|
|
663
|
-
positions[address.toLowerCase()] = {
|
|
664
|
-
aaveV3: {},
|
|
665
|
-
aaveV4: {},
|
|
666
|
-
morphoBlue: {},
|
|
667
|
-
morphoMidnight: {},
|
|
668
|
-
compoundV3: {},
|
|
669
|
-
spark: {},
|
|
670
|
-
maker: {},
|
|
671
|
-
aaveV2: {},
|
|
672
|
-
compoundV2: {},
|
|
673
|
-
liquity: {},
|
|
674
|
-
crvUsd: {},
|
|
675
|
-
llamaLend: {},
|
|
676
|
-
fluid: {
|
|
677
|
-
error: '',
|
|
678
|
-
data: {},
|
|
679
|
-
},
|
|
680
|
-
};
|
|
681
|
-
}
|
|
682
|
-
yield Promise.allSettled([
|
|
683
|
-
// === MARKET DATA (needs to be fetched first) ===
|
|
684
|
-
...morphoMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
685
|
-
markets.morphoMarketsData[market.value] = yield (0, morphoBlue_1._getMorphoBluePortfolioMarketData)(client, network, market);
|
|
686
|
-
})),
|
|
687
|
-
...morphoMidnightMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
688
|
-
markets.morphoMidnightMarketsData[market.value] = yield (0, morphoMidnight_1._getMorphoMidnightMarketData)(client, network, market);
|
|
689
|
-
})),
|
|
690
|
-
...compoundV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
691
|
-
markets.compoundV3MarketsData[market.value] = yield (0, compoundV3_1._getCompoundV3MarketsData)(client, network, market, defaultClient);
|
|
692
|
-
})),
|
|
693
|
-
...sparkMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
694
|
-
markets.sparkMarketsData[market.value] = yield (0, spark_1._getSparkMarketsData)(client, network, market);
|
|
695
|
-
})),
|
|
696
|
-
...aaveV3Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
697
|
-
markets.aaveV3MarketsData[market.value] = yield (0, aaveV3_1._getAaveV3MarketData)(client, network, market);
|
|
698
|
-
})),
|
|
699
|
-
...aaveV4Spokes.map((spoke) => __awaiter(this, void 0, void 0, function* () {
|
|
700
|
-
markets.aaveV4SpokesData[spoke.value] = yield (0, aaveV4_1._getAaveV4SpokeData)(client, network, spoke);
|
|
701
|
-
})),
|
|
702
|
-
...aaveV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
703
|
-
markets.aaveV2MarketsData[market.value] = yield (0, aaveV2_1._getAaveV2MarketsData)(client, network, market);
|
|
704
|
-
})),
|
|
705
|
-
...compoundV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
706
|
-
markets.compoundV2MarketsData[market.value] = yield (0, compoundV2_1._getCompoundV2MarketsData)(client, network);
|
|
707
|
-
})),
|
|
708
|
-
...crvUsdMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
709
|
-
markets.crvUsdMarketsData[market.value] = yield (0, curveUsd_1._getCurveUsdGlobalData)(client, network, market);
|
|
710
|
-
})),
|
|
711
|
-
...llamaLendMarkets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
712
|
-
markets.llamaLendMarketsData[market.value] = yield (0, llamaLend_1._getLlamaLendGlobalData)(client, network, market);
|
|
713
|
-
})),
|
|
714
|
-
...liquityV2Markets.map((market) => __awaiter(this, void 0, void 0, function* () {
|
|
715
|
-
markets.liquityV2MarketsData[market.value] = yield (0, liquityV2_1._getLiquityV2MarketData)(client, network, market);
|
|
716
|
-
})),
|
|
717
|
-
(() => __awaiter(this, void 0, void 0, function* () {
|
|
718
|
-
if (!isFluidSupported)
|
|
719
|
-
return;
|
|
720
|
-
try {
|
|
721
|
-
markets.fluidMarketsData = yield (0, fluid_1._getAllFluidMarketDataPortfolio)(client, network);
|
|
722
|
-
}
|
|
723
|
-
catch (error) {
|
|
724
|
-
console.error('Error fetching Fluid markets data:', error);
|
|
725
|
-
}
|
|
726
|
-
}))(),
|
|
727
|
-
(() => __awaiter(this, void 0, void 0, function* () {
|
|
728
|
-
if (!isMainnet)
|
|
729
|
-
return; // Maker CDPs are only available on mainnet
|
|
730
|
-
try {
|
|
731
|
-
markets.makerMarketsData = yield (0, maker_1._getMakerIlksData)(client, network, markets_1.MakerActiveIlks);
|
|
732
|
-
}
|
|
733
|
-
catch (error) {
|
|
734
|
-
console.error('Error fetching Maker ilks data:', error);
|
|
735
|
-
}
|
|
736
|
-
}))(),
|
|
737
|
-
// === INDEPENDENT USER DATA (doesn't depend on market data) ===
|
|
738
|
-
...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
739
|
-
if (!isMainnet)
|
|
740
|
-
return; // Maker CDPs are only available on mainnet
|
|
741
|
-
const makerCdp = yield (0, maker_1._getUserCdps)(client, network, address);
|
|
742
|
-
makerCdps[address.toLowerCase()] = makerCdp;
|
|
743
|
-
})),
|
|
744
|
-
...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
745
|
-
try {
|
|
746
|
-
if (!isFluidSupported)
|
|
747
|
-
return; // Fluid is not available on Optimism
|
|
748
|
-
const userPositions = (yield (0, fluid_1._getUserPositionsPortfolio)(client, network, address));
|
|
749
|
-
for (const position of userPositions) {
|
|
750
|
-
if (position.userData && new decimal_js_1.default(position.userData.suppliedUsd).gt(0)) {
|
|
751
|
-
positions[address.toLowerCase()].fluid.data[position.userData.nftId] = position.userData;
|
|
752
|
-
}
|
|
753
|
-
}
|
|
754
|
-
}
|
|
755
|
-
catch (error) {
|
|
756
|
-
console.error(`Error fetching Fluid positions for address ${address}:`, error);
|
|
757
|
-
positions[address.toLowerCase()].fluid = {
|
|
758
|
-
error: `Error fetching Fluid positions for address ${address}`,
|
|
759
|
-
data: {},
|
|
760
|
-
};
|
|
761
|
-
}
|
|
762
|
-
})),
|
|
763
|
-
]);
|
|
764
|
-
yield Promise.all([
|
|
765
|
-
...aaveV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
766
|
-
try {
|
|
767
|
-
const accData = yield (0, aaveV3_1._getAaveV3AccountData)(client, network, address, Object.assign({ selectedMarket: market }, markets.aaveV3MarketsData[market.value]));
|
|
768
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
769
|
-
positions[address.toLowerCase()].aaveV3[market.value] = { error: '', data: accData };
|
|
770
|
-
}
|
|
771
|
-
catch (error) {
|
|
772
|
-
console.error(`Error fetching AaveV3 account data for address ${address} on market ${market.value}:`, error);
|
|
773
|
-
positions[address.toLowerCase()].aaveV3[market.value] = { error: `Error fetching AaveV3 account data for address ${address} on market ${market.value}`, data: null };
|
|
774
|
-
}
|
|
775
|
-
}))).flat(),
|
|
776
|
-
...aaveV4Spokes.map((spoke) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
777
|
-
try {
|
|
778
|
-
const accData = yield (0, aaveV4_1._getAaveV4AccountData)(client, network, markets.aaveV4SpokesData[spoke.value], address);
|
|
779
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
780
|
-
positions[address.toLowerCase()].aaveV4[spoke.value] = { error: '', data: accData };
|
|
781
|
-
}
|
|
782
|
-
catch (error) {
|
|
783
|
-
console.error(`Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}:`, error);
|
|
784
|
-
positions[address.toLowerCase()].aaveV4[spoke.value] = { error: `Error fetching AaveV4 account data for address ${address} on spoke ${spoke.value}`, data: null };
|
|
785
|
-
}
|
|
786
|
-
}))).flat(),
|
|
787
|
-
...morphoMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
788
|
-
try {
|
|
789
|
-
const accData = yield (0, morphoBlue_1._getMorphoBlueAccountData)(client, network, address, market, markets.morphoMarketsData[market.value]);
|
|
790
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
791
|
-
positions[address.toLowerCase()].morphoBlue[market.value] = { error: '', data: accData };
|
|
792
|
-
}
|
|
793
|
-
catch (error) {
|
|
794
|
-
console.error(`Error fetching MorphoBlue account data for address ${address} on market ${market.value}:`, error);
|
|
795
|
-
positions[address.toLowerCase()].morphoBlue[market.value] = { error: `Error fetching MorphoBlue account data for address ${address} on market ${market.value}`, data: null };
|
|
796
|
-
}
|
|
797
|
-
}))).flat(),
|
|
798
|
-
...morphoMidnightMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
799
|
-
try {
|
|
800
|
-
const accData = yield (0, morphoMidnight_1._getMorphoMidnightAccountData)(client, network, address, market, markets.morphoMidnightMarketsData[market.value]);
|
|
801
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
802
|
-
positions[address.toLowerCase()].morphoMidnight[market.value] = { error: '', data: accData };
|
|
803
|
-
}
|
|
804
|
-
catch (error) {
|
|
805
|
-
console.error(`Error fetching MorphoMidnight account data for address ${address} on market ${market.value}:`, error);
|
|
806
|
-
positions[address.toLowerCase()].morphoMidnight[market.value] = { error: `Error fetching MorphoMidnight account data for address ${address} on market ${market.value}`, data: null };
|
|
807
|
-
}
|
|
808
|
-
}))).flat(),
|
|
809
|
-
...compoundV3Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
810
|
-
try {
|
|
811
|
-
const accData = yield (0, compoundV3_1._getCompoundV3AccountData)(client, network, address, constants_1.ZERO_ADDRESS, { selectedMarket: market, assetsData: markets.compoundV3MarketsData[market.value].assetsData });
|
|
812
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
813
|
-
positions[address.toLowerCase()].compoundV3[market.value] = { error: '', data: accData };
|
|
814
|
-
}
|
|
815
|
-
catch (error) {
|
|
816
|
-
console.error(`Error fetching CompoundV3 account data for address ${address} on market ${market.value}:`, error);
|
|
817
|
-
positions[address.toLowerCase()].compoundV3[market.value] = { error: `Error fetching CompoundV3 account data for address ${address} on market ${market.value}`, data: null };
|
|
818
|
-
}
|
|
819
|
-
}))).flat(),
|
|
820
|
-
...sparkMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
821
|
-
try {
|
|
822
|
-
const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: markets.sparkMarketsData[market.value].assetsData, eModeCategoriesData: markets.sparkMarketsData[market.value].eModeCategoriesData });
|
|
823
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
824
|
-
positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
|
|
825
|
-
}
|
|
826
|
-
catch (error) {
|
|
827
|
-
console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);
|
|
828
|
-
positions[address.toLowerCase()].spark[market.value] = { error: `Error fetching Spark account data for address ${address} on market ${market.value}`, data: null };
|
|
829
|
-
}
|
|
830
|
-
}))).flat(),
|
|
831
|
-
...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
832
|
-
var _a;
|
|
833
|
-
return (_a = makerCdps[address.toLowerCase()]) === null || _a === void 0 ? void 0 : _a.map((cdpInfo) => __awaiter(this, void 0, void 0, function* () {
|
|
834
|
-
try {
|
|
835
|
-
// reuse ilk data fetched for the markets payload; ilks outside the active set are fetched on demand
|
|
836
|
-
const cdpData = yield (0, maker_1._getMakerCdpData)(client, network, cdpInfo, markets.makerMarketsData[cdpInfo.ilkLabel]);
|
|
837
|
-
if (cdpData) {
|
|
838
|
-
positions[address.toLowerCase()].maker[cdpInfo.id] = { error: '', data: cdpData };
|
|
839
|
-
}
|
|
840
|
-
}
|
|
841
|
-
catch (error) {
|
|
842
|
-
console.error(`Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}:`, error);
|
|
843
|
-
positions[address.toLowerCase()].maker[cdpInfo.id] = { error: `Error fetching Maker CDP data for address ${address} with ID ${cdpInfo.id}`, data: null };
|
|
844
|
-
}
|
|
845
|
-
}));
|
|
846
|
-
})).flat(),
|
|
847
|
-
...aaveV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
848
|
-
try {
|
|
849
|
-
const accData = yield (0, aaveV2_1._getAaveV2AccountData)(client, network, address, markets.aaveV2MarketsData[market.value].assetsData, market);
|
|
850
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
851
|
-
positions[address.toLowerCase()].aaveV2[market.value] = { error: '', data: accData };
|
|
852
|
-
}
|
|
853
|
-
catch (error) {
|
|
854
|
-
console.error(`Error fetching AaveV2 account data for address ${address}:`, error);
|
|
855
|
-
positions[address.toLowerCase()].aaveV2[market.value] = { error: `Error fetching AaveV2 account data for address ${address}`, data: null };
|
|
856
|
-
}
|
|
857
|
-
}))).flat(),
|
|
858
|
-
...compoundV2Markets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
859
|
-
try {
|
|
860
|
-
const accData = yield (0, compoundV2_1._getCompoundV2AccountData)(client, network, address, markets.compoundV2MarketsData[market.value].assetsData);
|
|
861
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
|
|
862
|
-
positions[address.toLowerCase()].compoundV2[market.value] = { error: '', data: accData };
|
|
863
|
-
}
|
|
864
|
-
catch (error) {
|
|
865
|
-
console.error(`Error fetching CompoundV2 account data for address ${address}:`, error);
|
|
866
|
-
positions[address.toLowerCase()].compoundV2[market.value] = { error: `Error fetching CompoundV2 account data for address ${address}`, data: null };
|
|
867
|
-
}
|
|
868
|
-
}))).flat(),
|
|
869
|
-
...addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
870
|
-
try {
|
|
871
|
-
if (!isMainnet)
|
|
872
|
-
return; // Liquity trove info is only available on mainnet
|
|
873
|
-
const troveInfo = yield (0, liquity_1._getLiquityTroveInfo)(client, network, address);
|
|
874
|
-
if (new decimal_js_1.default(troveInfo.collateral).gt(0))
|
|
875
|
-
positions[address.toLowerCase()].liquity = { error: '', data: troveInfo };
|
|
876
|
-
}
|
|
877
|
-
catch (error) {
|
|
878
|
-
console.error(`Error fetching Liquity trove info for address ${address}:`, error);
|
|
879
|
-
positions[address.toLowerCase()].liquity = { error: `Error fetching Liquity trove info for address ${address}`, data: null };
|
|
880
|
-
}
|
|
881
|
-
})),
|
|
882
|
-
...crvUsdMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
883
|
-
try {
|
|
884
|
-
const accData = yield (0, curveUsd_1._getCurveUsdUserData)(client, network, address, market, markets.crvUsdMarketsData[market.value].activeBand);
|
|
885
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
|
|
886
|
-
positions[address.toLowerCase()].crvUsd[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.crvUsdMarketsData[market.value].borrowRate }) };
|
|
887
|
-
}
|
|
888
|
-
}
|
|
889
|
-
catch (error) {
|
|
890
|
-
console.error(`Error fetching Curve USD account data for address ${address} on market ${market.value}:`, error);
|
|
891
|
-
positions[address.toLowerCase()].crvUsd[market.value] = { error: `Error fetching Curve USD account data for address ${address} on market ${market.value}`, data: null };
|
|
892
|
-
}
|
|
893
|
-
}))).flat(),
|
|
894
|
-
...llamaLendMarkets.map((market) => addresses.map((address) => __awaiter(this, void 0, void 0, function* () {
|
|
895
|
-
try {
|
|
896
|
-
const accData = yield (0, llamaLend_1._getLlamaLendUserData)(client, network, address, market, markets.llamaLendMarketsData[market.value]);
|
|
897
|
-
if (new decimal_js_1.default(accData.suppliedUsd).gt(0) || new decimal_js_1.default(accData.borrowedUsd).gt(0)) {
|
|
898
|
-
positions[address.toLowerCase()].llamaLend[market.value] = { error: '', data: Object.assign(Object.assign({}, accData), { borrowRate: markets.llamaLendMarketsData[market.value].borrowRate }) };
|
|
899
|
-
}
|
|
900
|
-
}
|
|
901
|
-
catch (error) {
|
|
902
|
-
console.error(`Error fetching LlamaLend account data for address ${address} on market ${market.value}:`, error);
|
|
903
|
-
positions[address.toLowerCase()].llamaLend[market.value] = { error: `Error fetching LlamaLend account data for address ${address} on market ${market.value}`, data: null };
|
|
904
|
-
}
|
|
905
|
-
}))).flat(),
|
|
906
|
-
]);
|
|
907
|
-
return {
|
|
908
|
-
positions,
|
|
909
|
-
markets,
|
|
910
|
-
};
|
|
911
|
-
});
|
|
912
|
-
}
|
|
913
626
|
__exportStar(require("./discovery"), exports);
|
package/cjs/types/portfolio.d.ts
CHANGED
|
@@ -1,16 +1,15 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { AaveV4AccountData,
|
|
1
|
+
import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
|
|
2
|
+
import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
|
|
3
3
|
import { EthAddress } from './common';
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
4
|
+
import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
|
|
5
|
+
import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
|
|
6
|
+
import { FluidVaultData } from './fluid';
|
|
7
7
|
import { LiquityTroveInfo } from './liquity';
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
|
|
8
|
+
import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
|
|
9
|
+
import { CdpData } from './maker';
|
|
10
|
+
import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
|
|
11
|
+
import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
|
|
12
|
+
import { SparkPositionData, SparkVersions } from './spark';
|
|
14
13
|
export interface PortfolioProtocolData<T> {
|
|
15
14
|
error: string;
|
|
16
15
|
data: T | null;
|
|
@@ -60,18 +59,3 @@ export interface PortfolioPositionsDataForAddress {
|
|
|
60
59
|
export interface PortfolioPositionsData {
|
|
61
60
|
[key: EthAddress]: PortfolioPositionsDataForAddress;
|
|
62
61
|
}
|
|
63
|
-
export interface PortfolioMarketsData {
|
|
64
|
-
morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
|
|
65
|
-
morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
|
|
66
|
-
compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
|
|
67
|
-
sparkMarketsData: Record<string, SparkMarketsData>;
|
|
68
|
-
aaveV3MarketsData: Record<string, AaveV3MarketData>;
|
|
69
|
-
aaveV2MarketsData: Record<string, AaveV2MarketData>;
|
|
70
|
-
compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
|
|
71
|
-
crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
|
|
72
|
-
llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
|
|
73
|
-
liquityV2MarketsData: Record<string, LiquityV2MarketData>;
|
|
74
|
-
aaveV4SpokesData: Record<string, AaveV4SpokeData>;
|
|
75
|
-
fluidMarketsData: Record<string, FluidMarketData>;
|
|
76
|
-
makerMarketsData: Record<string, IlkInfo>;
|
|
77
|
-
}
|
package/esm/fluid/index.d.ts
CHANGED
|
@@ -221,5 +221,3 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
|
|
|
221
221
|
nftId: string;
|
|
222
222
|
} | undefined;
|
|
223
223
|
}[]>;
|
|
224
|
-
export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
|
|
225
|
-
export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
|
package/esm/fluid/index.js
CHANGED
|
@@ -1381,36 +1381,3 @@ export const _getUserPositionsPortfolio = (provider, network, user) => __awaiter
|
|
|
1381
1381
|
userData: userData[i],
|
|
1382
1382
|
})).filter(md => md.marketData !== undefined);
|
|
1383
1383
|
});
|
|
1384
|
-
export const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
|
|
1385
|
-
const versions = getFluidVersionsDataForNetwork(network);
|
|
1386
|
-
if (versions.length === 0)
|
|
1387
|
-
return {};
|
|
1388
|
-
const view = FluidViewContractViem(provider, network);
|
|
1389
|
-
const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
|
|
1390
|
-
const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
|
|
1391
|
-
const vaultTokens = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
|
|
1392
|
-
if (vaultData.supplyToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.supplyToken1))
|
|
1393
|
-
vaultTokens.push(getAssetInfoByAddress(vaultData.supplyToken1, network).symbol);
|
|
1394
|
-
if (vaultData.borrowToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.borrowToken1))
|
|
1395
|
-
vaultTokens.push(getAssetInfoByAddress(vaultData.borrowToken1, network).symbol);
|
|
1396
|
-
return vaultTokens;
|
|
1397
|
-
}).flat()));
|
|
1398
|
-
// ETH and WBTC needed for other tokens prices
|
|
1399
|
-
if (!tokens.includes('ETH'))
|
|
1400
|
-
tokens.push('ETH');
|
|
1401
|
-
if (!tokens.includes('WBTC'))
|
|
1402
|
-
tokens.push('WBTC');
|
|
1403
|
-
const [tokenPrices, merklCampaigns] = yield Promise.all([
|
|
1404
|
-
getTokensPricesForPortfolio(tokens, provider, network),
|
|
1405
|
-
getFluidMerklCampaigns(network),
|
|
1406
|
-
]);
|
|
1407
|
-
const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
|
|
1408
|
-
const marketsData = {};
|
|
1409
|
-
parsedMarketsData.forEach((marketData, i) => {
|
|
1410
|
-
if (!marketData)
|
|
1411
|
-
return;
|
|
1412
|
-
marketsData[versions[i].value] = attachFluidMerklIncentives(marketData, merklCampaigns);
|
|
1413
|
-
});
|
|
1414
|
-
return marketsData;
|
|
1415
|
-
});
|
|
1416
|
-
export const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network); });
|
package/esm/maker/index.d.ts
CHANGED
|
@@ -1,14 +1,9 @@
|
|
|
1
1
|
import { Client, PublicClient } from 'viem';
|
|
2
2
|
import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
|
|
3
|
-
import { CdpData, CdpInfo
|
|
3
|
+
import { CdpData, CdpInfo } from '../types';
|
|
4
4
|
export declare const _getMakerAccountBalances: (provider: PublicClient, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
|
|
5
5
|
export declare const getMakerAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
|
|
6
6
|
export declare const _getUserCdps: (provider: Client, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
|
|
7
7
|
export declare const getUserCdps: (provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
|
|
8
|
-
export declare const
|
|
9
|
-
export declare const getMakerIlksData: (provider: EthereumProvider, network: NetworkNumber, ilkLabels: string[]) => Promise<Record<string, IlkInfo>>;
|
|
10
|
-
/**
|
|
11
|
-
* @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
|
|
12
|
-
*/
|
|
13
|
-
export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo, ilkInfo?: IlkInfo) => Promise<CdpData>;
|
|
8
|
+
export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo) => Promise<CdpData>;
|
|
14
9
|
export declare const getMakerCdpData: (provider: EthereumProvider, network: NetworkNumber, cdp: CdpInfo) => Promise<CdpData>;
|