@defisaver/positions-sdk 2.1.169-custom-fetching-dev → 2.1.169-custom-fetching-3-dev

package/cjs/liquityV2/index.d.ts

@@ -1,5 +1,5 @@
 import { Client, PublicClient } from 'viem';
-import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import { Blockish, EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
 import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
 export type SPYieldGainParameters = {
     P: string;
@@ -9,8 +9,8 @@ export type SPYieldGainParameters = {
     totalBoldDeposits: string;
     yieldGainsPending: string;
 };
-export declare const _getLiquityV2MarketData: (provider: Client, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
-export declare const getLiquityV2MarketData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
+export declare const _getLiquityV2MarketData: (provider: Client, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, blockNumber?: Blockish) => Promise<LiquityV2MarketData>;
+export declare const getLiquityV2MarketData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, blockNumber?: Blockish) => Promise<LiquityV2MarketData>;
 export declare const nftContractCreationBlockMapping: {
     liquityv2eth: number;
     liquityv2wsteth: number;
@@ -32,27 +32,27 @@ export declare const getLiquityV2UserTroveIds: (provider: EthereumProvider, netw
     nextFreeTroveIndex: string;
 }>;
 export declare const calculateDebtInFrontLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, allMarketsUnbackedDebts: Record<LiquityV2Versions, string>, interestRateDebtInFront: string) => string;
-export declare const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2: (newDebt: string, markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, interestRate: string) => Promise<string>;
-export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: EthereumProvider, network: NetworkNumber, isLegacy: boolean, interestRate: string, debtInFrontBeingMoved?: string) => Promise<string>;
+export declare const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2: (newDebt: string, markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: Client, network: NetworkNumber, interestRate: string, blockNumber?: Blockish) => Promise<string>;
+export declare const getDebtInFrontForInterestRateLiquityV2: (markets: Record<LiquityV2Versions, LiquityV2MarketData>, selectedMarket: LiquityV2Versions, provider: EthereumProvider, network: NetworkNumber, isLegacy: boolean, interestRate: string, debtInFrontBeingMoved?: string, blockNumber?: Blockish) => Promise<string>;
 export declare const _getLiquityV2TroveData: (provider: Client, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;
     assetsData: LiquityV2AssetsData;
     troveId: string;
     allMarketsData: Record<LiquityV2Versions, LiquityV2MarketData>;
-}, fetchDebtInFront?: boolean) => Promise<LiquityV2TroveData>;
+}, fetchDebtInFront?: boolean, blockNumber?: Blockish) => Promise<LiquityV2TroveData>;
 export declare const getLiquityV2TroveData: (provider: EthereumProvider, network: NetworkNumber, { selectedMarket, assetsData, troveId, allMarketsData, }: {
     selectedMarket: LiquityV2MarketInfo;
     assetsData: LiquityV2AssetsData;
     troveId: string;
     allMarketsData: Record<LiquityV2Versions, LiquityV2MarketData>;
-}, fetchDebtInFront?: boolean) => Promise<LiquityV2TroveData>;
-export declare const getLiquityV2ClaimableCollateral: (collSurplusPoolAddress: EthAddress, account: EthAddress, provider: EthereumProvider, network: NetworkNumber) => Promise<string>;
+}, fetchDebtInFront?: boolean, blockNumber?: Blockish) => Promise<LiquityV2TroveData>;
+export declare const getLiquityV2ClaimableCollateral: (collSurplusPoolAddress: EthAddress, account: EthAddress, provider: EthereumProvider, network: NetworkNumber, blockNumber?: Blockish) => Promise<string>;
 export type sBoldYieldParameters = {
     WETH: string;
     wsETH: string;
     rETH: string;
 };
-export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<{
+export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress, blockNumber?: Blockish) => Promise<{
     totalBOLDDeposited: string;
     stakedBOLDBalance: string;
     stabilityRewardColl: string;
@@ -61,7 +61,7 @@ export declare const getLiquityV2Staking: (provider: Client, network: NetworkNum
     debtTokenBalance: string;
     stabilityPoolApy: string;
 }>;
-export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<{
+export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress, blockNumber?: Blockish) => Promise<{
     spApy: string;
     yBoldApy: string;
     totalBoldDepositedSBold: string;

package/cjs/liquityV2/index.js

@@ -29,12 +29,12 @@ const getLiquityV2ViewContract = (provider, network, isLegacy) => {
         return (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network);
     return (0, contracts_1.LiquityV2ViewContractViem)(provider, network);
 };
-const _getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getLiquityV2MarketData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
     var _a;
     const { marketAddress, debtToken, collateralToken, isLegacy, } = selectedMarket;
     const data = isLegacy
-        ? yield (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getMarketData([marketAddress])
-        : (yield (0, contracts_1.LiquityV2ViewContractViem)(provider, network).simulate.getMarketData([marketAddress])).result;
+        ? yield (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getMarketData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber))
+        : (yield (0, contracts_1.LiquityV2ViewContractViem)(provider, network).simulate.getMarketData([marketAddress], (0, viem_1.setViemBlockNumber)(blockNumber))).result;
     const hintHelperAddress = data.hintHelpers;
     const troveNFTAddress = data.troveNFT;
     const borrowerOperationsAddress = data.borrowerOperations;
@@ -108,17 +108,17 @@ const _getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter
     };
 });
 exports._getLiquityV2MarketData = _getLiquityV2MarketData;
-const getLiquityV2MarketData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityV2MarketData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
+const getLiquityV2MarketData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') { return (0, exports._getLiquityV2MarketData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, blockNumber); });
 exports.getLiquityV2MarketData = getLiquityV2MarketData;
