@defisaver/positions-sdk 1.0.26-dev-portfolio-15 → 1.0.26-dev-portfolio-16

package/cjs/aaveV3/index.d.ts

@@ -4,8 +4,8 @@ import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
-export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData>;
-export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData>;
+export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
+export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
 export declare const EMPTY_AAVE_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -29,6 +29,6 @@ export declare const EMPTY_AAVE_DATA: {
 };
 export declare const _getAaveV3AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getAaveV3AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
-export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
+export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
+export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;

package/cjs/aaveV3/index.js

@@ -51,8 +51,8 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
-function _getAaveV3MarketData(provider, network, market) {
-    return __awaiter(this, void 0, void 0, function* () {
+function _getAaveV3MarketData(provider_1, network_1, market_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
         const isL2 = (0, utils_1.isLayer2Network)(network);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
@@ -61,10 +61,10 @@ function _getAaveV3MarketData(provider, network, market) {
         const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = yield Promise.all([
-            loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses]),
-            loanInfoContract.read.getAllEmodes([marketAddress]),
-            loanInfoContract.read.isBorrowAllowed([marketAddress]), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
-            networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress]) : null,
+            loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            loanInfoContract.read.getAllEmodes([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            loanInfoContract.read.isBorrowAllowed([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
+            networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber)) : null,
         ]);
         isBorrowAllowed = (0, utils_1.isLayer2Network)(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -263,9 +263,9 @@ function _getAaveV3MarketData(provider, network, market) {
         return { assetsData: payload, eModeCategoriesData };
     });
 }
-function getAaveV3MarketData(provider, network, market) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getAaveV3MarketData((0, viem_1.getViemProvider)(provider, network), network, market);
+function getAaveV3MarketData(provider_1, network_1, market_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        return _getAaveV3MarketData((0, viem_1.getViemProvider)(provider, network), network, market, blockNumber);
     });
 }
 exports.EMPTY_AAVE_DATA = {
@@ -325,7 +325,7 @@ const _getAaveV3AccountBalances = (provider, network, block, addressMapping, add
 exports._getAaveV3AccountBalances = _getAaveV3AccountBalances;
 const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3AccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address); });
 exports.getAaveV3AccountBalances = getAaveV3AccountBalances;
-const _getAaveV3AccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
     const { selectedMarket: market, assetsData, } = extractedState;
     let payload = Object.assign(Object.assign({}, exports.EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -337,9 +337,9 @@ const _getAaveV3AccountData = (provider, network, address, extractedState) => __
     const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [eModeCategory, tokenBalances1, tokenBalances2] = yield Promise.all([
-        lendingPoolContract.read.getUserEMode([address]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)]),
+        lendingPoolContract.read.getUserEMode([address], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const loanInfo = [...tokenBalances1, ...tokenBalances2];
     const usedAssets = {};
@@ -398,7 +398,7 @@ const _getAaveV3AccountData = (provider, network, address, extractedState) => __
     return payload;
 });
 exports._getAaveV3AccountData = _getAaveV3AccountData;
-const getAaveV3AccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV3AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, extractedState); });
+const getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') { return (0, exports._getAaveV3AccountData)((0, viem_1.getViemProvider)(provider, network), network, address, extractedState, blockNumber); });
 exports.getAaveV3AccountData = getAaveV3AccountData;
 const getAaveV3FullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getAaveV3MarketData(provider, network, market);

package/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 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'];
 exports.aaveV3AssetsDefaultMarketEth = [
     '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',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep',
 ];
 exports.aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/cjs/staking/staking.js

@@ -45,7 +45,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return String(data.apy);
 });
-exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH'];
+exports.STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep'];
 exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -83,6 +83,8 @@ exports.getStakingApy = (0, memoizee_1.default)((asset) => __awaiter(void 0, voi
             return yield getApyFromDfsApi('PT USDe July');
         if (asset === 'PT eUSDe Aug')
             return yield getApyFromDfsApi('PT eUSDe Aug');
+        if (asset === 'PT sUSDe Sep')
+            return yield getApyFromDfsApi('PT sUSDe Sep');
         if (asset === 'tETH')
             return yield getApyFromDfsApi('tETH');
     }

package/esm/aaveV3/index.d.ts

@@ -4,8 +4,8 @@ import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances
 export declare const aaveV3EmodeCategoriesMapping: (extractedState: any, usedAssets: AaveV3UsedAssets) => {
     [key: number]: EModeCategoryDataMapping;
 };
-export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData>;
-export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData>;
+export declare function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
+export declare function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, blockNumber?: 'latest' | number): Promise<AaveV3MarketData>;
 export declare const EMPTY_AAVE_DATA: {
     usedAssets: {};
     suppliedUsd: string;
@@ -29,6 +29,6 @@ export declare const EMPTY_AAVE_DATA: {
 };
 export declare const _getAaveV3AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const getAaveV3AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
-export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any) => Promise<AaveV3PositionData>;
+export declare const _getAaveV3AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
+export declare const getAaveV3AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber?: "latest" | number) => Promise<AaveV3PositionData>;
 export declare const getAaveV3FullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo) => Promise<AaveV3PositionData>;

package/esm/aaveV3/index.js

@@ -42,8 +42,8 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     });
     return categoriesMapping;
 };
-export function _getAaveV3MarketData(provider, network, market) {
-    return __awaiter(this, void 0, void 0, function* () {
+export function _getAaveV3MarketData(provider_1, network_1, market_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
         const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
         const isL2 = isLayer2Network(network);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
@@ -52,10 +52,10 @@ export function _getAaveV3MarketData(provider, network, market) {
         const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = yield Promise.all([
-            loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses]),
-            loanInfoContract.read.getAllEmodes([marketAddress]),
-            loanInfoContract.read.isBorrowAllowed([marketAddress]), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
-            networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress]) : null,
+            loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
+            loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
+            loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
+            networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
         ]);
         isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
         const eModeCategoriesData = {};
@@ -254,9 +254,9 @@ export function _getAaveV3MarketData(provider, network, market) {
         return { assetsData: payload, eModeCategoriesData };
     });
 }
-export function getAaveV3MarketData(provider, network, market) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return _getAaveV3MarketData(getViemProvider(provider, network), network, market);
+export function getAaveV3MarketData(provider_1, network_1, market_1) {
+    return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        return _getAaveV3MarketData(getViemProvider(provider, network), network, market, blockNumber);
     });
 }
 export const EMPTY_AAVE_DATA = {
@@ -314,7 +314,7 @@ export const _getAaveV3AccountBalances = (provider, network, block, addressMappi
     return balances;
 });
 export const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV3AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address); });
-export const _getAaveV3AccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () {
+export const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') {
     const { selectedMarket: market, assetsData, } = extractedState;
     let payload = Object.assign(Object.assign({}, EMPTY_AAVE_DATA), { lastUpdated: Date.now() });
     if (!address) {
@@ -326,9 +326,9 @@ export const _getAaveV3AccountData = (provider, network, address, extractedState
     const _addresses = market.assets.map((a) => getAssetInfo(ethToWeth(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [eModeCategory, tokenBalances1, tokenBalances2] = yield Promise.all([
-        lendingPoolContract.read.getUserEMode([address]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)]),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)]),
+        lendingPoolContract.read.getUserEMode([address], setViemBlockNumber(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], setViemBlockNumber(blockNumber)),
+        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], setViemBlockNumber(blockNumber)),
     ]);
     const loanInfo = [...tokenBalances1, ...tokenBalances2];
     const usedAssets = {};
@@ -386,7 +386,7 @@ export const _getAaveV3AccountData = (provider, network, address, extractedState
     payload.automationResubscribeRequired = false;
     return payload;
 });
