@defisaver/positions-sdk 2.1.44-aave-v1-dev → 2.1.45-dev-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/aaveV3/index.d.ts +1 -1
- package/cjs/compoundV2/index.js +1 -1
- package/cjs/markets/aave/marketAssets.js +1 -1
- package/cjs/portfolio/index.d.ts +1 -1
- package/cjs/portfolio/index.js +9 -17
- package/cjs/services/viem.d.ts +20 -8
- package/cjs/services/viem.js +13 -0
- package/esm/aaveV3/index.d.ts +1 -1
- package/esm/compoundV2/index.js +1 -1
- package/esm/markets/aave/marketAssets.js +1 -1
- package/esm/portfolio/index.d.ts +1 -1
- package/esm/portfolio/index.js +9 -17
- package/esm/services/viem.d.ts +20 -8
- package/esm/services/viem.js +13 -1
- package/package.json +2 -2
- package/src/aaveV3/index.ts +1 -1
- package/src/compoundV2/index.ts +1 -1
- package/src/markets/aave/marketAssets.ts +1 -1
- package/src/portfolio/index.ts +8 -17
- package/src/services/viem.ts +24 -2
package/cjs/aaveV3/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Client } from 'viem';
|
|
2
|
-
import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types
|
|
2
|
+
import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types';
|
|
3
3
|
import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
|
|
4
4
|
import { getMeritCampaigns } from './merit';
|
|
5
5
|
import { getMerkleCampaigns } from './merkl';
|
package/cjs/compoundV2/index.js
CHANGED
|
@@ -66,7 +66,7 @@ const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0, void
|
|
|
66
66
|
utilization: new decimal_js_1.default(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),
|
|
67
67
|
totalSupply: (0, tokens_1.assetAmountInEth)(totalSupply, (0, utils_1.handleWbtcLegacy)(symbol)),
|
|
68
68
|
totalBorrow: (0, tokens_1.assetAmountInEth)(totalBorrow, (0, utils_1.handleWbtcLegacy)(symbol)),
|
|
69
|
-
exchangeRate: new decimal_js_1.default(market.exchangeRate.toString()).div(1e28).toString(),
|
|
69
|
+
exchangeRate: new decimal_js_1.default(market.exchangeRate.toString()).div(1e28).mul(Math.pow(10, pricePrecisionDiff)).toString(),
|
|
70
70
|
borrowCap: (0, tokens_1.assetAmountInEth)(borrowCap, (0, utils_1.handleWbtcLegacy)(symbol)),
|
|
71
71
|
canBeBorrowed: market.canBorrow,
|
|
72
72
|
canBeSupplied: market.canMint,
|
|
@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
|
|
|
10
10
|
exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
|
|
11
11
|
exports.aaveV3AssetsDefaultMarketEth = [
|
|
12
12
|
'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
|
|
13
|
-
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT',
|
|
13
|
+
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT', 'USDG',
|
|
14
14
|
];
|
|
15
15
|
exports.aaveV3AssetsDefaultMarketOpt = [
|
|
16
16
|
'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
|
package/cjs/portfolio/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
|
|
2
2
|
import { PortfolioPositionsData } from '../types';
|
|
3
|
-
export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[],
|
|
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;
|
package/cjs/portfolio/index.js
CHANGED
|
@@ -40,8 +40,8 @@ const spark_2 = require("../claiming/spark");
|
|
|
40
40
|
const morphoBlue_2 = require("../claiming/morphoBlue");
|
|
41
41
|
const king_1 = require("../claiming/king");
|
|
42
42
|
const ethena_1 = require("../claiming/ethena");
|
|
43
|
-
function getPortfolioData(
|
|
44
|
-
return __awaiter(this,
|
|
43
|
+
function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
|
|
44
|
+
return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
|
|
45
45
|
const isMainnet = network === common_1.NetworkNumber.Eth;
|
|
46
46
|
const isFluidSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network);
|
|
47
47
|
const isMorphoRewardsSupported = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Base].includes(network);
|
|
@@ -56,20 +56,12 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
|
|
|
56
56
|
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)) : [];
|
|
57
57
|
const liquityV2Markets = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)) : [];
|
|
58
58
|
const liquityV2MarketsStaking = [common_1.NetworkNumber.Eth].includes(network) ? Object.values((0, markets_1.LiquityV2Markets)(network)).filter(market => !market.isLegacy) : [];
|
|
59
|
-
const
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
});
|
|
66
|
-
const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, network, {
|
|
67
|
-
batch: {
|
|
68
|
-
multicall: {
|
|
69
|
-
batchSize: 2500000,
|
|
70
|
-
},
|
|
71
|
-
},
|
|
72
|
-
});
|
|
59
|
+
const args = [network];
|
|
60
|
+
if (!isSim) {
|
|
61
|
+
args.push({ batch: { multicall: { batchSize: 2500000 } } });
|
|
62
|
+
}
|
|
63
|
+
const client = (0, viem_1.getViemProvider)(provider, ...args);
|
|
64
|
+
const defaultClient = (0, viem_1.getViemProvider)(defaultProvider, ...args);
|
|
73
65
|
const morphoMarketsData = {};
|
|
74
66
|
const compoundV3MarketsData = {};
|
|
75
67
|
const sparkMarketsData = {};
|
|
@@ -96,7 +88,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
|
|
|
96
88
|
const positions = {};
|
|
97
89
|
const stakingPositions = {};
|
|
98
90
|
const rewardsData = {};
|
|
99
|
-
const allAddresses = [...addresses
|
|
91
|
+
const allAddresses = [...addresses];
|
|
100
92
|
for (const address of allAddresses) {
|
|
101
93
|
positions[address.toLowerCase()] = {
|
|
102
94
|
aaveV3: {},
|
package/cjs/services/viem.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Abi } from 'viem';
|
|
1
2
|
import { Blockish, EthereumProvider, NetworkNumber } from '../types/common';
|
|
2
3
|
export declare const getViemChain: (network: NetworkNumber) => {
|
|
3
4
|
blockExplorers: {
|
|
@@ -791,10 +792,10 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
791
792
|
gasUsed: bigint;
|
|
792
793
|
}>;
|
|
793
794
|
createBlockFilter: () => Promise<import("viem").CreateBlockFilterReturnType>;
|
|
794
|
-
createContractEventFilter: <const abi extends
|
|
795
|
+
createContractEventFilter: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi> | undefined, args extends import("viem").MaybeExtractEventArgsFromAbi<abi, eventName> | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").CreateContractEventFilterParameters<abi, eventName, args, strict, fromBlock, toBlock>) => Promise<import("viem").CreateContractEventFilterReturnType<abi, eventName, args, strict, fromBlock, toBlock>>;
|
|
795
796
|
createEventFilter: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, _EventName extends string | undefined = import("viem").MaybeAbiEventName<abiEvent>, _Args extends import("viem").MaybeExtractEventArgsFromAbi<abiEvents, _EventName> | undefined = undefined>(args?: import("viem").CreateEventFilterParameters<abiEvent, abiEvents, strict, fromBlock, toBlock, _EventName, _Args> | undefined) => Promise<import("viem").CreateEventFilterReturnType<abiEvent, abiEvents, strict, fromBlock, toBlock, _EventName, _Args>>;
|
|
796
797
|
createPendingTransactionFilter: () => Promise<import("viem").CreatePendingTransactionFilterReturnType>;
|
|
797
|
-
estimateContractGas: <chain extends import("viem").Chain | undefined, const abi extends
|
|
798
|
+
estimateContractGas: <chain extends import("viem").Chain | undefined, const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi, "nonpayable" | "payable", functionName>>(args: import("viem").EstimateContractGasParameters<abi, functionName, args, chain>) => Promise<import("viem").EstimateContractGasReturnType>;
|
|
798
799
|
estimateGas: (args: import("viem").EstimateGasParameters<undefined>) => Promise<import("viem").EstimateGasReturnType>;
|
|
799
800
|
getBalance: (args: import("viem").GetBalanceParameters) => Promise<import("viem").GetBalanceReturnType>;
|
|
800
801
|
getBlobBaseFee: () => Promise<import("viem").GetBlobBaseFeeReturnType>;
|
|
@@ -957,7 +958,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
957
958
|
getBytecode: (args: import("viem").GetBytecodeParameters) => Promise<import("viem").GetBytecodeReturnType>;
|
|
958
959
|
getChainId: () => Promise<import("viem").GetChainIdReturnType>;
|
|
959
960
|
getCode: (args: import("viem").GetBytecodeParameters) => Promise<import("viem").GetBytecodeReturnType>;
|
|
960
|
-
getContractEvents: <const abi extends
|
|
961
|
+
getContractEvents: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi> | undefined = undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetContractEventsParameters<abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetContractEventsReturnType<abi, eventName, strict, fromBlock, toBlock>>;
|
|
961
962
|
getEip712Domain: (args: import("viem").GetEip712DomainParameters) => Promise<import("viem").GetEip712DomainReturnType>;
|
|
962
963
|
getEnsAddress: (args: import("viem").GetEnsAddressParameters) => Promise<import("viem").GetEnsAddressReturnType>;
|
|
963
964
|
getEnsAvatar: (args: import("viem").GetEnsAvatarParameters) => Promise<import("viem").GetEnsAvatarReturnType>;
|
|
@@ -966,8 +967,8 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
966
967
|
getEnsText: (args: import("viem").GetEnsTextParameters) => Promise<import("viem").GetEnsTextReturnType>;
|
|
967
968
|
getFeeHistory: (args: import("viem").GetFeeHistoryParameters) => Promise<import("viem").GetFeeHistoryReturnType>;
|
|
968
969
|
estimateFeesPerGas: <chainOverride extends import("viem").Chain | undefined = undefined, type extends import("viem").FeeValuesType = "eip1559">(args?: import("viem").EstimateFeesPerGasParameters<undefined, chainOverride, type> | undefined) => Promise<import("viem").EstimateFeesPerGasReturnType<type>>;
|
|
969
|
-
getFilterChanges: <filterType extends import("viem").FilterType, const abi extends
|
|
970
|
-
getFilterLogs: <const abi extends
|
|
970
|
+
getFilterChanges: <filterType extends import("viem").FilterType, const abi extends Abi | readonly unknown[] | undefined, eventName extends string | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetFilterChangesParameters<filterType, abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetFilterChangesReturnType<filterType, abi, eventName, strict, fromBlock, toBlock>>;
|
|
971
|
+
getFilterLogs: <const abi extends Abi | readonly unknown[] | undefined, eventName extends string | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetFilterLogsParameters<abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetFilterLogsReturnType<abi, eventName, strict, fromBlock, toBlock>>;
|
|
971
972
|
getGasPrice: () => Promise<import("viem").GetGasPriceReturnType>;
|
|
972
973
|
getLogs: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args?: import("viem").GetLogsParameters<abiEvent, abiEvents, strict, fromBlock, toBlock> | undefined) => Promise<import("viem").GetLogsReturnType<abiEvent, abiEvents, strict, fromBlock, toBlock>>;
|
|
973
974
|
getProof: (args: import("viem").GetProofParameters) => Promise<import("viem").GetProofReturnType>;
|
|
@@ -4358,12 +4359,12 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
4358
4359
|
} ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
|
|
4359
4360
|
chainId?: number | undefined;
|
|
4360
4361
|
}, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
|
|
4361
|
-
readContract: <const abi extends
|
|
4362
|
+
readContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "pure" | "view">, const args extends import("viem").ContractFunctionArgs<abi, "pure" | "view", functionName>>(args: import("viem").ReadContractParameters<abi, functionName, args>) => Promise<import("viem").ReadContractReturnType<abi, functionName, args>>;
|
|
4362
4363
|
sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<import("viem").SendRawTransactionReturnType>;
|
|
4363
4364
|
simulate: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;
|
|
4364
4365
|
simulateBlocks: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;
|
|
4365
4366
|
simulateCalls: <const calls extends readonly unknown[]>(args: import("viem").SimulateCallsParameters<calls>) => Promise<import("viem").SimulateCallsReturnType<calls>>;
|
|
4366
|
-
simulateContract: <const abi extends
|
|
4367
|
+
simulateContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "nonpayable" | "payable">, const args_1 extends import("viem").ContractFunctionArgs<abi, "nonpayable" | "payable", functionName>, chainOverride extends import("viem").Chain | undefined, accountOverride extends import("viem").Account | import("viem").Address | undefined = undefined>(args: import("viem").SimulateContractParameters<abi, functionName, args_1, undefined, chainOverride, accountOverride>) => Promise<import("viem").SimulateContractReturnType<abi, functionName, args_1, undefined, import("viem").Account | undefined, chainOverride, accountOverride>>;
|
|
4367
4368
|
verifyHash: (args: import("viem").VerifyHashActionParameters) => Promise<import("viem").VerifyHashActionReturnType>;
|
|
4368
4369
|
verifyMessage: (args: import("viem").VerifyMessageActionParameters) => Promise<import("viem").VerifyMessageActionReturnType>;
|
|
4369
4370
|
verifySiweMessage: (args: {
|
|
@@ -4382,7 +4383,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
4382
4383
|
waitForTransactionReceipt: (args: import("viem").WaitForTransactionReceiptParameters<undefined>) => Promise<import("viem").TransactionReceipt>;
|
|
4383
4384
|
watchBlockNumber: (args: import("viem").WatchBlockNumberParameters) => import("viem").WatchBlockNumberReturnType;
|
|
4384
4385
|
watchBlocks: <includeTransactions extends boolean = false, blockTag extends import("viem").BlockTag = "latest">(args: import("viem").WatchBlocksParameters<import("viem").Transport, undefined, includeTransactions, blockTag>) => import("viem").WatchBlocksReturnType;
|
|
4385
|
-
watchContractEvent: <const abi extends
|
|
4386
|
+
watchContractEvent: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi>, strict extends boolean | undefined = undefined>(args: import("viem").WatchContractEventParameters<abi, eventName, strict, import("viem").Transport>) => import("viem").WatchContractEventReturnType;
|
|
4386
4387
|
watchEvent: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined>(args: import("viem").WatchEventParameters<abiEvent, abiEvents, strict, import("viem").Transport>) => import("viem").WatchEventReturnType;
|
|
4387
4388
|
watchPendingTransactions: (args: import("viem").WatchPendingTransactionsParameters<import("viem").Transport>) => import("viem").WatchPendingTransactionsReturnType;
|
|
4388
4389
|
extend: <const client extends {
|
|
@@ -4407,3 +4408,14 @@ export declare const setViemBlockNumber: (block: Blockish) => {
|
|
|
4407
4408
|
} | {
|
|
4408
4409
|
blockNumber: bigint;
|
|
4409
4410
|
};
|
|
4411
|
+
/**
|
|
4412
|
+
* Utility function to return callData
|
|
4413
|
+
* Useful for Tenderly simulation
|
|
4414
|
+
*
|
|
4415
|
+
* @param contract
|
|
4416
|
+
* @param functionName
|
|
4417
|
+
* @param args
|
|
4418
|
+
*/
|
|
4419
|
+
export declare function encodeCalldata(contract: {
|
|
4420
|
+
abi: Abi;
|
|
4421
|
+
}, functionName: string, args?: readonly unknown[]): `0x${string}`;
|
package/cjs/services/viem.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.setViemBlockNumber = exports.getViemProvider = exports.getViemChain = void 0;
|
|
4
|
+
exports.encodeCalldata = encodeCalldata;
|
|
4
5
|
const viem_1 = require("viem");
|
|
5
6
|
const chains_1 = require("viem/chains");
|
|
6
7
|
const common_1 = require("../types/common");
|
|
@@ -31,3 +32,15 @@ const setViemBlockNumber = (block) => {
|
|
|
31
32
|
return { blockNumber: BigInt(block) };
|
|
32
33
|
};
|
|
33
34
|
exports.setViemBlockNumber = setViemBlockNumber;
|
|
35
|
+
/**
|
|
36
|
+
* Utility function to return callData
|
|
37
|
+
* Useful for Tenderly simulation
|
|
38
|
+
*
|
|
39
|
+
* @param contract
|
|
40
|
+
* @param functionName
|
|
41
|
+
* @param args
|
|
42
|
+
*/
|
|
43
|
+
function encodeCalldata(contract, functionName, args) {
|
|
44
|
+
const callDescriptor = { abi: contract.abi, functionName };
|
|
45
|
+
return (0, viem_1.encodeFunctionData)((args ? Object.assign(Object.assign({}, callDescriptor), { args }) : callDescriptor));
|
|
46
|
+
}
|
package/esm/aaveV3/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Client } from 'viem';
|
|
2
|
-
import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types
|
|
2
|
+
import { AaveMarketInfo, AaveV3MarketData, AaveV3PositionData, AaveV3UsedAssets, EModeCategoryDataMapping } from '../types';
|
|
3
3
|
import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
|
|
4
4
|
import { getMeritCampaigns } from './merit';
|
|
5
5
|
import { getMerkleCampaigns } from './merkl';
|
package/esm/compoundV2/index.js
CHANGED
|
@@ -60,7 +60,7 @@ export const _getCompoundV2MarketsData = (provider, network) => __awaiter(void 0
|
|
|
60
60
|
utilization: new Dec(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),
|
|
61
61
|
totalSupply: assetAmountInEth(totalSupply, handleWbtcLegacy(symbol)),
|
|
62
62
|
totalBorrow: assetAmountInEth(totalBorrow, handleWbtcLegacy(symbol)),
|
|
63
|
-
exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).toString(),
|
|
63
|
+
exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).mul(Math.pow(10, pricePrecisionDiff)).toString(),
|
|
64
64
|
borrowCap: assetAmountInEth(borrowCap, handleWbtcLegacy(symbol)),
|
|
65
65
|
canBeBorrowed: market.canBorrow,
|
|
66
66
|
canBeSupplied: market.canMint,
|
|
@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
|
|
|
7
7
|
export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
|
|
8
8
|
export const aaveV3AssetsDefaultMarketEth = [
|
|
9
9
|
'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
|
|
10
|
-
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT',
|
|
10
|
+
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT', 'USDG',
|
|
11
11
|
];
|
|
12
12
|
export const aaveV3AssetsDefaultMarketOpt = [
|
|
13
13
|
'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
|
package/esm/portfolio/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
|
|
2
2
|
import { PortfolioPositionsData } from '../types';
|
|
3
|
-
export declare function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[],
|
|
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;
|
package/esm/portfolio/index.js
CHANGED
|
@@ -34,8 +34,8 @@ 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
|
-
export function getPortfolioData(
|
|
38
|
-
return __awaiter(this,
|
|
37
|
+
export function getPortfolioData(provider_1, network_1, defaultProvider_1, addresses_1) {
|
|
38
|
+
return __awaiter(this, arguments, void 0, function* (provider, network, defaultProvider, addresses, isSim = false) {
|
|
39
39
|
const isMainnet = network === NetworkNumber.Eth;
|
|
40
40
|
const isFluidSupported = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Base, NetworkNumber.Plasma].includes(network);
|
|
41
41
|
const isMorphoRewardsSupported = [NetworkNumber.Eth, NetworkNumber.Base].includes(network);
|
|
@@ -50,20 +50,12 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
|
|
|
50
50
|
const llamaLendMarkets = [NetworkNumber.Eth, NetworkNumber.Arb].includes(network) ? Object.values(LlamaLendMarkets(network)).filter((market) => market.chainIds.includes(network)) : [];
|
|
51
51
|
const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
|
|
52
52
|
const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
});
|
|
60
|
-
const defaultClient = getViemProvider(defaultProvider, network, {
|
|
61
|
-
batch: {
|
|
62
|
-
multicall: {
|
|
63
|
-
batchSize: 2500000,
|
|
64
|
-
},
|
|
65
|
-
},
|
|
66
|
-
});
|
|
53
|
+
const args = [network];
|
|
54
|
+
if (!isSim) {
|
|
55
|
+
args.push({ batch: { multicall: { batchSize: 2500000 } } });
|
|
56
|
+
}
|
|
57
|
+
const client = getViemProvider(provider, ...args);
|
|
58
|
+
const defaultClient = getViemProvider(defaultProvider, ...args);
|
|
67
59
|
const morphoMarketsData = {};
|
|
68
60
|
const compoundV3MarketsData = {};
|
|
69
61
|
const sparkMarketsData = {};
|
|
@@ -90,7 +82,7 @@ export function getPortfolioData(provider, network, defaultProvider, addresses,
|
|
|
90
82
|
const positions = {};
|
|
91
83
|
const stakingPositions = {};
|
|
92
84
|
const rewardsData = {};
|
|
93
|
-
const allAddresses = [...addresses
|
|
85
|
+
const allAddresses = [...addresses];
|
|
94
86
|
for (const address of allAddresses) {
|
|
95
87
|
positions[address.toLowerCase()] = {
|
|
96
88
|
aaveV3: {},
|
package/esm/services/viem.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type Abi } from 'viem';
|
|
1
2
|
import { Blockish, EthereumProvider, NetworkNumber } from '../types/common';
|
|
2
3
|
export declare const getViemChain: (network: NetworkNumber) => {
|
|
3
4
|
blockExplorers: {
|
|
@@ -791,10 +792,10 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
791
792
|
gasUsed: bigint;
|
|
792
793
|
}>;
|
|
793
794
|
createBlockFilter: () => Promise<import("viem").CreateBlockFilterReturnType>;
|
|
794
|
-
createContractEventFilter: <const abi extends
|
|
795
|
+
createContractEventFilter: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi> | undefined, args extends import("viem").MaybeExtractEventArgsFromAbi<abi, eventName> | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").CreateContractEventFilterParameters<abi, eventName, args, strict, fromBlock, toBlock>) => Promise<import("viem").CreateContractEventFilterReturnType<abi, eventName, args, strict, fromBlock, toBlock>>;
|
|
795
796
|
createEventFilter: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, _EventName extends string | undefined = import("viem").MaybeAbiEventName<abiEvent>, _Args extends import("viem").MaybeExtractEventArgsFromAbi<abiEvents, _EventName> | undefined = undefined>(args?: import("viem").CreateEventFilterParameters<abiEvent, abiEvents, strict, fromBlock, toBlock, _EventName, _Args> | undefined) => Promise<import("viem").CreateEventFilterReturnType<abiEvent, abiEvents, strict, fromBlock, toBlock, _EventName, _Args>>;
|
|
796
797
|
createPendingTransactionFilter: () => Promise<import("viem").CreatePendingTransactionFilterReturnType>;
|
|
797
|
-
estimateContractGas: <chain extends import("viem").Chain | undefined, const abi extends
|
|
798
|
+
estimateContractGas: <chain extends import("viem").Chain | undefined, const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "nonpayable" | "payable">, args extends import("viem").ContractFunctionArgs<abi, "nonpayable" | "payable", functionName>>(args: import("viem").EstimateContractGasParameters<abi, functionName, args, chain>) => Promise<import("viem").EstimateContractGasReturnType>;
|
|
798
799
|
estimateGas: (args: import("viem").EstimateGasParameters<undefined>) => Promise<import("viem").EstimateGasReturnType>;
|
|
799
800
|
getBalance: (args: import("viem").GetBalanceParameters) => Promise<import("viem").GetBalanceReturnType>;
|
|
800
801
|
getBlobBaseFee: () => Promise<import("viem").GetBlobBaseFeeReturnType>;
|
|
@@ -957,7 +958,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
957
958
|
getBytecode: (args: import("viem").GetBytecodeParameters) => Promise<import("viem").GetBytecodeReturnType>;
|
|
958
959
|
getChainId: () => Promise<import("viem").GetChainIdReturnType>;
|
|
959
960
|
getCode: (args: import("viem").GetBytecodeParameters) => Promise<import("viem").GetBytecodeReturnType>;
|
|
960
|
-
getContractEvents: <const abi extends
|
|
961
|
+
getContractEvents: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi> | undefined = undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetContractEventsParameters<abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetContractEventsReturnType<abi, eventName, strict, fromBlock, toBlock>>;
|
|
961
962
|
getEip712Domain: (args: import("viem").GetEip712DomainParameters) => Promise<import("viem").GetEip712DomainReturnType>;
|
|
962
963
|
getEnsAddress: (args: import("viem").GetEnsAddressParameters) => Promise<import("viem").GetEnsAddressReturnType>;
|
|
963
964
|
getEnsAvatar: (args: import("viem").GetEnsAvatarParameters) => Promise<import("viem").GetEnsAvatarReturnType>;
|
|
@@ -966,8 +967,8 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
966
967
|
getEnsText: (args: import("viem").GetEnsTextParameters) => Promise<import("viem").GetEnsTextReturnType>;
|
|
967
968
|
getFeeHistory: (args: import("viem").GetFeeHistoryParameters) => Promise<import("viem").GetFeeHistoryReturnType>;
|
|
968
969
|
estimateFeesPerGas: <chainOverride extends import("viem").Chain | undefined = undefined, type extends import("viem").FeeValuesType = "eip1559">(args?: import("viem").EstimateFeesPerGasParameters<undefined, chainOverride, type> | undefined) => Promise<import("viem").EstimateFeesPerGasReturnType<type>>;
|
|
969
|
-
getFilterChanges: <filterType extends import("viem").FilterType, const abi extends
|
|
970
|
-
getFilterLogs: <const abi extends
|
|
970
|
+
getFilterChanges: <filterType extends import("viem").FilterType, const abi extends Abi | readonly unknown[] | undefined, eventName extends string | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetFilterChangesParameters<filterType, abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetFilterChangesReturnType<filterType, abi, eventName, strict, fromBlock, toBlock>>;
|
|
971
|
+
getFilterLogs: <const abi extends Abi | readonly unknown[] | undefined, eventName extends string | undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args: import("viem").GetFilterLogsParameters<abi, eventName, strict, fromBlock, toBlock>) => Promise<import("viem").GetFilterLogsReturnType<abi, eventName, strict, fromBlock, toBlock>>;
|
|
971
972
|
getGasPrice: () => Promise<import("viem").GetGasPriceReturnType>;
|
|
972
973
|
getLogs: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined, fromBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined, toBlock extends import("viem").BlockNumber | import("viem").BlockTag | undefined = undefined>(args?: import("viem").GetLogsParameters<abiEvent, abiEvents, strict, fromBlock, toBlock> | undefined) => Promise<import("viem").GetLogsReturnType<abiEvent, abiEvents, strict, fromBlock, toBlock>>;
|
|
973
974
|
getProof: (args: import("viem").GetProofParameters) => Promise<import("viem").GetProofReturnType>;
|
|
@@ -4358,12 +4359,12 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
4358
4359
|
} ? "eip7702" : never) | (request["type"] extends string | undefined ? Extract<request["type"], string> : never)>) ? T_12 extends "eip7702" ? import("viem").TransactionRequestEIP7702 : never : never : never)>> & {
|
|
4359
4360
|
chainId?: number | undefined;
|
|
4360
4361
|
}, (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") extends infer T_13 ? T_13 extends (request["parameters"] extends readonly import("viem").PrepareTransactionRequestParameterType[] ? request["parameters"][number] : "nonce" | "type" | "gas" | "blobVersionedHashes" | "fees" | "chainId") ? T_13 extends "fees" ? "gasPrice" | "maxFeePerGas" | "maxPriorityFeePerGas" : T_13 : never : never> & (unknown extends request["kzg"] ? {} : Pick<request, "kzg">) extends infer T ? { [K in keyof T]: T[K]; } : never>;
|
|
4361
|
-
readContract: <const abi extends
|
|
4362
|
+
readContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "pure" | "view">, const args extends import("viem").ContractFunctionArgs<abi, "pure" | "view", functionName>>(args: import("viem").ReadContractParameters<abi, functionName, args>) => Promise<import("viem").ReadContractReturnType<abi, functionName, args>>;
|
|
4362
4363
|
sendRawTransaction: (args: import("viem").SendRawTransactionParameters) => Promise<import("viem").SendRawTransactionReturnType>;
|
|
4363
4364
|
simulate: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;
|
|
4364
4365
|
simulateBlocks: <const calls extends readonly unknown[]>(args: import("viem").SimulateBlocksParameters<calls>) => Promise<import("viem").SimulateBlocksReturnType<calls>>;
|
|
4365
4366
|
simulateCalls: <const calls extends readonly unknown[]>(args: import("viem").SimulateCallsParameters<calls>) => Promise<import("viem").SimulateCallsReturnType<calls>>;
|
|
4366
|
-
simulateContract: <const abi extends
|
|
4367
|
+
simulateContract: <const abi extends Abi | readonly unknown[], functionName extends import("viem").ContractFunctionName<abi, "nonpayable" | "payable">, const args_1 extends import("viem").ContractFunctionArgs<abi, "nonpayable" | "payable", functionName>, chainOverride extends import("viem").Chain | undefined, accountOverride extends import("viem").Account | import("viem").Address | undefined = undefined>(args: import("viem").SimulateContractParameters<abi, functionName, args_1, undefined, chainOverride, accountOverride>) => Promise<import("viem").SimulateContractReturnType<abi, functionName, args_1, undefined, import("viem").Account | undefined, chainOverride, accountOverride>>;
|
|
4367
4368
|
verifyHash: (args: import("viem").VerifyHashActionParameters) => Promise<import("viem").VerifyHashActionReturnType>;
|
|
4368
4369
|
verifyMessage: (args: import("viem").VerifyMessageActionParameters) => Promise<import("viem").VerifyMessageActionReturnType>;
|
|
4369
4370
|
verifySiweMessage: (args: import("viem/_types/actions/siwe/verifySiweMessage").VerifySiweMessageParameters) => Promise<import("viem/_types/actions/siwe/verifySiweMessage").VerifySiweMessageReturnType>;
|
|
@@ -4372,7 +4373,7 @@ export declare const getViemProvider: (provider: EthereumProvider, network: Netw
|
|
|
4372
4373
|
waitForTransactionReceipt: (args: import("viem").WaitForTransactionReceiptParameters<undefined>) => Promise<import("viem").TransactionReceipt>;
|
|
4373
4374
|
watchBlockNumber: (args: import("viem").WatchBlockNumberParameters) => import("viem").WatchBlockNumberReturnType;
|
|
4374
4375
|
watchBlocks: <includeTransactions extends boolean = false, blockTag extends import("viem").BlockTag = "latest">(args: import("viem").WatchBlocksParameters<import("viem").Transport, undefined, includeTransactions, blockTag>) => import("viem").WatchBlocksReturnType;
|
|
4375
|
-
watchContractEvent: <const abi extends
|
|
4376
|
+
watchContractEvent: <const abi extends Abi | readonly unknown[], eventName extends import("viem").ContractEventName<abi>, strict extends boolean | undefined = undefined>(args: import("viem").WatchContractEventParameters<abi, eventName, strict, import("viem").Transport>) => import("viem").WatchContractEventReturnType;
|
|
4376
4377
|
watchEvent: <const abiEvent extends import("viem").AbiEvent | undefined = undefined, const abiEvents extends readonly import("viem").AbiEvent[] | readonly unknown[] | undefined = abiEvent extends import("viem").AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined>(args: import("viem").WatchEventParameters<abiEvent, abiEvents, strict, import("viem").Transport>) => import("viem").WatchEventReturnType;
|
|
4377
4378
|
watchPendingTransactions: (args: import("viem").WatchPendingTransactionsParameters<import("viem").Transport>) => import("viem").WatchPendingTransactionsReturnType;
|
|
4378
4379
|
extend: <const client extends {
|
|
@@ -4397,3 +4398,14 @@ export declare const setViemBlockNumber: (block: Blockish) => {
|
|
|
4397
4398
|
} | {
|
|
4398
4399
|
blockNumber: bigint;
|
|
4399
4400
|
};
|
|
4401
|
+
/**
|
|
4402
|
+
* Utility function to return callData
|
|
4403
|
+
* Useful for Tenderly simulation
|
|
4404
|
+
*
|
|
4405
|
+
* @param contract
|
|
4406
|
+
* @param functionName
|
|
4407
|
+
* @param args
|
|
4408
|
+
*/
|
|
4409
|
+
export declare function encodeCalldata(contract: {
|
|
4410
|
+
abi: Abi;
|
|
4411
|
+
}, functionName: string, args?: readonly unknown[]): `0x${string}`;
|
package/esm/services/viem.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createPublicClient, custom } from 'viem';
|
|
1
|
+
import { createPublicClient, custom, encodeFunctionData, } from 'viem';
|
|
2
2
|
import { arbitrum, base, mainnet, optimism, linea, plasma, } from 'viem/chains';
|
|
3
3
|
import { NetworkNumber } from '../types/common';
|
|
4
4
|
export const getViemChain = (network) => {
|
|
@@ -25,3 +25,15 @@ export const setViemBlockNumber = (block) => {
|
|
|
25
25
|
return {};
|
|
26
26
|
return { blockNumber: BigInt(block) };
|
|
27
27
|
};
|
|
28
|
+
/**
|
|
29
|
+
* Utility function to return callData
|
|
30
|
+
* Useful for Tenderly simulation
|
|
31
|
+
*
|
|
32
|
+
* @param contract
|
|
33
|
+
* @param functionName
|
|
34
|
+
* @param args
|
|
35
|
+
*/
|
|
36
|
+
export function encodeCalldata(contract, functionName, args) {
|
|
37
|
+
const callDescriptor = { abi: contract.abi, functionName };
|
|
38
|
+
return encodeFunctionData((args ? Object.assign(Object.assign({}, callDescriptor), { args }) : callDescriptor));
|
|
39
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@defisaver/positions-sdk",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.45-dev-dev",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./cjs/index.js",
|
|
6
6
|
"module": "./esm/index.js",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"author": "",
|
|
22
22
|
"license": "ISC",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@defisaver/tokens": "^1.7.
|
|
24
|
+
"@defisaver/tokens": "^1.7.18",
|
|
25
25
|
"@types/lodash": "^4.17.15",
|
|
26
26
|
"@types/memoizee": "^0.4.12",
|
|
27
27
|
"decimal.js": "^10.6.0",
|
package/src/aaveV3/index.ts
CHANGED
package/src/compoundV2/index.ts
CHANGED
|
@@ -64,7 +64,7 @@ export const _getCompoundV2MarketsData = async (provider: Client, network: Netwo
|
|
|
64
64
|
utilization: new Dec(market.totalBorrow.toString()).div(totalSupply).times(100).toString(),
|
|
65
65
|
totalSupply: assetAmountInEth(totalSupply, handleWbtcLegacy(symbol)),
|
|
66
66
|
totalBorrow: assetAmountInEth(totalBorrow, handleWbtcLegacy(symbol)),
|
|
67
|
-
exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).toString(),
|
|
67
|
+
exchangeRate: new Dec(market.exchangeRate.toString()).div(1e28).mul(10 ** pricePrecisionDiff).toString(),
|
|
68
68
|
borrowCap: assetAmountInEth(borrowCap, handleWbtcLegacy(symbol)),
|
|
69
69
|
canBeBorrowed: market.canBorrow,
|
|
70
70
|
canBeSupplied: market.canMint,
|
|
@@ -10,7 +10,7 @@ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', '
|
|
|
10
10
|
|
|
11
11
|
export const aaveV3AssetsDefaultMarketEth = [
|
|
12
12
|
'ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS', 'rsETH', 'LBTC', 'eBTC', 'RLUSD', 'PT eUSDe May', 'PT sUSDe July', 'USDtb',
|
|
13
|
-
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT',
|
|
13
|
+
'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep', 'PT USDe Sep', 'tETH', 'ezETH', 'XAUt', 'PT sUSDe Nov', 'PT USDe Nov', 'PT sUSDe Feb', 'PT USDe Feb', 'mUSD', 'syrupUSDT', 'USDG',
|
|
14
14
|
];
|
|
15
15
|
export const aaveV3AssetsDefaultMarketOpt = [
|
|
16
16
|
'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',
|
package/src/portfolio/index.ts
CHANGED
|
@@ -50,7 +50,7 @@ import { fetchMorphoBlueRewards } from '../claiming/morphoBlue';
|
|
|
50
50
|
import { getKingRewards } from '../claiming/king';
|
|
51
51
|
import { fetchEthenaAirdropRewards } from '../claiming/ethena';
|
|
52
52
|
|
|
53
|
-
export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[],
|
|
53
|
+
export async function getPortfolioData(provider: EthereumProvider, network: NetworkNumber, defaultProvider: EthereumProvider, addresses: EthAddress[], isSim = false): Promise<{
|
|
54
54
|
positions: PortfolioPositionsData;
|
|
55
55
|
stakingPositions: any;
|
|
56
56
|
rewardsData: any;
|
|
@@ -72,20 +72,12 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
|
|
|
72
72
|
const liquityV2Markets = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)) : [];
|
|
73
73
|
const liquityV2MarketsStaking = [NetworkNumber.Eth].includes(network) ? Object.values(LiquityV2Markets(network)).filter(market => !market.isLegacy) : [];
|
|
74
74
|
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
});
|
|
82
|
-
const defaultClient = getViemProvider(defaultProvider, network, {
|
|
83
|
-
batch: {
|
|
84
|
-
multicall: {
|
|
85
|
-
batchSize: 2500000,
|
|
86
|
-
},
|
|
87
|
-
},
|
|
88
|
-
});
|
|
75
|
+
const args: [NetworkNumber, any?] = [network];
|
|
76
|
+
if (!isSim) {
|
|
77
|
+
args.push({ batch: { multicall: { batchSize: 2500000 } } });
|
|
78
|
+
}
|
|
79
|
+
const client = getViemProvider(provider, ...args);
|
|
80
|
+
const defaultClient = getViemProvider(defaultProvider, ...args);
|
|
89
81
|
|
|
90
82
|
const morphoMarketsData: Record<string, MorphoBlueMarketInfo> = {};
|
|
91
83
|
const compoundV3MarketsData: Record<string, CompoundV3MarketsData> = {};
|
|
@@ -115,7 +107,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
|
|
|
115
107
|
const positions: PortfolioPositionsData = {};
|
|
116
108
|
const stakingPositions: any = {};
|
|
117
109
|
const rewardsData: any = {};
|
|
118
|
-
const allAddresses = [...addresses
|
|
110
|
+
const allAddresses = [...addresses];
|
|
119
111
|
|
|
120
112
|
for (const address of allAddresses) {
|
|
121
113
|
positions[address.toLowerCase() as EthAddress] = {
|
|
@@ -430,7 +422,6 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
|
|
|
430
422
|
})(),
|
|
431
423
|
]);
|
|
432
424
|
|
|
433
|
-
|
|
434
425
|
await Promise.all([
|
|
435
426
|
...aaveV3Markets.map((market) => allAddresses.map(async (address) => {
|
|
436
427
|
try {
|
package/src/services/viem.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
createPublicClient,
|
|
3
|
+
custom,
|
|
4
|
+
encodeFunctionData,
|
|
5
|
+
type Abi,
|
|
6
|
+
} from 'viem';
|
|
2
7
|
import {
|
|
3
8
|
arbitrum, base, mainnet, optimism, linea, plasma,
|
|
4
9
|
} from 'viem/chains';
|
|
@@ -32,4 +37,21 @@ export const getViemProvider = (provider: EthereumProvider, network: NetworkNumb
|
|
|
32
37
|
export const setViemBlockNumber = (block: Blockish) => {
|
|
33
38
|
if (block === 'latest') return {};
|
|
34
39
|
return { blockNumber: BigInt(block) };
|
|
35
|
-
};
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
/**
|
|
43
|
+
* Utility function to return callData
|
|
44
|
+
* Useful for Tenderly simulation
|
|
45
|
+
*
|
|
46
|
+
* @param contract
|
|
47
|
+
* @param functionName
|
|
48
|
+
* @param args
|
|
49
|
+
*/
|
|
50
|
+
export function encodeCalldata(
|
|
51
|
+
contract: { abi: Abi },
|
|
52
|
+
functionName: string,
|
|
53
|
+
args?: readonly unknown[],
|
|
54
|
+
): `0x${string}` {
|
|
55
|
+
const callDescriptor = { abi: contract.abi, functionName } as const;
|
|
56
|
+
return encodeFunctionData((args ? { ...callDescriptor, args } : callDescriptor) as any);
|
|
57
|
+
}
|