-const getUserTroves = (provider_1, network_1, isLegacy_1, account_1, marketAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, account_1, marketAddress_1, ...args_1], void 0, function* (provider, network, isLegacy, account, marketAddress, startIndex = 0, endIndex = 100, troves = []) {
+const getUserTroves = (provider_1, network_1, isLegacy_1, account_1, marketAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, account_1, marketAddress_1, ...args_1], void 0, function* (provider, network, isLegacy, account, marketAddress, startIndex = 0, endIndex = 100, troves = [], blockNumber = 'latest') {
     const viewContract = getLiquityV2ViewContract(provider, network, isLegacy);
-    const result = yield viewContract.read.getUserTroves([account, marketAddress, BigInt(startIndex), BigInt(endIndex)]);
+    const result = yield viewContract.read.getUserTroves([account, marketAddress, BigInt(startIndex), BigInt(endIndex)], (0, viem_1.setViemBlockNumber)(blockNumber));
     const newStartIndex = endIndex + 1;
     const nextFreeTroveIndex = result[1].toString();
     const existingTroves = [...troves, ...result[0].map((trove) => (Object.assign(Object.assign({}, trove), { troveId: trove.troveId.toString() })))];
     if (nextFreeTroveIndex !== '-1')
         return { troves: existingTroves.filter((trove) => trove.ownedByUser), nextFreeTroveIndex };
-    return getUserTroves(provider, network, isLegacy, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves);
+    return getUserTroves(provider, network, isLegacy, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves, blockNumber);
 });
 exports.nftContractCreationBlockMapping = {
     [types_1.LiquityV2Versions.LiquityV2Eth]: 22516079,
@@ -163,40 +163,40 @@ const _getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAd
 exports._getLiquityV2UserTroveIds = _getLiquityV2UserTroveIds;
 const getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityV2UserTroveIds)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account); });
 exports.getLiquityV2UserTroveIds = getLiquityV2UserTroveIds;
-const getDebtInFrontForSingleMarketLiquityV2 = (provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1], void 0, function* (provider, network, isLegacy, marketAddress, troveId, accumulatedSum = '0', iterations = 2000) {
+const getDebtInFrontForSingleMarketLiquityV2 = (provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, marketAddress_1, troveId_1, ...args_1], void 0, function* (provider, network, isLegacy, marketAddress, troveId, accumulatedSum = '0', iterations = 2000, blockNumber = 'latest') {
     const viewContract = getLiquityV2ViewContract(provider, network, isLegacy);
-    const res = yield viewContract.read.getDebtInFront([marketAddress, BigInt(troveId), BigInt(accumulatedSum), BigInt(iterations)]);
+    const res = yield viewContract.read.getDebtInFront([marketAddress, BigInt(troveId), BigInt(accumulatedSum), BigInt(iterations)], (0, viem_1.setViemBlockNumber)(blockNumber));
     const next = res[0].toString();
     const debt = res[1].toString();
     if (next === '0')
         return (0, tokens_1.assetAmountInEth)(debt);
-    return getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, marketAddress, next, debt, iterations);
+    return getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, marketAddress, next, debt, iterations, blockNumber);
 });
-const getDebtInFrontForInterestRateSingleMarketLiquityV2 = (provider_1, network_1, isLegacy_1, marketAddress_1, interestRate_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, marketAddress_1, interestRate_1, ...args_1], void 0, function* (provider, network, isLegacy, marketAddress, interestRate, troveId = '0', accumulatedSum = '0', iterations = 2000) {
+const getDebtInFrontForInterestRateSingleMarketLiquityV2 = (provider_1, network_1, isLegacy_1, marketAddress_1, interestRate_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, isLegacy_1, marketAddress_1, interestRate_1, ...args_1], void 0, function* (provider, network, isLegacy, marketAddress, interestRate, troveId = '0', accumulatedSum = '0', iterations = 2000, blockNumber = 'latest') {
     const viewContract = getLiquityV2ViewContract(provider, network, isLegacy);
     if (+interestRate === 0 || !interestRate)
         return '0';
     const interestRateWei = new decimal_js_1.default(interestRate).times(1e16).toFixed(0).toString();
-    const res = yield viewContract.read.getDebtInFrontByInterestRate([marketAddress, BigInt(troveId), BigInt(accumulatedSum), BigInt(iterations), BigInt(interestRateWei)]);
+    const res = yield viewContract.read.getDebtInFrontByInterestRate([marketAddress, BigInt(troveId), BigInt(accumulatedSum), BigInt(iterations), BigInt(interestRateWei)], (0, viem_1.setViemBlockNumber)(blockNumber));
     const next = res[0].toString();
     const debt = res[1].toString();
     if (next === '0')
         return (0, tokens_1.assetAmountInEth)(debt);
-    return getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, marketAddress, interestRate, next, debt, iterations);
+    return getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, marketAddress, interestRate, next, debt, iterations, blockNumber);
 });