-export const getAaveV3AccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV3AccountData(getViemProvider(provider, network), network, address, extractedState); });
+export const getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, extractedState_1, ...args_1], void 0, function* (provider, network, address, extractedState, blockNumber = 'latest') { return _getAaveV3AccountData(getViemProvider(provider, network), network, address, extractedState, blockNumber); });
 export const getAaveV3FullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getAaveV3MarketData(provider, network, market);
     const positionData = yield getAaveV3AccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });

package/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 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'];
 export const aaveV3AssetsDefaultMarketEth = [
     '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',
-    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC',
+    'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
     'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/esm/staking/staking.js

@@ -39,7 +39,7 @@ const getApyFromDfsApi = (asset) => __awaiter(void 0, void 0, void 0, function*
     const data = yield res.json();
     return String(data.apy);
 });
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep'];
 export const getStakingApy = memoize((asset) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         if (asset === 'stETH' || asset === 'wstETH')
@@ -77,6 +77,8 @@ export const getStakingApy = memoize((asset) => __awaiter(void 0, void 0, void 0
             return yield getApyFromDfsApi('PT USDe July');
         if (asset === 'PT eUSDe Aug')
             return yield getApyFromDfsApi('PT eUSDe Aug');
+        if (asset === 'PT sUSDe Sep')
+            return yield getApyFromDfsApi('PT sUSDe Sep');
         if (asset === 'tETH')
             return yield getApyFromDfsApi('tETH');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "1.0.26-dev-portfolio-15",
+  "version": "1.0.26-dev-portfolio-16",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -15,14 +15,14 @@
     "test": "mocha tests/portfolio.ts",
     "test-single": "mocha ./tests/$npm_config_name.ts",
     "test:debugger": "mocha --inspect-brk tests/*",
-    "build-test": "npm run build && npm run test",
+    "test-single": "mocha ./tests/$npm_config_name.ts",
     "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.6.14",
+    "@defisaver/tokens": "^1.6.16",
     "@types/lodash": "^4.17.15",
     "@types/memoizee": "^0.4.12",
     "decimal.js": "^10.6.0",

package/src/aaveV3/index.ts

@@ -60,7 +60,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: Aa
   return categoriesMapping;
 };
 
-export async function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData> {
+export async function _getAaveV3MarketData(provider: Client, network: NetworkNumber, market: AaveMarketInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3MarketData> {
   const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
 
   const isL2 = isLayer2Network(network);
@@ -72,10 +72,10 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
 
   // eslint-disable-next-line prefer-const
   let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo] = await Promise.all([
-    loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]]),
-    loanInfoContract.read.getAllEmodes([marketAddress]),
-    loanInfoContract.read.isBorrowAllowed([marketAddress]), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
-    networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress]) : null,
+    loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses as EthAddress[]], setViemBlockNumber(blockNumber)),
+    loanInfoContract.read.getAllEmodes([marketAddress], setViemBlockNumber(blockNumber)),
+    loanInfoContract.read.isBorrowAllowed([marketAddress], setViemBlockNumber(blockNumber)), // Used on L2s check for PriceOracleSentinel (mainnet will always return true)
+    networksWithIncentives.includes(network) ? aaveIncentivesContract.read.getReservesIncentivesData([marketAddress], setViemBlockNumber(blockNumber)) : null,
   ]);
   isBorrowAllowed = isLayer2Network(network) ? isBorrowAllowed : true;
 
@@ -283,8 +283,8 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
   return { assetsData: payload, eModeCategoriesData };
 }
 
