@lidofinance/lsv-cli 1.3.0 → 1.4.0-alpha.1

package/dist/tests/utils/timestamp.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { formatTimestamp } from '../../utils/timestamp.js';
+import { formatTimestamp } from 'utils/timestamp.js';
 describe('formatTimestamp', () => {
     it('should format timestamp with default format and UTC timezone', () => {
         // 2024-01-15 12:30:00 UTC

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./config.js";
-export * from "./common.js";
+export * from './config.js';
+export * from './common.js';

package/dist/types/index.js

@@ -1,3 +1,3 @@
-export * from "./config.js";
-export * from "./common.js";
+export * from './config.js';
+export * from './common.js';
 //# sourceMappingURL=index.js.map

package/dist/utils/arguments.d.ts

@@ -1,6 +1,6 @@
 import { Permit, RoleAssignment, Tier, Deposit, ValidatorTopUp } from '../types/index.js';
 import { Address, Hex } from 'viem';
-import { PubkeyMap } from '../utils/consolidation/types.js';
+import { PubkeyMap } from 'utils/consolidation/types.js';
 export declare const stringToBigIntArray: (value: string) => bigint[];
 export declare const stringToBigIntArrayWei: (value: string) => bigint[];
 export declare const stringTo2dArray: (value: string) => string[][];
@@ -11,6 +11,19 @@ export declare const jsonFileToPubkeys: (value: string) => PubkeyMap;
 export declare const jsonToRoleAssignment: (value: string) => RoleAssignment[];
 export declare const stringToBigInt: (value: string) => bigint;
 export declare const stringToNumberArray: (value: string) => number[];
+export declare const stringArrayToTokenPairs: (value: string, prev?: {
+    result: {
+        address: Address;
+        amount: string;
+    }[];
+    isAmount: boolean;
+} | undefined) => {
+    result: {
+        address: Address;
+        amount: string;
+    }[];
+    isAmount: boolean;
+};
 export declare const etherToWei: (value: string) => bigint;
 export declare const etherToGwei: (value: string) => bigint;
 export declare const etherToWeiArray: (value: string) => bigint[];
@@ -23,4 +36,5 @@ export declare const parseDeposit: (str: string) => Deposit;
 export declare const parseDepositArray: (str: string) => Deposit[];
 export declare const parseValidatorTopUpArray: (str: string) => ValidatorTopUp[];
 export declare const stringToAddress: (value: string) => Address;
+export declare const stringArrayToAddressArray: (value: string, previous: Address[]) => `0x${string}`[];
 export declare const stringToHash: (value: string) => Hex;

package/dist/utils/arguments.js

@@ -57,6 +57,31 @@ export const stringToBigInt = (value) => {
 export const stringToNumberArray = (value) => {
     return value.split(',').map(Number);
 };
+export const stringArrayToTokenPairs = (value, prev = undefined) => {
+    if (!prev)
+        prev = { result: [], isAmount: false };
+    if (!prev.isAmount) {
+        if (!isAddress(value, { strict: false })) {
+            throw new Error(`Invalid token address: ${value}`);
+        }
+        prev.result.push({ address: value.toLowerCase(), amount: '' });
+        prev.isAmount = true;
+    }
+    else {
+        const numberAmount = Number(value);
+        const prevEntry = prev.result[prev.result.length - 1];
+        if (!prevEntry ||
+            isNaN(numberAmount) ||
+            isAddress(value) ||
+            numberAmount <= 0 ||
+            !value) {
+            throw new Error(`Invalid amount: ${value} for token ${prev.result[prev.result.length - 1]?.address}`);
+        }
+        prevEntry.amount = value;
+        prev.isAmount = false;
+    }
+    return prev;
+};
 export const etherToWei = (value) => {
     return parseEther(value, 'wei');
 };
@@ -161,6 +186,9 @@ export const stringToAddress = (value) => {
     }
     return value;
 };
+export const stringArrayToAddressArray = (value, previous) => {
+    return previous.concat([stringToAddress(value)]);
+};
 export const stringToHash = (value) => {
     if (!isHex(value)) {
         program.error('Hash value must be a valid hash', { exitCode: 1 });

package/dist/utils/arguments.js.map

@@ -1 +1 @@
-{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../utils/arguments.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"arguments.js","sourceRoot":"","sources":["../../utils/arguments.ts"],"names":[],"mappings":"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"}

package/dist/utils/cache.d.ts

@@ -1,3 +1,4 @@
+import { Address } from 'viem';
 export type CachedTransferEvent = {
     blockNumber: string;
     from: string;
@@ -25,9 +26,9 @@ export declare const cache: {
     setSettledGrowth(vaultAddress: string, blockNumber: number, value: bigint): Promise<void>;
     getNodeOperatorAccruedFee(vaultAddress: string, blockNumber: number): Promise<bigint | null>;
     setNodeOperatorAccruedFee(vaultAddress: string, blockNumber: number, value: bigint): Promise<void>;
-    getIndexedEventsByBlock(poolAddress: string, blockNumber: bigint): Promise<CachedEvents | null>;
-    getAllIndexedEvents(poolAddress: string): Promise<Record<string, CachedEvents>>;
-    setIndexedEventsForBlocks(poolAddress: string, eventsMap: Map<bigint, CachedEvents>): Promise<void>;
+    getIndexedEventsByBlock(cacheKey: string, blockNumber: bigint): Promise<CachedEvents | null>;
+    getAllIndexedEvents(cacheKey: string): Promise<Record<string, CachedEvents>>;
+    setIndexedEventsForBlocks(cacheKey: string, eventsMap: Map<bigint, CachedEvents>): Promise<void>;
 };
 export declare const getShareRateFromCache: (blockNumber: number) => Promise<bigint>;
 type GetRebaseRewardFromCacheArgs = {
@@ -35,11 +36,11 @@ type GetRebaseRewardFromCacheArgs = {
     blockNumberPrev: number;
     blockNumberCurr: number;
     liabilitySharesPrev: bigint;
-    liabilitySharesCurr: bigint;
 };
 export declare const getRebaseRewardFromCache: (args: GetRebaseRewardFromCacheArgs) => Promise<bigint>;
 type GetIndexedEventsFromCacheArgs = {
-    poolAddress: string;
+    poolAddress: Address;
+    cacheSuffix?: string;
     startBlock: bigint;
     endBlock: bigint;
     fetchEventsForBlocks: (blocks: bigint[]) => Promise<Map<bigint, CachedEvents>>;

package/dist/utils/cache.js

@@ -134,9 +134,9 @@ export const cache = {
         });
         await fs.writeFile(getNodeOperatorAccruedFeeCacheFile(vaultAddress), JSON.stringify(data), 'utf-8');
     },
-    async getIndexedEventsByBlock(poolAddress, blockNumber) {
+    async getIndexedEventsByBlock(cacheKey, blockNumber) {
         try {
-            const data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(poolAddress), 'utf-8'));
+            const data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(cacheKey), 'utf-8'));
             const key = blockNumber.toString();
             if (data[key] !== undefined)
                 return data[key];
@@ -146,9 +146,9 @@ export const cache = {
         }
         return null;
     },
-    async getAllIndexedEvents(poolAddress) {
+    async getAllIndexedEvents(cacheKey) {
         try {
-            const data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(poolAddress), 'utf-8'));
+            const data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(cacheKey), 'utf-8'));
             return data;
         }
         catch {
@@ -156,10 +156,10 @@ export const cache = {
         }
         return {};
     },
-    async setIndexedEventsForBlocks(poolAddress, eventsMap) {
+    async setIndexedEventsForBlocks(cacheKey, eventsMap) {
         let data = {};
         try {
-            data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(poolAddress), 'utf-8'));
+            data = JSON.parse(await fs.readFile(getIndexedEventsCacheFile(cacheKey), 'utf-8'));
         }
         catch {
             /* ignore */
@@ -168,10 +168,10 @@ export const cache = {
         for (const [blockNumber, events] of eventsMap.entries()) {
             data[blockNumber.toString()] = events;
         }
-        await fs.mkdir(path.dirname(getIndexedEventsCacheFile(poolAddress)), {
+        await fs.mkdir(path.dirname(getIndexedEventsCacheFile(cacheKey)), {
             recursive: true,
         });
-        await fs.writeFile(getIndexedEventsCacheFile(poolAddress), JSON.stringify(data), 'utf-8');
+        await fs.writeFile(getIndexedEventsCacheFile(cacheKey), JSON.stringify(data), 'utf-8');
     },
 };
 export const getShareRateFromCache = async (blockNumber) => {
@@ -183,7 +183,7 @@ export const getShareRateFromCache = async (blockNumber) => {
     return shareRate;
 };
 export const getRebaseRewardFromCache = async (args) => {
-    const { vaultAddress, blockNumberPrev, blockNumberCurr, liabilitySharesPrev, liabilitySharesCurr, } = args;
+    const { vaultAddress, blockNumberPrev, blockNumberCurr, liabilitySharesPrev, } = args;
     const cacheKey = `${blockNumberPrev}_${blockNumberCurr}`;
     const cached = await cache.getRebaseReward(vaultAddress, cacheKey);
     if (cached !== null)
@@ -194,13 +194,13 @@ export const getRebaseRewardFromCache = async (args) => {
         shareRatePrev,
         shareRateCurr,
         sharesPrev: liabilitySharesPrev,
-        sharesCurr: liabilitySharesCurr,
     });
     await cache.setRebaseReward(vaultAddress, cacheKey, reward);
     return reward;
 };
 export const getIndexedEventsFromCache = async (args) => {
-    const { poolAddress, startBlock, endBlock, fetchEventsForBlocks } = args;
+    const { poolAddress, cacheSuffix, startBlock, endBlock, fetchEventsForBlocks, } = args;
+    const CACHE_KEY = poolAddress + (cacheSuffix ? `-${cacheSuffix}` : '');
     const allEvents = {
         transfer: [],
         minted: [],
@@ -209,7 +209,7 @@ export const getIndexedEventsFromCache = async (args) => {
     const blocksToFetch = [];
     const totalBlocks = Number(endBlock - startBlock + 1n);
     // Read cache file once
-    const cachedData = await cache.getAllIndexedEvents(poolAddress);
+    const cachedData = await cache.getAllIndexedEvents(CACHE_KEY);
     const cachedBlocksCount = Object.keys(cachedData).length;
     logInfo(`Cache contains ${cachedBlocksCount} blocks, checking range ${startBlock}-${endBlock} (${totalBlocks} blocks)...`);
     // Check each block in range
@@ -224,6 +224,8 @@ export const getIndexedEventsFromCache = async (args) => {
         }
         else {
             // Block is not cached, need to fetch
+            // TODO: rework to range[] instead of single blocks
+            // for mainnet and earliest-latest range this can produce >20m length bigint[]
             blocksToFetch.push(block);
         }
     }
@@ -239,7 +241,7 @@ export const getIndexedEventsFromCache = async (args) => {
             allEvents.burned.push(...events.burned);
         }
         // Save all new blocks to cache
-        await cache.setIndexedEventsForBlocks(poolAddress, newEventsMap);
+        await cache.setIndexedEventsForBlocks(CACHE_KEY, newEventsMap);
     }
     return allEvents;
 };

package/dist/utils/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../utils/cache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../utils/cache.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/charts-apr.js

@@ -2,7 +2,7 @@ import blessed from 'blessed';
 import contrib from 'blessed-contrib';
 import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
 import { getDashboardContract } from '../../../contracts/index.js';
-import { getNodeOperatorAccruedFeeByBlockNumbers } from '../../../features/index.js';
+import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
 import { lineOpts, getMinMax } from './utils.js';
 import { LIMIT } from './constants.js';
 import { prepareCarrySpread, prepareBottomLine, prepareGrossStakingAPR, prepareLidoAPR, prepareNetStakingAPR, buildLidoAPRChart, buildNetStakingAPRChart, buildCarrySpreadChart, buildBottomLineChart, buildGrossStakingAPRChart, } from './datasets/index.js';
@@ -10,7 +10,11 @@ import { prepareCarrySpread, prepareBottomLine, prepareGrossStakingAPR, prepareL
 const MIN_REPORT_TIMESTAMP = 1750699020;
 export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheUse = true, }) => {
     const dashboardContract = await getDashboardContract(dashboard);
-    const vault = await callReadMethodSilent(dashboardContract, 'stakingVault');
+    const vault = await callReadMethodSilent({
+        contract: dashboardContract,
+        methodName: 'stakingVault',
+        payload: [],
+    });
     const history = await getVaultReportHistory({
         vault,
         cid,
@@ -21,11 +25,11 @@ export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheU
     if (!history || history.length < 2)
         throw new Error('Not enough data');
     const blockNumbers = history.map((r) => r.blockNumber);
-    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
+    const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
     const grossStakingAPR = prepareGrossStakingAPR(history);
-    const netStakingAPR = prepareNetStakingAPR(history, nodeOperatorAccruedFees);
-    const carrySpread = await prepareCarrySpread(history, nodeOperatorAccruedFees, vault);
-    const bottomLine = await prepareBottomLine(history, nodeOperatorAccruedFees, vault);
+    const netStakingAPR = prepareNetStakingAPR(history, noFeeSnapshots);
+    const carrySpread = await prepareCarrySpread(history, noFeeSnapshots, vault);
+    const bottomLine = await prepareBottomLine(history, noFeeSnapshots, vault);
     const lidoAPR = await prepareLidoAPR(history);
     const grossStakingAPRChart = buildGrossStakingAPRChart(grossStakingAPR);
     const netStakingAPRChart = buildNetStakingAPRChart(netStakingAPR);

package/dist/utils/charts/blessed/charts-apr.js.map

@@ -1 +1 @@
-{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,OAAO,MAAM,iBAAiB,CAAC;AAGtC,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AACpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,uCAAuC,EAAE,MAAM,UAAU,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,sBAAsB,EACtB,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,oBAAoB,EACpB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAS7B,qCAAqC;AACrC,MAAM,oBAAoB,GAAG,UAAU,CAAC;AAExC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,GAAG,EACH,SAAS,EACT,KAAK,GAAG,KAAK,EACb,QAAQ,GAAG,IAAI,GACQ,EAAE,EAAE;IAC3B,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC;QACE,KAAK;QACL,GAAG;QACH,KAAK;QACL,YAAY,EAAE,oBAAoB;QAClC,SAAS,EAAE,KAAK;KACjB,EACD,QAAQ,CACT,CAAC;IACF,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAEvE,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,uBAAuB,GAAG,MAAM,uCAAuC,CAC3E,KAAK,EACL,YAAY,EACZ,iBAAiB,CAClB,CAAC;IAEF,MAAM,eAAe,GAAG,sBAAsB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,oBAAoB,CAAC,OAAO,EAAE,uBAAuB,CAAC,CAAC;IAC7E,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAC1C,OAAO,EACP,uBAAuB,EACvB,KAAK,CACN,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,OAAO,EACP,uBAAuB,EACvB,KAAK,CACN,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,OAAO,CAAC,CAAC;IAE9C,MAAM,oBAAoB,GAAG,yBAAyB,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,eAAe,GAAG,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEhD,OAAO;QACL,oBAAoB;QACpB,kBAAkB;QAClB,gBAAgB;QAChB,eAAe;QACf,YAAY;KACb,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,eAAe,EACf,YAAY,GACR,EAAE,EAAE;IACR,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC5B,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,sBAAsB;KAC9B,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK;YACzC,KAAK,EAAE,oBAAoB,CAAC,OAAO,CAAC,KAAK;YACzC,MAAM,EAAE,oBAAoB,CAAC,OAAO,CAAC,MAAM;YAC3C,KAAK,EAAE,oBAAoB,CAAC,KAAK;SAClC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK;YACvC,KAAK,EAAE,kBAAkB,CAAC,OAAO,CAAC,KAAK;YACvC,MAAM,EAAE,kBAAkB,CAAC,OAAO,CAAC,MAAM;YACzC,KAAK,EAAE,kBAAkB,CAAC,KAAK;SAChC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK;YACrC,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,KAAK;YACrC,MAAM,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM;YACvC,KAAK,EAAE,gBAAgB,CAAC,KAAK;SAC9B,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK;YACpC,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,KAAK;YACpC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM;YACtC,KAAK,EAAE,eAAe,CAAC,KAAK;SAC7B,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK;YACjC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK;YACjC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM;YACnC,KAAK,EAAE,YAAY,CAAC,KAAK;SAC1B,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK;YACjC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,KAAK;YACjC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAC,MAAM;YACnC,KAAK,EAAE,SAAS,CAAC;gBACf,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;gBAC/B,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;aAC1B,CAAC;SACH,CAAC,CACH;KACF,CAAC;IAEF,MAAM,QAAQ,GAAG;QACf,oBAAoB,CAAC,OAAO;QAC5B,kBAAkB,CAAC,OAAO;QAC1B,gBAAgB,CAAC,OAAO;QACxB,eAAe,CAAC,OAAO;QACvB,YAAY,CAAC,OAAO;QACpB,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC;KACnD,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;QAC1B,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACxD,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,MAAM,CAAC,MAAM,EAAE,CAAC;AAClB,CAAC,CAAC"}
+{"version":3,"file":"charts-apr.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-apr.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/charts-rewards.js

@@ -2,13 +2,17 @@ import blessed from 'blessed';
 import contrib from 'blessed-contrib';
 import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
 import { getDashboardContract } from '../../../contracts/index.js';
-import { getNodeOperatorAccruedFeeByBlockNumbers } from '../../../features/index.js';
+import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
 import { lineOpts } from './utils.js';
 import { LIMIT } from './constants.js';
 import { prepareNetStakingRewards, prepareNodeOperatorRewards, prepareGrossStakingRewards, buildNetStakingRewardsChart, buildNodeOperatorRewardsChart, buildGrossStakingRewardsChart, } from './datasets/index.js';
 export const fetchRewardsChartsData = async ({ cid, dashboard, limit = LIMIT, cacheUse = true, }) => {
     const dashboardContract = await getDashboardContract(dashboard);
-    const vault = await callReadMethodSilent(dashboardContract, 'stakingVault');
+    const vault = await callReadMethodSilent({
+        contract: dashboardContract,
+        methodName: 'stakingVault',
+        payload: [],
+    });
     const history = await getVaultReportHistory({
         vault,
         cid,
@@ -18,10 +22,10 @@ export const fetchRewardsChartsData = async ({ cid, dashboard, limit = LIMIT, ca
     if (!history || history.length < 2)
         throw new Error('Not enough data');
     const blockNumbers = history.map((r) => r.blockNumber);
-    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
+    const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
     const grossStakingRewards = prepareGrossStakingRewards(history);
-    const nodeOperatorRewards = prepareNodeOperatorRewards(history, nodeOperatorAccruedFees);
-    const netStakingRewards = prepareNetStakingRewards(history, nodeOperatorAccruedFees);
+    const nodeOperatorRewards = prepareNodeOperatorRewards(history, noFeeSnapshots);
+    const netStakingRewards = prepareNetStakingRewards(history, noFeeSnapshots);
     const grossStakingRewardsChart = buildGrossStakingRewardsChart(grossStakingRewards);
     const nodeOperatorRewardsChart = buildNodeOperatorRewardsChart(nodeOperatorRewards);
     const netStakingRewardsChart = buildNetStakingRewardsChart(netStakingRewards);

package/dist/utils/charts/blessed/charts-rewards.js.map

@@ -1 +1 @@
-{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"charts-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/datasets/prepare-metrics.d.ts

@@ -1,5 +1,5 @@
-import { VaultReport } from '../../../index.js';
-export declare const prepareBottomLine: (history: VaultReport[], nodeOperatorAccruedFees: bigint[], vaultAddress: string) => Promise<{
+import { VaultReport, NOFeeSnapshot } from '../../../index.js';
+export declare const prepareBottomLine: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[], vaultAddress: string) => Promise<{
     values: string[];
     timestamp: number[];
 }>;
@@ -7,11 +7,11 @@ export declare const prepareGrossStakingAPR: (history: VaultReport[]) => {
     values: number[];
     timestamp: number[];
 };
-export declare const prepareNetStakingAPR: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
+export declare const prepareNetStakingAPR: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
     values: number[];
     timestamp: number[];
 };
-export declare const prepareCarrySpread: (history: VaultReport[], nodeOperatorAccruedFees: bigint[], vaultAddress: string) => Promise<{
+export declare const prepareCarrySpread: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[], vaultAddress: string) => Promise<{
     values: number[];
     timestamp: number[];
 }>;
@@ -23,11 +23,11 @@ export declare const prepareGrossStakingRewards: (history: VaultReport[]) => {
     values: string[];
     timestamp: number[];
 };
-export declare const prepareNodeOperatorRewards: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
+export declare const prepareNodeOperatorRewards: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
     values: string[];
     timestamp: number[];
 };
-export declare const prepareNetStakingRewards: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
+export declare const prepareNetStakingRewards: (history: VaultReport[], noFeeSnapshots: NOFeeSnapshot[]) => {
     values: string[];
     timestamp: number[];
 };

package/dist/utils/charts/blessed/datasets/prepare-metrics.js

@@ -1,7 +1,8 @@
 import { formatEther } from 'viem';
-import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
+import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, getNodeOperatorFeeForPeriod, EMPTY_NO_FEE_SNAPSHOT, } from '../../../index.js';
 import { getRebaseRewardFromCache, getShareRateFromCache } from '../../../index.js';
-export const prepareBottomLine = async (history, nodeOperatorAccruedFees, vaultAddress) => {
+const snapshotAt = (noFeeSnapshots, i) => noFeeSnapshots[i] ?? EMPTY_NO_FEE_SNAPSHOT;
+export const prepareBottomLine = async (history, noFeeSnapshots, vaultAddress) => {
     const bottomLine = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -13,10 +14,9 @@ export const prepareBottomLine = async (history, nodeOperatorAccruedFees, vaultA
             vaultAddress,
             blockNumberCurr: current.blockNumber,
             blockNumberPrev: previous.blockNumber,
-            liabilitySharesCurr: BigInt(current.data.liabilityShares),
             liabilitySharesPrev: BigInt(previous.data.liabilityShares),
         });
-        const bottomLineValue = getBottomLine(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards);
+        const bottomLineValue = getBottomLine(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1), stEthLiabilityRebaseRewards);
         bottomLine.push(String(bottomLineValue));
         timestamp.push(current.timestamp);
     }
@@ -36,7 +36,7 @@ export const prepareGrossStakingAPR = (history) => {
     }
     return { values: grossStakingAPRPercent, timestamp };
 };
-export const prepareNetStakingAPR = (history, nodeOperatorAccruedFees) => {
+export const prepareNetStakingAPR = (history, noFeeSnapshots) => {
     const netStakingAPRPercent = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -44,13 +44,13 @@ export const prepareNetStakingAPR = (history, nodeOperatorAccruedFees) => {
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = getNetStakingAPR(current, previous, nodeOperatorAccruedFees[i] ?? 0n);
+        const value = getNetStakingAPR(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
         netStakingAPRPercent.push(value.apr_percent);
         timestamp.push(current.timestamp);
     }
     return { values: netStakingAPRPercent, timestamp };
 };
-export const prepareCarrySpread = async (history, nodeOperatorAccruedFees, vaultAddress) => {
+export const prepareCarrySpread = async (history, noFeeSnapshots, vaultAddress) => {
     const carrySpreadPercent = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -62,10 +62,9 @@ export const prepareCarrySpread = async (history, nodeOperatorAccruedFees, vault
             vaultAddress,
             blockNumberCurr: current.blockNumber,
             blockNumberPrev: previous.blockNumber,
-            liabilitySharesCurr: BigInt(current.data.liabilityShares),
             liabilitySharesPrev: BigInt(previous.data.liabilityShares),
         });
-        const value = getCarrySpread(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards);
+        const value = getCarrySpread(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1), stEthLiabilityRebaseRewards);
         carrySpreadPercent.push(value.apr_percent);
         timestamp.push(current.timestamp);
     }
@@ -102,7 +101,7 @@ export const prepareGrossStakingRewards = (history) => {
     }
     return { values: grossStakingRewards, timestamp };
 };
-export const prepareNodeOperatorRewards = (history, nodeOperatorAccruedFees) => {
+export const prepareNodeOperatorRewards = (history, noFeeSnapshots) => {
     const nodeOperatorRewards = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -110,13 +109,13 @@ export const prepareNodeOperatorRewards = (history, nodeOperatorAccruedFees) =>
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = nodeOperatorAccruedFees[i] ?? 0n;
+        const value = getNodeOperatorFeeForPeriod(snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
         nodeOperatorRewards.push(String(formatEther(value)));
         timestamp.push(current.timestamp);
     }
     return { values: nodeOperatorRewards, timestamp };
 };
-export const prepareNetStakingRewards = (history, nodeOperatorAccruedFees) => {
+export const prepareNetStakingRewards = (history, noFeeSnapshots) => {
     const netStakingRewards = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -124,7 +123,7 @@ export const prepareNetStakingRewards = (history, nodeOperatorAccruedFees) => {
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = getNetStakingRewards(current, previous, nodeOperatorAccruedFees[i] ?? 0n);
+        const value = getNetStakingRewards(current, previous, snapshotAt(noFeeSnapshots, i), snapshotAt(noFeeSnapshots, i - 1));
         netStakingRewards.push(String(formatEther(value)));
         timestamp.push(current.timestamp);
     }

package/dist/utils/charts/blessed/datasets/prepare-metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prepare-metrics.js","sourceRoot":"","sources":["../../../../../utils/charts/blessed/datasets/prepare-metrics.ts"],"names":[],"mappings":"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"}

package/dist/utils/charts/blessed/utils.js

@@ -9,8 +9,11 @@ export const getMinMax = (arr) => {
     const hasFloat = arr.some((v) => !Number.isInteger(v));
     let minY, maxY;
     if (hasFloat) {
-        minY = Math.floor((min - range * 0.15) * 10) / 10;
-        maxY = Math.ceil((max + range * 0.15) * 10) / 10;
+        // Scale based on magnitude of max value so tiny floats (e.g. 0.002) don't
+        // get collapsed to 0 by fixed *10/10 rounding
+        const scale = Math.pow(10, -Math.floor(Math.log10(Math.abs(max) || 1)) + 1);
+        minY = Math.floor((min - range * 0.15) * scale) / scale;
+        maxY = Math.ceil((max + range * 0.15) * scale) / scale;
     }
     else {
         minY = Math.floor(min - range * 0.15);