-const getUnbackedDebtForSingleMarket = (totalBorrowed, provider, network, stabilityPoolAddress) => __awaiter(void 0, void 0, void 0, function* () {
+const getUnbackedDebtForSingleMarket = (totalBorrowed_1, provider_1, network_1, stabilityPoolAddress_1, ...args_1) => __awaiter(void 0, [totalBorrowed_1, provider_1, network_1, stabilityPoolAddress_1, ...args_1], void 0, function* (totalBorrowed, provider, network, stabilityPoolAddress, blockNumber = 'latest') {
     const stabilityPoolContract = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2StabilityPool', stabilityPoolAddress)(provider, network);
-    const totalBoldDeposits = yield stabilityPoolContract.read.getTotalBoldDeposits();
+    const totalBoldDeposits = yield stabilityPoolContract.read.getTotalBoldDeposits((0, viem_1.setViemBlockNumber)(blockNumber));
     const totalBoldDepositsInEth = (0, tokens_1.assetAmountInEth)(totalBoldDeposits.toString());
     return decimal_js_1.default.max(new decimal_js_1.default(totalBorrowed).sub(totalBoldDepositsInEth), 0).toString();
 });
-const getAllMarketsUnbackedDebts = (markets, isLegacy, provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getAllMarketsUnbackedDebts = (markets_2, isLegacy_1, provider_1, network_1, ...args_1) => __awaiter(void 0, [markets_2, isLegacy_1, provider_1, network_1, ...args_1], void 0, function* (markets, isLegacy, provider, network, blockNumber = 'latest') {
     const allMarketsUnbackedDebt = yield Promise.all(Object.entries(markets).map((_a) => __awaiter(void 0, [_a], void 0, function* ([version, market]) {
         const { assetsData, marketData } = market;
         const { debtToken, isLegacy: isLegacyMarket } = (0, markets_1.LiquityV2Markets)(network)[version];
         if (isLegacyMarket !== isLegacy)
             return [version, '0'];
-        const unbackedDebt = yield getUnbackedDebtForSingleMarket(assetsData[debtToken].totalBorrow, provider, network, marketData.stabilityPoolAddress);
+        const unbackedDebt = yield getUnbackedDebtForSingleMarket(assetsData[debtToken].totalBorrow, provider, network, marketData.stabilityPoolAddress, blockNumber);
         return [version, unbackedDebt];
     })));
     return Object.fromEntries(allMarketsUnbackedDebt);
@@ -251,21 +251,21 @@ exports.calculateDebtInFrontLiquityV2 = calculateDebtInFrontLiquityV2;
 // @dev The amount redeemed on each branch depends on the unbacked debt of every branch (the difference between total borrow and stability pool deposits).
 // When new debt is generated on the selected market, the unbacked debt will increase, resulting in a higher redemption amount on that branch.
 // This function accepts the new debt that's about to be generated (e.g., trove creation) and estimates the debt in front based on the new state.
-const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = (newDebt, markets, selectedMarket, provider, network, interestRate) => __awaiter(void 0, void 0, void 0, function* () {
+const getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = (newDebt_1, markets_2, selectedMarket_1, provider_1, network_1, interestRate_1, ...args_1) => __awaiter(void 0, [newDebt_1, markets_2, selectedMarket_1, provider_1, network_1, interestRate_1, ...args_1], void 0, function* (newDebt, markets, selectedMarket, provider, network, interestRate, blockNumber = 'latest') {
     const marketsWithNewDebt = structuredClone(markets);
     const selectedMarketDebtToken = (0, markets_1.LiquityV2Markets)(network)[selectedMarket].debtToken;
     const currentTotalBorrow = new decimal_js_1.default(marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow);
     marketsWithNewDebt[selectedMarket].assetsData[selectedMarketDebtToken].totalBorrow = currentTotalBorrow.add(newDebt).toString();
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network);
-    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate));
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(marketsWithNewDebt, isLegacy, provider, network, blockNumber);
+    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate, '0', '0', 2000, blockNumber));
     return (0, exports.calculateDebtInFrontLiquityV2)(marketsWithNewDebt, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = getDebtInFrontForInterestRateIncludingNewDebtLiquityV2;
-const getDebtInFrontLiquityV2 = (markets, selectedMarket, provider, network, viewContract, troveId) => __awaiter(void 0, void 0, void 0, function* () {
+const getDebtInFrontLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, viewContract_1, troveId_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, viewContract_1, troveId_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, viewContract, troveId, blockNumber = 'latest') {
     const { isLegacy } = (0, markets_1.LiquityV2Markets)(common_1.NetworkNumber.Eth)[selectedMarket];
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
-    const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId);
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network, blockNumber);
+    const interestRateDebtInFront = yield getDebtInFrontForSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, troveId, '0', 2000, blockNumber);
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
 /**
@@ -277,25 +277,25 @@ const getDebtInFrontLiquityV2 = (markets, selectedMarket, provider, network, vie
  * @param interestRate
  * @param debtInFrontBeingMoved - amound of debt being repositioned if interest rate is being increased (prevents including it as debt in front)
  */
-const _getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0') {
-    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network);
-    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate))
+const _getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0', blockNumber = 'latest') {
+    const allMarketsUnbackedDebts = yield getAllMarketsUnbackedDebts(markets, isLegacy, provider, network, blockNumber);
+    const interestRateDebtInFront = new decimal_js_1.default(yield getDebtInFrontForInterestRateSingleMarketLiquityV2(provider, network, isLegacy, (0, markets_1.LiquityV2Markets)(network)[selectedMarket].marketAddress, interestRate, '0', '0', 2000, blockNumber))
         .sub(debtInFrontBeingMoved);
     return (0, exports.calculateDebtInFrontLiquityV2)(markets, selectedMarket, allMarketsUnbackedDebts, interestRateDebtInFront.toString());
 });
-const getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0') { return _getDebtInFrontForInterestRateLiquityV2(markets, selectedMarket, (0, viem_1.getViemProvider)(provider, network), network, isLegacy, interestRate, debtInFrontBeingMoved); });
+const getDebtInFrontForInterestRateLiquityV2 = (markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1) => __awaiter(void 0, [markets_2, selectedMarket_1, provider_1, network_1, isLegacy_1, interestRate_1, ...args_1], void 0, function* (markets, selectedMarket, provider, network, isLegacy, interestRate, debtInFrontBeingMoved = '0', blockNumber = 'latest') { return _getDebtInFrontForInterestRateLiquityV2(markets, selectedMarket, (0, viem_1.getViemProvider)(provider, network), network, isLegacy, interestRate, debtInFrontBeingMoved, blockNumber); });
 exports.getDebtInFrontForInterestRateLiquityV2 = getDebtInFrontForInterestRateLiquityV2;