-export async function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo): Promise<AaveV3MarketData> {
-  return _getAaveV3MarketData(getViemProvider(provider, network), network, market);
+export async function getAaveV3MarketData(provider: EthereumProvider, network: NetworkNumber, market: AaveMarketInfo, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3MarketData> {
+  return _getAaveV3MarketData(getViemProvider(provider, network), network, market, blockNumber);
 }
 
 export const EMPTY_AAVE_DATA = {
@@ -361,7 +361,7 @@ export const _getAaveV3AccountBalances = async (provider: Client, network: Netwo
 
 export const getAaveV3AccountBalances = async (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => _getAaveV3AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address);
 
-export const _getAaveV3AccountData = async (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any): Promise<AaveV3PositionData> => {
+export const _getAaveV3AccountData = async (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3PositionData> => {
   const {
     selectedMarket: market, assetsData,
   } = extractedState;
@@ -381,9 +381,9 @@ export const _getAaveV3AccountData = async (provider: Client, network: NetworkNu
   const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
 
   const [eModeCategory, tokenBalances1, tokenBalances2] = await Promise.all([
-    lendingPoolContract.read.getUserEMode([address]),
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex) as EthAddress[]]),
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length) as EthAddress[]]),
+    lendingPoolContract.read.getUserEMode([address], setViemBlockNumber(blockNumber)),
+    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex) as EthAddress[]], setViemBlockNumber(blockNumber)),
+    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length) as EthAddress[]], setViemBlockNumber(blockNumber)),
   ]);
 
   const loanInfo = [...tokenBalances1, ...tokenBalances2];
@@ -468,7 +468,7 @@ export const _getAaveV3AccountData = async (provider: Client, network: NetworkNu
   return payload;
 };
 
-export const getAaveV3AccountData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any): Promise<AaveV3PositionData> => _getAaveV3AccountData(getViemProvider(provider, network), network, address, extractedState);
+export const getAaveV3AccountData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: any, blockNumber: 'latest' | number = 'latest'): Promise<AaveV3PositionData> => _getAaveV3AccountData(getViemProvider(provider, network), network, address, extractedState, blockNumber);
 
 export const getAaveV3FullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: AaveMarketInfo): Promise<AaveV3PositionData> => {
   const marketData = await getAaveV3MarketData(provider, network, market);

package/src/markets/aave/marketAssets.ts

@@ -10,7 +10,7 @@ export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', '
 
 export const aaveV3AssetsDefaultMarketEth = [
   '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',
-  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC',
+  'eUSDe', 'PT USDe July', 'PT eUSDe Aug', 'EURC', 'FBTC', 'PT sUSDe Sep',
 ];
 export const aaveV3AssetsDefaultMarketOpt = [
   'DAI', 'USDC.e', 'USDT', 'SUSD', 'AAVE', 'LINK', 'WBTC', 'ETH', 'OP', 'wstETH', 'LUSD', 'MAI', 'rETH', 'USDC',

package/src/staking/staking.ts

@@ -35,7 +35,7 @@ const getApyFromDfsApi = async (asset: string) => {
   return String(data.apy);
 };
 
-export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH'];
+export const STAKING_ASSETS = ['cbETH', 'wstETH', 'cbETH', 'rETH', 'sDAI', 'weETH', 'sUSDe', 'osETH', 'ezETH', 'ETHx', 'rsETH', 'pufETH', 'wrsETH', 'wsuperOETHb', 'sUSDS', 'PT eUSDe May', 'PT sUSDe July', 'PT USDe July', 'PT eUSDe Aug', 'tETH', 'PT sUSDe Sep'];
 
 export const getStakingApy = memoize(async (asset: string) => {
   try {
@@ -57,6 +57,7 @@ export const getStakingApy = memoize(async (asset: string) => {
     if (asset === 'PT sUSDe July') return await getApyFromDfsApi('PT sUSDe July');
     if (asset === 'PT USDe July') return await getApyFromDfsApi('PT USDe July');
     if (asset === 'PT eUSDe Aug') return await getApyFromDfsApi('PT eUSDe Aug');
+    if (asset === 'PT sUSDe Sep') return await getApyFromDfsApi('PT sUSDe Sep');
     if (asset === 'tETH') return await getApyFromDfsApi('tETH');
   } catch (e) {
     console.error(`Failed to fetch APY for ${asset}`);