-const _getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __awaiter(void 0, [provider_1, network_1, _a, ...args_1], void 0, function* (provider, network, { selectedMarket, assetsData, troveId, allMarketsData, }, fetchDebtInFront = true) {
+const _getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __awaiter(void 0, [provider_1, network_1, _a, ...args_1], void 0, function* (provider, network, { selectedMarket, assetsData, troveId, allMarketsData, }, fetchDebtInFront = true, blockNumber = 'latest') {
     const { minCollRatio, batchCollRatio } = allMarketsData[selectedMarket.value].marketData;
     const { collateralToken, marketAddress, debtToken } = selectedMarket;
     const troveInfoPromise = selectedMarket.isLegacy
-        ? (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getTroveInfo([marketAddress, BigInt(troveId)])
+        ? (0, contracts_1.LiquityV2LegacyViewContractViem)(provider, network).read.getTroveInfo([marketAddress, BigInt(troveId)], (0, viem_1.setViemBlockNumber)(blockNumber))
         : (0, contracts_1.LiquityV2ViewContractViem)(provider, network).simulate
-            .getTroveInfo([marketAddress, BigInt(troveId)])
+            .getTroveInfo([marketAddress, BigInt(troveId)], (0, viem_1.setViemBlockNumber)(blockNumber))
             .then(({ result }) => result);
     const [_data, debtInFront] = yield Promise.all([
         troveInfoPromise,
-        fetchDebtInFront ? getDebtInFrontLiquityV2(allMarketsData, selectedMarket.value, provider, network, selectedMarket.isLegacy, troveId) : Promise.resolve('0'),
+        fetchDebtInFront ? getDebtInFrontLiquityV2(allMarketsData, selectedMarket.value, provider, network, selectedMarket.isLegacy, troveId, blockNumber) : Promise.resolve('0'),
     ]);
     const data = Object.assign(Object.assign({}, _data), { TCRatio: _data.TCRatio.toString() === utils_1.MAXUINT ? '0' : _data.TCRatio.toString() });
     const usedAssets = {};
@@ -339,19 +339,19 @@ const _getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __await
     return payload;
 });
 exports._getLiquityV2TroveData = _getLiquityV2TroveData;
-const getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __awaiter(void 0, [provider_1, network_1, _a, ...args_1], void 0, function* (provider, network, { selectedMarket, assetsData, troveId, allMarketsData, }, fetchDebtInFront = true) {
+const getLiquityV2TroveData = (provider_1, network_1, _a, ...args_1) => __awaiter(void 0, [provider_1, network_1, _a, ...args_1], void 0, function* (provider, network, { selectedMarket, assetsData, troveId, allMarketsData, }, fetchDebtInFront = true, blockNumber = 'latest') {
     return (0, exports._getLiquityV2TroveData)((0, viem_1.getViemProvider)(provider, network), network, {
         selectedMarket,
         assetsData,
         troveId,
         allMarketsData,
-    }, fetchDebtInFront);
+    }, fetchDebtInFront, blockNumber);
 });
 exports.getLiquityV2TroveData = getLiquityV2TroveData;
-const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress, account, provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+const getLiquityV2ClaimableCollateral = (collSurplusPoolAddress_1, account_1, provider_1, network_1, ...args_1) => __awaiter(void 0, [collSurplusPoolAddress_1, account_1, provider_1, network_1, ...args_1], void 0, function* (collSurplusPoolAddress, account, provider, network, blockNumber = 'latest') {
     const client = (0, viem_1.getViemProvider)(provider, network);
     const collSurplusPoolContract = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2CollSurplusPool', collSurplusPoolAddress)(client, network);
-    const claimableCollateral = yield collSurplusPoolContract.read.getCollateral([account]);
+    const claimableCollateral = yield collSurplusPoolContract.read.getCollateral([account], (0, viem_1.setViemBlockNumber)(blockNumber));
     return claimableCollateral.toString();
 });
 exports.getLiquityV2ClaimableCollateral = getLiquityV2ClaimableCollateral;
@@ -411,22 +411,22 @@ const calculateSPApy = (spYieldGainParams, spAPYs) => {
         .toString();
     return apy;
 };
-const getLiquityV2Staking = (provider, network, market, user) => __awaiter(void 0, void 0, void 0, function* () {
+const getLiquityV2Staking = (provider_1, network_1, market_1, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, market_1, user_1, ...args_1], void 0, function* (provider, network, market, user, blockNumber = 'latest') {
     const stabilityPoolView = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2StabilityPool', stabilityPoolAddrForMarket[market])(provider, network);
     const activePoolView = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2ActivePool', activePoolAddrForMarket[market])(provider, network);
     const debtTokenInfo = (0, tokens_1.getAssetInfo)((0, markets_1.LiquityV2Markets)(network)[market].debtToken, network);
     const debtTokenContract = (0, contracts_1.createViemContractFromConfigFunc)('Erc20', debtTokenInfo.address)(provider, network);
     const [stabilityRewardColl, stabilityRewardYield, compoundedBoldDeposit, totalBoldDeposits, P, currentScale, yieldGainsPending, debtTokenBalance, aggWeightedDebtSum, lastAggUpdateTime,] = yield Promise.all([
-        stabilityPoolView.read.getDepositorCollGain([user]),
-        stabilityPoolView.read.getDepositorYieldGain([user]),
-        stabilityPoolView.read.getCompoundedBoldDeposit([user]),
-        stabilityPoolView.read.getTotalBoldDeposits(),
-        stabilityPoolView.read.P(),
-        stabilityPoolView.read.currentScale(),
-        stabilityPoolView.read.getYieldGainsPending(),
-        debtTokenContract.read.balanceOf([user]),
-        activePoolView.read.aggWeightedDebtSum(),
-        activePoolView.read.lastAggUpdateTime(),
+        stabilityPoolView.read.getDepositorCollGain([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getDepositorYieldGain([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getCompoundedBoldDeposit([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getTotalBoldDeposits((0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.P((0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.currentScale((0, viem_1.setViemBlockNumber)(blockNumber)),
+        stabilityPoolView.read.getYieldGainsPending((0, viem_1.setViemBlockNumber)(blockNumber)),
+        debtTokenContract.read.balanceOf([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        activePoolView.read.aggWeightedDebtSum((0, viem_1.setViemBlockNumber)(blockNumber)),
+        activePoolView.read.lastAggUpdateTime((0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const stabilityPoolYieldParams = {
         aggWeightedDebtSum: aggWeightedDebtSum.toString(),
@@ -451,7 +451,7 @@ const getLiquityV2Staking = (provider, network, market, user) => __awaiter(void
     };
 });
 exports.getLiquityV2Staking = getLiquityV2Staking;
-const getLiquitySAndYBold = (provider, network, markets, user) => __awaiter(void 0, void 0, void 0, function* () {
+const getLiquitySAndYBold = (provider_1, network_1, markets_2, user_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, markets_2, user_1, ...args_1], void 0, function* (provider, network, markets, user, blockNumber = 'latest') {
     const sBold = (0, contracts_1.LiquityV2sBoldVaultViem)(provider, network);
     const yBold = (0, contracts_1.createViemContractFromConfigFunc)('Erc4626', '0x9F4330700a36B29952869fac9b33f45EEdd8A3d8')(provider, network);
     const stYBold = (0, contracts_1.createViemContractFromConfigFunc)('Erc4626', '0x23346B04a7f55b8760E5860AA5A77383D63491cD')(provider, network);
@@ -461,19 +461,19 @@ const getLiquitySAndYBold = (provider, network, markets, user) => __awaiter(void
         apyREth: markets[types_1.LiquityV2Versions.LiquityV2REth].data.stabilityPoolApy,
     };
     const [sBoldTotalAssets, sBoldConvertToShares, sBoldMaxWithdraw, wethApy, wsETHApy, rETHApy, yBoldTotalAssets, yBoldMaxWithdraw, stYBoldConvertToShares, yBoldApy, sBoldBalance, yBoldBalance, stYBoldBalance,] = yield Promise.all([
-        sBold.read.totalAssets(),
-        sBold.read.convertToShares([BigInt(1e18)]),
-        sBold.read.maxWithdraw([user]),
-        sBold.read.sps([BigInt(0)]),
-        sBold.read.sps([BigInt(1)]),
-        sBold.read.sps([BigInt(2)]),
-        yBold.read.totalAssets(),
-        yBold.read.maxWithdraw([user]),
-        stYBold.read.convertToShares([BigInt(1e18)]),
+        sBold.read.totalAssets((0, viem_1.setViemBlockNumber)(blockNumber)),
+        sBold.read.convertToShares([BigInt(1e18)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        sBold.read.maxWithdraw([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        sBold.read.sps([BigInt(0)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        sBold.read.sps([BigInt(1)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        sBold.read.sps([BigInt(2)], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        yBold.read.totalAssets((0, viem_1.setViemBlockNumber)(blockNumber)),
+        yBold.read.maxWithdraw([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stYBold.read.convertToShares([BigInt(1e18)], (0, viem_1.setViemBlockNumber)(blockNumber)),
         getYBoldApyApi(),
-        sBold.read.balanceOf([user]),
-        yBold.read.balanceOf([user]),
-        stYBold.read.balanceOf([user]),
+        sBold.read.balanceOf([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        yBold.read.balanceOf([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        stYBold.read.balanceOf([user], (0, viem_1.setViemBlockNumber)(blockNumber)),
     ]);
     const spMarketRes = {
         WETH: new decimal_js_1.default(wethApy[1]).div(10000).toString(),

package/cjs/llamaLend/index.d.ts

@@ -1,10 +1,10 @@
 import { Client } from 'viem';
 import { LlamaLendGlobalMarketData, LlamaLendMarketData, LlamaLendUserData } from '../types';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-export declare const _getLlamaLendGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
-export declare const getLlamaLendGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
+export declare const _getLlamaLendGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: LlamaLendMarketData, blockNumber?: Blockish) => Promise<LlamaLendGlobalMarketData>;
+export declare const getLlamaLendGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LlamaLendMarketData, blockNumber?: Blockish) => Promise<LlamaLendGlobalMarketData>;
 export declare const _getLlamaLendAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited?: boolean) => Promise<PositionBalances>;
 export declare const getLlamaLendAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
-export declare const _getLlamaLendUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;
-export declare const getLlamaLendUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;
-export declare const getLlamaLendFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendUserData>;
+export declare const _getLlamaLendUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData, blockNumber?: Blockish) => Promise<LlamaLendUserData>;
+export declare const getLlamaLendUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData, blockNumber?: Blockish) => Promise<LlamaLendUserData>;
+export declare const getLlamaLendFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, blockNumber?: Blockish) => Promise<LlamaLendUserData>;

package/cjs/llamaLend/index.js

@@ -23,7 +23,7 @@ const utils_1 = require("../services/utils");
 const llamaLend_1 = require("../markets/llamaLend");
 const staking_1 = require("../staking");
 const viem_1 = require("../services/viem");
-const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
+const getAndFormatBands = (provider_1, network_1, selectedMarket_1, _minBand_1, _maxBand_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, _minBand_1, _maxBand_1, ...args_1], void 0, function* (provider, network, selectedMarket, _minBand, _maxBand, blockNumber = 'latest') {
     const contract = (0, contracts_1.LlamaLendViewContractViem)(provider, network);
     const minBand = parseInt(_minBand, 10);
     const maxBand = parseInt(_maxBand, 10);
@@ -47,7 +47,7 @@ const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand
         else {
             start = pivots[index - 1] + 1;
         }
-        const pivotedBandsData = yield contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)]);
+        const pivotedBandsData = yield contract.read.getBandsData([selectedMarket.controllerAddress, BigInt(start), BigInt(pivot)], (0, viem_1.setViemBlockNumber)(blockNumber));
         return pivotedBandsData;
     })))).flat();
     return bandsData.map((band) => ({
@@ -58,11 +58,11 @@ const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand
         highPrice: (0, tokens_1.assetAmountInEth)(band.highPrice.toString()),
     }));
 });
-const _getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getLlamaLendGlobalData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') {
     const contract = (0, contracts_1.LlamaLendViewContractViem)(provider, network);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
-    const data = yield contract.read.globalData([selectedMarket.controllerAddress]);
+    const data = yield contract.read.globalData([selectedMarket.controllerAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
     // all prices are in 18 decimals
     const oraclePrice = (0, utils_1.getEthAmountForDecimals)(data.oraclePrice.toString(), 18);
     const collPriceUsd = collAsset === 'crvUSD' ? '1' : new decimal_js_1.default(1).mul(oraclePrice).toDP(18).toString();
@@ -81,7 +81,7 @@ const _getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter
         .toString();
     const futureBorrowRate = new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponentFutureRate).minus(1)).mul(100)
         .toString();
-    const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
+    const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString(), blockNumber);
     const cap = (0, tokens_1.assetAmountInEth)(data.debtTokenTotalSupply.toString(), debtAsset);
     const leftToBorrow = (0, utils_1.getEthAmountForDecimals)(data.debtTokenLeftToBorrow.toString(), 18);
     const debtInAYearBN = new decimal_js_1.default(totalDebt).mul(new decimal_js_1.default(2.718281828459).pow(exponentRate).toNumber());
@@ -142,7 +142,7 @@ const _getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter
     };
 });
 exports._getLlamaLendGlobalData = _getLlamaLendGlobalData;
-const getLlamaLendGlobalData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLlamaLendGlobalData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
+const getLlamaLendGlobalData = (provider_1, network_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, selectedMarket, blockNumber = 'latest') { return (0, exports._getLlamaLendGlobalData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, blockNumber); });
 exports.getLlamaLendGlobalData = getLlamaLendGlobalData;
 const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied, healthPercent) => {
     // if bands are equal, that can only be [0,0] which means user doesn't have loan (min number of bands is 4)
@@ -190,10 +190,10 @@ const _getLlamaLendAccountBalances = (provider_1, network_1, block_1, addressMap
 exports._getLlamaLendAccountBalances = _getLlamaLendAccountBalances;
 const getLlamaLendAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLlamaLendAccountBalances)((0, viem_1.getViemProvider)(provider, network), network, block, addressMapping, address, controllerAddress); });
 exports.getLlamaLendAccountBalances = getLlamaLendAccountBalances;
-const _getLlamaLendUserData = (provider, network, address, selectedMarket, marketData) => __awaiter(void 0, void 0, void 0, function* () {
+const _getLlamaLendUserData = (provider_1, network_1, address_1, selectedMarket_1, marketData_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, marketData_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, marketData, blockNumber = 'latest') {
     const contract = (0, contracts_1.LlamaLendViewContractViem)(provider, network);
     const { assetsData } = marketData;
-    const data = yield contract.read.userData([selectedMarket.controllerAddress, address]);
+    const data = yield contract.read.userData([selectedMarket.controllerAddress, address], (0, viem_1.setViemBlockNumber)(blockNumber));
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
     const collPrice = assetsData[collAsset].price;
@@ -238,7 +238,7 @@ const _getLlamaLendUserData = (provider, network, address, selectedMarket, marke
     };
     const priceHigh = (0, tokens_1.assetAmountInEth)(data.priceHigh.toString());
     const priceLow = (0, tokens_1.assetAmountInEth)(data.priceLow.toString());
-    const _userBands = data.loanExists ? (yield getAndFormatBands(provider, network, selectedMarket, data.bandRange[0].toString(), data.bandRange[1].toString())) : [];
+    const _userBands = data.loanExists ? (yield getAndFormatBands(provider, network, selectedMarket, data.bandRange[0].toString(), data.bandRange[1].toString(), blockNumber)) : [];
     const status = data.loanExists ? getStatusForUser(data.bandRange.map(b => b.toString()), marketData.activeBand, debtSupplied, collSupplied, healthPercent) : types_1.LlamaLendStatus.Nonexistant;
     const userBands = _userBands.map((band, index) => (Object.assign(Object.assign({}, band), { userDebtAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[0][index].toString(), debtAsset), userCollAmount: (0, tokens_1.assetAmountInEth)(data.usersBands[1][index].toString(), collAsset) }))).sort((a, b) => parseInt(b.id, 10) - parseInt(a.id, 10));
     return Object.assign(Object.assign(Object.assign(Object.assign({}, data), { debtAmount: (0, tokens_1.assetAmountInEth)(data.debtAmount.toString(), debtAsset), health,
@@ -250,11 +250,11 @@ const _getLlamaLendUserData = (provider, network, address, selectedMarket, marke
     })), { userBands });
 });
 exports._getLlamaLendUserData = _getLlamaLendUserData;
-const getLlamaLendUserData = (provider, network, address, selectedMarket, marketData) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLlamaLendUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, marketData); });
+const getLlamaLendUserData = (provider_1, network_1, address_1, selectedMarket_1, marketData_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, marketData_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, marketData, blockNumber = 'latest') { return (0, exports._getLlamaLendUserData)((0, viem_1.getViemProvider)(provider, network), network, address, selectedMarket, marketData, blockNumber); });
 exports.getLlamaLendUserData = getLlamaLendUserData;
-const getLlamaLendFullPositionData = (provider, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
-    const marketData = yield (0, exports.getLlamaLendGlobalData)(provider, network, selectedMarket);
-    const positionData = yield (0, exports.getLlamaLendUserData)(provider, network, address, selectedMarket, marketData);
+const getLlamaLendFullPositionData = (provider_1, network_1, address_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, address_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, address, selectedMarket, blockNumber = 'latest') {
+    const marketData = yield (0, exports.getLlamaLendGlobalData)(provider, network, selectedMarket, blockNumber);
+    const positionData = yield (0, exports.getLlamaLendUserData)(provider, network, address, selectedMarket, marketData, blockNumber);
     return positionData;
 });
 exports.getLlamaLendFullPositionData = getLlamaLendFullPositionData;

package/cjs/maker/index.d.ts

@@ -3,12 +3,12 @@ import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances
 import { CdpData, CdpInfo, IlkInfo } from '../types';
 export declare const _getMakerAccountBalances: (provider: PublicClient, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
 export declare const getMakerAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, cdpId: string, _managerAddress?: EthAddress) => Promise<PositionBalances>;
-export declare const _getUserCdps: (provider: Client, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
-export declare const getUserCdps: (provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress) => Promise<CdpInfo[]>;
-export declare const _getMakerIlksData: (provider: Client, network: NetworkNumber, ilkLabels: string[]) => Promise<Record<string, IlkInfo>>;
-export declare const getMakerIlksData: (provider: EthereumProvider, network: NetworkNumber, ilkLabels: string[]) => Promise<Record<string, IlkInfo>>;
+export declare const _getUserCdps: (provider: Client, network: NetworkNumber, userAddress: EthAddress, blockNumber?: Blockish) => Promise<CdpInfo[]>;
+export declare const getUserCdps: (provider: EthereumProvider, network: NetworkNumber, userAddress: EthAddress, blockNumber?: Blockish) => Promise<CdpInfo[]>;
+export declare const _getMakerIlksData: (provider: Client, network: NetworkNumber, ilkLabels: string[], blockNumber?: Blockish) => Promise<Record<string, IlkInfo>>;
+export declare const getMakerIlksData: (provider: EthereumProvider, network: NetworkNumber, ilkLabels: string[], blockNumber?: Blockish) => Promise<Record<string, IlkInfo>>;
 /**
  * @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
  */
-export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo, ilkInfo?: IlkInfo) => Promise<CdpData>;
-export declare const getMakerCdpData: (provider: EthereumProvider, network: NetworkNumber, cdp: CdpInfo) => Promise<CdpData>;
+export declare const _getMakerCdpData: (provider: Client, network: NetworkNumber, cdp: CdpInfo, ilkInfo?: IlkInfo, blockNumber?: Blockish) => Promise<CdpData>;
+export declare const getMakerCdpData: (provider: EthereumProvider, network: NetworkNumber, cdp: CdpInfo, blockNumber?: Blockish) => Promise<CdpData>;

package/cjs/maker/index.js

@@ -71,12 +71,12 @@ const _getMakerAccountBalances = (provider, network, block, addressMapping, cdpI
 exports._getMakerAccountBalances = _getMakerAccountBalances;
 const getMakerAccountBalances = (provider, network, block, addressMapping, cdpId, _managerAddress) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getMakerAccountBalances)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, block, addressMapping, cdpId, _managerAddress); });
 exports.getMakerAccountBalances = getMakerAccountBalances;
-const _getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void 0, void 0, function* () {
+const _getUserCdps = (provider_1, network_1, userAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, userAddress_1, ...args_1], void 0, function* (provider, network, userAddress, blockNumber = 'latest') {
     if (!userAddress)
         return [];
     const mcdGetCdpsContract = (0, contracts_1.McdGetCdpsContractViem)(provider, network);
     const mcdCdpManagerAddress = (0, contracts_1.getConfigContractAddress)('McdCdpManager', network);
-    const standardCdps = yield mcdGetCdpsContract.read.getCdpsAsc([mcdCdpManagerAddress, userAddress]);
+    const standardCdps = yield mcdGetCdpsContract.read.getCdpsAsc([mcdCdpManagerAddress, userAddress], (0, viem_1.setViemBlockNumber)(blockNumber));
     const parsedStandardCdps = standardCdps[0].map((id, i) => ({
         id: parseInt(id.toString(), 10),
         ilk: standardCdps[2][i].toLowerCase(), // collateral type
@@ -89,39 +89,39 @@ const _getUserCdps = (provider, network, userAddress) => __awaiter(void 0, void
     return parsedStandardCdps;
 });
 exports._getUserCdps = _getUserCdps;
-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); });
+const getUserCdps = (provider_1, network_1, userAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, userAddress_1, ...args_1], void 0, function* (provider, network, userAddress, blockNumber = 'latest') { return (0, exports._getUserCdps)((0, viem_1.getViemProvider)(provider, network), network, userAddress, blockNumber); });
 exports.getUserCdps = getUserCdps;
-const _getMakerIlksData = (provider, network, ilkLabels) => __awaiter(void 0, void 0, void 0, function* () {
+const _getMakerIlksData = (provider_1, network_1, ilkLabels_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ilkLabels_1, ...args_1], void 0, function* (provider, network, ilkLabels, blockNumber = 'latest') {
     const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
     const spotterContract = (0, contracts_1.McdSpotterContractViem)(provider, network);
     const dogContract = (0, contracts_1.McdDogContractViem)(provider, network);
     const jugContract = (0, contracts_1.McdJugContractViem)(provider, network);
-    const par = yield spotterContract.read.par();
+    const par = yield spotterContract.read.par((0, viem_1.setViemBlockNumber)(blockNumber));
     const ilksInfo = yield Promise.all(ilkLabels.map((ilkLabel) => __awaiter(void 0, void 0, void 0, function* () {
         const ilk = (0, tokens_1.stringToBytes)(ilkLabel);
         const [[_, mat], [artGlobal, rate, spot, line, dust], [duty], futureRate, chop,] = yield Promise.all([
-            spotterContract.read.ilks([ilk]),
-            vatContract.read.ilks([ilk]),
-            jugContract.read.ilks([ilk]),
-            jugContract.read.drip([ilk]),
-            dogContract.read.chop([ilk]),
+            spotterContract.read.ilks([ilk], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            vatContract.read.ilks([ilk], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            jugContract.read.ilks([ilk], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            jugContract.read.drip([ilk], (0, viem_1.setViemBlockNumber)(blockNumber)),
+            dogContract.read.chop([ilk], (0, viem_1.setViemBlockNumber)(blockNumber)),
         ]);
         return (0, makerHelpers_1.parseCollateralInfo)(ilk, par.toString(), mat.toString(), artGlobal.toString(), rate.toString(), spot.toString(), line.toString(), dust.toString(), duty.toString(), futureRate.toString(), chop.toString());
     })));
     return Object.fromEntries(ilksInfo.map((ilkInfo) => [ilkInfo.ilkLabel, ilkInfo]));
 });
 exports._getMakerIlksData = _getMakerIlksData;
-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); });
+const getMakerIlksData = (provider_1, network_1, ilkLabels_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, ilkLabels_1, ...args_1], void 0, function* (provider, network, ilkLabels, blockNumber = 'latest') { return (0, exports._getMakerIlksData)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network, ilkLabels, blockNumber); });
 exports.getMakerIlksData = getMakerIlksData;
 /**
  * @param ilkInfo optional precomputed ilk data (from `_getMakerIlksData`); when provided the per-ilk reads are skipped
  */
-const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0, void 0, void 0, function* () {
+const _getMakerCdpData = (provider_1, network_1, cdp_1, ilkInfo_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, cdp_1, ilkInfo_1, ...args_1], void 0, function* (provider, network, cdp, ilkInfo, blockNumber = 'latest') {
     const vatContract = (0, contracts_1.McdVatContractViem)(provider, network);
     const [[ink, art], coll, fetchedIlkInfo, collStakingApy,] = yield Promise.all([
-        vatContract.read.urns([cdp.ilk, cdp.urn]),
-        vatContract.read.gem([cdp.ilk, cdp.urn]),
-        ilkInfo || (0, exports._getMakerIlksData)(provider, network, [cdp.ilkLabel]).then((ilks) => ilks[cdp.ilkLabel]),
+        vatContract.read.urns([cdp.ilk, cdp.urn], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        vatContract.read.gem([cdp.ilk, cdp.urn], (0, viem_1.setViemBlockNumber)(blockNumber)),
+        ilkInfo || (0, exports._getMakerIlksData)(provider, network, [cdp.ilkLabel], blockNumber).then((ilks) => ilks[cdp.ilkLabel]),
         staking_1.STAKING_ASSETS.includes(cdp.asset) ? (0, staking_1.getStakingApy)(cdp.asset) : Promise.resolve('0'),
     ]);
     const collInfo = fetchedIlkInfo;
@@ -186,5 +186,5 @@ const _getMakerCdpData = (provider, network, cdp, ilkInfo) => __awaiter(void 0,
     };
 });
 exports._getMakerCdpData = _getMakerCdpData;
-const getMakerCdpData = (provider, network, cdp) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getMakerCdpData)((0, viem_1.getViemProvider)(provider, network), network, cdp); });
+const getMakerCdpData = (provider_1, network_1, cdp_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, cdp_1, ...args_1], void 0, function* (provider, network, cdp, blockNumber = 'latest') { return (0, exports._getMakerCdpData)((0, viem_1.getViemProvider)(provider, network), network, cdp, undefined, blockNumber); });
 exports.getMakerCdpData = getMakerCdpData;

package/cjs/morphoBlue/index.d.ts

@@ -3,15 +3,15 @@ import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances
 import { MorphoBlueEarnData, MorphoBlueMarketData, MorphoBlueMarketInfo, MorphoBlueMarketRewards, MorphoBluePositionData } from '../types';
 export { MorphoBlueMerklOpportunityType, addMorphoBlueMerklOpportunitiesToMarketInfo, getMorphoBlueMerklOpportunities, addMorphoBlueMerklRewardsToMarketInfo, } from './merkl';
 export declare const addMorphoBlueRewardsToMarketInfo: (marketInfo: MorphoBlueMarketInfo, rewards: MorphoBlueMarketRewards) => MorphoBlueMarketInfo;
-export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
-export declare function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketInfo>;
+export declare function _getMorphoBlueMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber?: Blockish): Promise<MorphoBlueMarketInfo>;
+export declare function _getMorphoBluePortfolioMarketData(provider: Client, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber?: Blockish): Promise<MorphoBlueMarketInfo>;
+export declare function getMorphoBlueMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber?: Blockish): Promise<MorphoBlueMarketInfo>;
+export declare function getMorphoBluePortfolioMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoBlueMarketData, blockNumber?: Blockish): Promise<MorphoBlueMarketInfo>;
 export declare const getMorphoBluePositionDataWithMarketInfo: (data: MorphoBluePositionData, marketInfo: MorphoBlueMarketInfo) => MorphoBluePositionData;
 export declare const getMorphoEarnDataWithMarketInfo: (data: MorphoBlueEarnData, marketInfo: MorphoBlueMarketInfo) => MorphoBlueEarnData;
 export declare function getMorphoBlueMarketRewards(network: NetworkNumber, selectedMarket: MorphoBlueMarketData): Promise<MorphoBlueMarketRewards>;
 export declare const _getMorphoBlueAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
 export declare const getMorphoBlueAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoBlueMarketData) => Promise<PositionBalances>;
-export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
-export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBluePositionData>;
-export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo): Promise<MorphoBlueEarnData>;
+export declare function _getMorphoBlueAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber?: Blockish): Promise<MorphoBluePositionData>;
+export declare function getMorphoBlueAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber?: Blockish): Promise<MorphoBluePositionData>;
+export declare function getMorphoEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoBlueMarketData, marketInfo: MorphoBlueMarketInfo, blockNumber?: Blockish): Promise<MorphoBlueEarnData>;