@lidofinance/lsv-cli 1.5.1 → 1.7.0

package/dist/utils/charts/blessed/charts-rewards.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 } from './utils.js';
 import { LIMIT } from './constants.js';
 import { prepareNetStakingRewards, prepareNodeOperatorRewards, prepareGrossStakingRewards, buildNetStakingRewardsChart, buildNodeOperatorRewardsChart, buildGrossStakingRewardsChart, } from './datasets/index.js';
@@ -22,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);
@@ -84,7 +84,7 @@ export const renderRewardsCharts = ({ grossStakingRewardsChart, nodeOperatorRewa
         netStakingRewardsChart.dataset,
         // rewardsBarChart,
     ];
-    charts.forEach((chart, i) => {
+    for (const [i, chart] of charts.entries()) {
         if (chart.type === 'stackedBar' || chart.type === 'bar') {
             chart.setData(datasets[i]);
         }
@@ -94,7 +94,7 @@ export const renderRewardsCharts = ({ grossStakingRewardsChart, nodeOperatorRewa
         else {
             chart.setData([datasets[i]]);
         }
-    });
+    }
     screen.key(['escape', 'q', 'C-c'], () => process.exit(0));
     screen.render();
 };

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":"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,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAS7B,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC3C,GAAG,EACH,SAAS,EACT,KAAK,GAAG,KAAK,EACb,QAAQ,GAAG,IAAI,GACY,EAAE,EAAE;IAC/B,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC;QACvC,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,cAAc;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC;QACE,KAAK;QACL,GAAG;QACH,KAAK;QACL,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,mBAAmB,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,0BAA0B,CACpD,OAAO,EACP,uBAAuB,CACxB,CAAC;IACF,MAAM,iBAAiB,GAAG,wBAAwB,CAChD,OAAO,EACP,uBAAuB,CACxB,CAAC;IAEF,MAAM,wBAAwB,GAC5B,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,wBAAwB,GAC5B,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,sBAAsB,GAAG,2BAA2B,CAAC,iBAAiB,CAAC,CAAC;IAE9E,OAAO;QACL,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;KACvB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,GAClB,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,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,MAAM,EAAE,wBAAwB,CAAC,OAAO,CAAC,MAAM;YAC/C,KAAK,EAAE,wBAAwB,CAAC,KAAK;SACtC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,MAAM,EAAE,wBAAwB,CAAC,OAAO,CAAC,MAAM;YAC/C,KAAK,EAAE,wBAAwB,CAAC,KAAK;SACtC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,KAAK;YAC3C,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,KAAK;YAC3C,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM;YAC7C,KAAK,EAAE,sBAAsB,CAAC,KAAK;SACpC,CAAC,CACH;QACD,6CAA6C;QAC7C,8BAA8B;QAC9B,iBAAiB;QACjB,mBAAmB;QACnB,gBAAgB;QAChB,oBAAoB;QACpB,kBAAkB;QAClB,kCAAkC;QAClC,MAAM;KACP,CAAC;IAEF,4BAA4B;IAC5B,gEAAgE;IAChE,iDAAiD;IACjD,8EAA8E;IAC9E,8CAA8C;IAC9C,SAAS;IACT,QAAQ;IACR,KAAK;IAEL,MAAM,QAAQ,GAAG;QACf,wBAAwB,CAAC,OAAO;QAChC,wBAAwB,CAAC,OAAO;QAChC,sBAAsB,CAAC,OAAO;QAC9B,mBAAmB;KACpB,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-rewards.js","sourceRoot":"","sources":["../../../../utils/charts/blessed/charts-rewards.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,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,wBAAwB,EACxB,0BAA0B,EAC1B,0BAA0B,EAC1B,2BAA2B,EAC3B,6BAA6B,EAC7B,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAS7B,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EAAE,EAC3C,GAAG,EACH,SAAS,EACT,KAAK,GAAG,KAAK,EACb,QAAQ,GAAG,IAAI,GACY,EAAE,EAAE;IAC/B,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC;QACvC,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,cAAc;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC;QACE,KAAK;QACL,GAAG;QACH,KAAK;QACL,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,cAAc,GAAG,MAAM,+BAA+B,CAC1D,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,OAAO,CACR,CAAC;IAEF,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,OAAO,CAAC,CAAC;IAChE,MAAM,mBAAmB,GAAG,0BAA0B,CACpD,OAAO,EACP,cAAc,CACf,CAAC;IACF,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAE5E,MAAM,wBAAwB,GAC5B,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,wBAAwB,GAC5B,6BAA6B,CAAC,mBAAmB,CAAC,CAAC;IACrD,MAAM,sBAAsB,GAAG,2BAA2B,CAAC,iBAAiB,CAAC,CAAC;IAE9E,OAAO;QACL,wBAAwB;QACxB,wBAAwB;QACxB,sBAAsB;KACvB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,EAClC,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,GAClB,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,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,MAAM,EAAE,wBAAwB,CAAC,OAAO,CAAC,MAAM;YAC/C,KAAK,EAAE,wBAAwB,CAAC,KAAK;SACtC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,KAAK,EAAE,wBAAwB,CAAC,OAAO,CAAC,KAAK;YAC7C,MAAM,EAAE,wBAAwB,CAAC,OAAO,CAAC,MAAM;YAC/C,KAAK,EAAE,wBAAwB,CAAC,KAAK;SACtC,CAAC,CACH;QACD,IAAI,CAAC,GAAG,CACN,CAAC,EACD,CAAC,EACD,CAAC,EACD,CAAC,EACD,OAAO,CAAC,IAAI,EACZ,QAAQ,CAAC;YACP,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,KAAK;YAC3C,KAAK,EAAE,sBAAsB,CAAC,OAAO,CAAC,KAAK;YAC3C,MAAM,EAAE,sBAAsB,CAAC,OAAO,CAAC,MAAM;YAC7C,KAAK,EAAE,sBAAsB,CAAC,KAAK;SACpC,CAAC,CACH;QACD,6CAA6C;QAC7C,8BAA8B;QAC9B,iBAAiB;QACjB,mBAAmB;QACnB,gBAAgB;QAChB,oBAAoB;QACpB,kBAAkB;QAClB,kCAAkC;QAClC,MAAM;KACP,CAAC;IAEF,4BAA4B;IAC5B,gEAAgE;IAChE,iDAAiD;IACjD,8EAA8E;IAC9E,8CAA8C;IAC9C,SAAS;IACT,QAAQ;IACR,KAAK;IAEL,MAAM,QAAQ,GAAG;QACf,wBAAwB,CAAC,OAAO;QAChC,wBAAwB,CAAC,OAAO;QAChC,sBAAsB,CAAC,OAAO;QAC9B,mBAAmB;KACpB,CAAC;IAEF,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;QAC1C,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;IACD,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"}

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,7 @@
 import { formatEther } from 'viem';
-import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
-import { getRebaseRewardFromCache, getShareRateFromCache } from '../../../index.js';
-export const prepareBottomLine = async (history, nodeOperatorAccruedFees, vaultAddress) => {
+import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, getNodeOperatorFeeForPeriod, EMPTY_NO_FEE_SNAPSHOT, getRebaseRewardFromCache, getShareRateFromCache, } from '../../../index.js';
+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 +13,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 +35,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 +43,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 +61,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 +100,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 +108,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 +122,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":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,EAEL,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,gBAAgB,EAChB,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,MAAM,OAAO,CAAC;AAExE,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,OAAsB,EACtB,uBAAiC,EACjC,YAAoB,EACpB,EAAE;IACF,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,2BAA2B,GAAG,MAAM,wBAAwB,CAAC;YACjE,YAAY;YACZ,eAAe,EAAE,OAAO,CAAC,WAAW;YACpC,eAAe,EAAE,QAAQ,CAAC,WAAW;YACrC,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;YACzD,mBAAmB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;SAC3D,CAAC,CAAC;QAEH,MAAM,eAAe,GAAG,aAAa,CACnC,OAAO,EACP,QAAQ,EACR,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,EAChC,2BAA2B,CAC5B,CAAC;QAEF,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC;QACzC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsB,EAAE,EAAE;IAC/D,MAAM,sBAAsB,GAAG,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEpD,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,sBAAsB,EAAE,SAAS,EAAE,CAAC;AACvD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAsB,EACtB,uBAAiC,EACjC,EAAE;IACF,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,gBAAgB,CAC5B,OAAO,EACP,QAAQ,EACR,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,CACjC,CAAC;QAEF,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC7C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,OAAsB,EACtB,uBAAiC,EACjC,YAAoB,EACpB,EAAE;IACF,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,2BAA2B,GAAG,MAAM,wBAAwB,CAAC;YACjE,YAAY;YACZ,eAAe,EAAE,OAAO,CAAC,WAAW;YACpC,eAAe,EAAE,QAAQ,CAAC,WAAW;YACrC,mBAAmB,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC;YACzD,mBAAmB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;SAC3D,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,cAAc,CAC1B,OAAO,EACP,QAAQ,EACR,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,EAChC,2BAA2B,CAC5B,CAAC;QAEF,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,SAAS,EAAE,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,OAAsB,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,EAAE,CAAC;IACnB,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,YAAY,GAAG,MAAM,CACzB,MAAM,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAClD,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,CAC1B,MAAM,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,CACjD,CAAC;QACF,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QAE3D,MAAM,KAAK,GAAG,gBAAgB,CAAC,YAAY,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;QAEzE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC;AACxC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,OAAsB,EAAE,EAAE;IACnE,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAExD,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,OAAsB,EACtB,uBAAiC,EACjC,EAAE;IACF,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAE/C,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,OAAsB,EACtB,uBAAiC,EACjC,EAAE;IACF,MAAM,iBAAiB,GAAG,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,oBAAoB,CAChC,OAAO,EACP,QAAQ,EACR,uBAAuB,CAAC,CAAC,CAAC,IAAI,EAAE,CACjC,CAAC;QAEF,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,OAAsB,EAAE,EAAE;IAC7D,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,SAAS,GAAG,EAAE,CAAC;IAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAElD,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,CAAC;AAC9C,CAAC,CAAC"}
+{"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

@@ -1,5 +1,6 @@
 import { LEGEND_WIDTH, LINE_COLORS, LINE_STYLE, NUM_Y_LABELS, SHOW_NTH_LABEL, WHOLE_NUMBERS_ONLY, XLABEL_PADDING, XPADDING, } from './constants.js';
 export const randomColor = () => {
+    // eslint-disable-next-line sonarjs/pseudo-random -- non-security use: chart colors
     return [Math.random() * 255, Math.random() * 255, Math.random() * 255];
 };
 export const getMinMax = (arr) => {
@@ -9,8 +10,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);

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

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

package/dist/utils/charts/overview.js

@@ -1,8 +1,8 @@
 import { formatEther } from 'viem';
 export const logLiabilityBar = (data, barLength = 68) => {
-    const totalValueEth = parseFloat(formatEther(data.totalValue));
-    const liabilitySteth = parseFloat(formatEther(data.stETHLiability));
-    const totalMintingCapacitySteth = parseFloat(formatEther(data.stETHTotalMintingCapacity));
+    const totalValueEth = Number.parseFloat(formatEther(data.totalValue));
+    const liabilitySteth = Number.parseFloat(formatEther(data.stETHLiability));
+    const totalMintingCapacitySteth = Number.parseFloat(formatEther(data.stETHTotalMintingCapacity));
     const liabilityPercentage = liabilitySteth / totalValueEth;
     const reserveRatioPercentage = data.reserveRatioBP / 10000;
     const rebalanceThresholdPercentage = data.forcedRebalanceThresholdBP / 10000;

package/dist/utils/charts/overview.js.map

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

package/dist/utils/charts/simple/simple-charts.js

@@ -1,7 +1,7 @@
 import { formatEther } from 'viem';
 import { getDashboardContract } from '../../../contracts/index.js';
 import { logError, logInfo, callReadMethodSilent, getVaultReportHistory, getGrossStakingAPR, getGrossStakingRewards, getNetStakingAPR, getCarrySpread, getBottomLine, getRebaseRewardFromCache, formatTimestamp, } from '../../index.js';
-import { getNodeOperatorAccruedFeeByBlockNumbers } from '../../../features/index.js';
+import { getNOFeeSnapshotsByBlockNumbers } from '../../../features/index.js';
 import { logGrossStakingAPRChart, logNetStakingAPRChart, logCarrySpreadChart, logBottomLineChart, } from '../metrics.js';
 // TODO: Refactor this file
 // Render simple charts for APR metrics
@@ -40,25 +40,33 @@ export const renderSimpleCharts = async ({ dashboard, cid, limit = 20, cacheUse
     const grossStakingRewards = [];
     const timeLabels = [];
     const blockNumbers = history.map((r) => r.blockNumber);
-    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
+    const noFeeSnapshots = await getNOFeeSnapshotsByBlockNumbers(vault, blockNumbers, dashboardContract, history);
     for (let i = 1; i < history.length; i++) {
         const current = history[i];
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
+        const noFeeCurr = noFeeSnapshots[i] ?? {
+            accruedFee: 0n,
+            settledGrowth: 0n,
+            feeRate: 0n,
+        };
+        const noFeePrev = noFeeSnapshots[i - 1] ?? {
+            accruedFee: 0n,
+            settledGrowth: 0n,
+            feeRate: 0n,
+        };
         const stEthLiabilityRebaseRewards = await getRebaseRewardFromCache({
             vaultAddress: vault,
             blockNumberCurr: current.blockNumber,
             blockNumberPrev: previous.blockNumber,
-            liabilitySharesCurr: BigInt(current.data.liabilityShares),
             liabilitySharesPrev: BigInt(previous.data.liabilityShares),
         });
         grossStakingRewards.push(Number(formatEther(getGrossStakingRewards(current, previous), 'gwei')));
         grossStakingAPRPercent.push(getGrossStakingAPR(current, previous).apr_percent);
-        netStakingAPRPercent.push(getNetStakingAPR(current, previous, nodeOperatorAccruedFees[i] ?? 0n)
-            .apr_percent);
-        carrySpreadPercent.push(getCarrySpread(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards).apr_percent);
-        bottomLine.push(Number(getBottomLine(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards)));
+        netStakingAPRPercent.push(getNetStakingAPR(current, previous, noFeeCurr, noFeePrev).apr_percent);
+        carrySpreadPercent.push(getCarrySpread(current, previous, noFeeCurr, noFeePrev, stEthLiabilityRebaseRewards).apr_percent);
+        bottomLine.push(Number(getBottomLine(current, previous, noFeeCurr, noFeePrev, stEthLiabilityRebaseRewards)));
         timeLabels.push(formatTimestamp(current.timestamp, 'dd.mm hh:mm'));
     }
     logGrossStakingAPRChart(grossStakingAPRPercent, timeLabels);

package/dist/utils/charts/simple/simple-charts.js.map

@@ -1 +1 @@
-{"version":3,"file":"simple-charts.js","sourceRoot":"","sources":["../../../../utils/charts/simple/simple-charts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"simple-charts.js","sourceRoot":"","sources":["../../../../utils/charts/simple/simple-charts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EACL,QAAQ,EACR,OAAO,EACP,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,gBAAgB,EAChB,cAAc,EACd,aAAa,EACb,wBAAwB,EACxB,eAAe,GAChB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,GACnB,MAAM,eAAe,CAAC;AAEvB,2BAA2B;AAE3B,uCAAuC;AACvC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,SAAS,EACT,GAAG,EACH,KAAK,GAAG,EAAE,EACV,QAAQ,GAAG,IAAI,GAMhB,EAAE,EAAE;IACH,MAAM,iBAAiB,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,oBAAoB,CAAC;QACvC,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,cAAc;QAC1B,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IAEH,OAAO,CACL,0CAA0C,KAAK,UAAU,GAAG,SAAS,CACtE,CAAC;IACF,IAAI,OAAO,CAAC;IACZ,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,qBAAqB,CACnC;YACE,KAAK;YACL,GAAG;YACH,KAAK;YACL,SAAS,EAAE,KAAK;SACjB,EACD,QAAQ,CACT,CAAC;IACJ,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,QAAQ,CAAC,+BAA+B,EAAE,CAAC,CAAC,CAAC;QAC7C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,QAAQ,CAAC,0DAA0D,CAAC,CAAC;QACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,sDAAsD;IACtD,MAAM,sBAAsB,GAAG,EAAE,CAAC;IAClC,MAAM,oBAAoB,GAAG,EAAE,CAAC;IAChC,MAAM,kBAAkB,GAAG,EAAE,CAAC;IAC9B,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,kBAAkB;IAClB,wDAAwD;IACxD,MAAM,mBAAmB,GAAG,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,EAAE,CAAC;IAEtB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D,KAAK,EACL,YAAY,EACZ,iBAAiB,EACjB,OAAO,CACR,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAC3B,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAEhC,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,SAAS;QAEpC,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI;YACrC,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,EAAE;SACZ,CAAC;QACF,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI;YACzC,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,EAAE;YACjB,OAAO,EAAE,EAAE;SACZ,CAAC;QAEF,MAAM,2BAA2B,GAAG,MAAM,wBAAwB,CAAC;YACjE,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,OAAO,CAAC,WAAW;YACpC,eAAe,EAAE,QAAQ,CAAC,WAAW;YACrC,mBAAmB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,eAAe,CAAC;SAC3D,CAAC,CAAC;QAEH,mBAAmB,CAAC,IAAI,CACtB,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,CACvE,CAAC;QACF,sBAAsB,CAAC,IAAI,CACzB,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,WAAW,CAClD,CAAC;QACF,oBAAoB,CAAC,IAAI,CACvB,gBAAgB,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,WAAW,CACtE,CAAC;QACF,kBAAkB,CAAC,IAAI,CACrB,cAAc,CACZ,OAAO,EACP,QAAQ,EACR,SAAS,EACT,SAAS,EACT,2BAA2B,CAC5B,CAAC,WAAW,CACd,CAAC;QACF,UAAU,CAAC,IAAI,CACb,MAAM,CACJ,aAAa,CACX,OAAO,EACP,QAAQ,EACR,SAAS,EACT,SAAS,EACT,2BAA2B,CAC5B,CACF,CACF,CAAC;QAEF,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,uBAAuB,CAAC,sBAAsB,EAAE,UAAU,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAC;IACd,qBAAqB,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;IACxD,OAAO,CAAC,IAAI,CAAC,CAAC;IACd,mBAAmB,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;IACpD,OAAO,CAAC,IAAI,CAAC,CAAC;IACd,kBAAkB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC,CAAC"}

package/dist/utils/commands/confirmations.js

@@ -11,16 +11,21 @@ export const CONFIRM_METHODS_MAP = {
 };
 export const formatConfirmationArgs = (args, functionName) => {
     switch (functionName) {
-        case 'setConfirmExpiry':
+        case 'setConfirmExpiry': {
             return CONFIRM_METHODS_MAP.setConfirmExpiry(args);
-        case 'setNodeOperatorFeeRate':
+        }
+        case 'setNodeOperatorFeeRate': {
             return CONFIRM_METHODS_MAP.setNodeOperatorFeeRate(args);
-        case 'changeTier':
+        }
+        case 'changeTier': {
             return CONFIRM_METHODS_MAP.changeTier(args);
-        case 'transferVaultOwnership':
+        }
+        case 'transferVaultOwnership': {
             return CONFIRM_METHODS_MAP.transferVaultOwnership(args);
-        default:
+        }
+        default: {
             throw new Error(`Unknown function: ${functionName}`);
+        }
     }
 };
 export const getConfirmationsInfo = async (contract, abi) => {
@@ -39,7 +44,7 @@ export const getConfirmationsInfo = async (contract, abi) => {
         return;
     }
     const logsData = logs
-        .sort((a, b) => Number(a.blockNumber - b.blockNumber))
+        .toSorted((a, b) => Number(a.blockNumber - b.blockNumber))
         .reduce((acc, log) => {
         const { args } = log;
         const decodedData = decodeFunctionData({
@@ -77,8 +82,10 @@ const filterLogsByVault = (logsData, vault) => {
                 const argVault = decodedData.args[0];
                 return argVault.toLowerCase() === vault.toLowerCase();
             }
-            default:
+            case 'setConfirmExpiry':
+            case 'setNodeOperatorFeeRate': {
                 return false;
+            }
         }
     });
     return entries.reduce((acc, [key, value]) => {
@@ -92,7 +99,7 @@ export const confirmProposal = async ({ contract, additionalContracts, vault, })
     if (!logsData && additionalLogsData.length === 0)
         return;
     const allLogsData = {
-        ...(logsData ?? {}),
+        ...logsData,
         ...additionalLogsData.reduce((acc, curr) => ({ ...acc, ...curr }), {}),
     };
     if (Object.keys(allLogsData).length === 0) {

package/dist/utils/commands/confirmations.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../utils/commands/confirmations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"confirmations.js","sourceRoot":"","sources":["../../../utils/commands/confirmations.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAIlB,WAAW,GAEZ,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,OAAO,CAAC;AAGxE,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAU/B,yBAAyB;AACzB,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,gBAAgB,EAAE,CAAC,IAAyC,EAAE,EAAE,CAC9D,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,QAAQ;IACnC,sBAAsB,EAAE,CAAC,IAA+C,EAAE,EAAE,CAC1E,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACnB,UAAU,EAAE,CAAC,IAAmC,EAAE,EAAE,CAClD,UAAU,IAAI,CAAC,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,CAAC,4BAA4B,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS;IAC9F,sBAAsB,EAAE,CAAC,IAA+C,EAAE,EAAE,CAC1E,cAAc,IAAI,CAAC,CAAC,CAAC,EAAE;CACjB,CAAC;AAwBX,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,IAGsB,EACtB,YAA0B,EAC1B,EAAE;IACF,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,kBAAkB,CAAC,CAAC,CAAC;YACxB,OAAO,mBAAmB,CAAC,gBAAgB,CACzC,IAA2C,CAC5C,CAAC;QACJ,CAAC;QACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;YAC9B,OAAO,mBAAmB,CAAC,sBAAsB,CAC/C,IAAiD,CAClD,CAAC;QACJ,CAAC;QACD,KAAK,YAAY,CAAC,CAAC,CAAC;YAClB,OAAO,mBAAmB,CAAC,UAAU,CACnC,IAAqC,CACtC,CAAC;QACJ,CAAC;QACD,KAAK,wBAAwB,CAAC,CAAC,CAAC;YAC9B,OAAO,mBAAmB,CAAC,sBAAsB,CAC/C,IAAiD,CAClD,CAAC;QACJ,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,qBAAqB,YAAY,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,QAAW,EACX,GAAQ,EACR,EAAE;IACF,MAAM,YAAY,GAAG,MAAM,eAAe,EAAE,CAAC;IAC7C,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC7D,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,cAAc,EAAE,CAAC;IACzD,MAAM,qBAAqB,GAAG,aAAa,GAAG,kBAAkB,CAAC;IAEjE,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,iBAAiB,CAAC;QAChD,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,GAAG,EAAE,QAAQ,CAAC,GAAG;QACjB,SAAS,EAAE,qBAAqB;QAChC,SAAS,EAAE,YAAY,GAAG,qBAAqB;QAC/C,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IAED,MAAM,QAAQ,GAAa,IAAI;SAC5B,QAAQ,CAAC,CAAC,CAA0B,EAAE,CAA0B,EAAE,EAAE,CACnE,MAAM,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC,CACtC;SACA,MAAM,CAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;QACrB,MAAM,WAAW,GAAG,kBAAkB,CAAC;YACrC,GAAG;YACH,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAgB,CAAC;QAElB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,UAAU,EAAE,IAAI,IAAI,CAClB,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,IAAI,CACpC,CAAC,cAAc,EAAE;YAClB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW;SACZ,CAAC;QAEF,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAET,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE;QAC/D,MAAM,aAAa,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC;YACrD,IAAW;YACX,aAAa;SACd,CAAC,CAAC;QACH,IAAI,aAAa,KAAK,EAAE;YAAE,OAAO,QAAQ,CAAC,IAAW,CAAC,CAAC;IACzD,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,QAAkB,EAAE,KAAe,EAAY,EAAE;IAC1E,IAAI,CAAC,KAAK;QAAE,OAAO,QAAQ,CAAC;IAE5B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE;QAC3D,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC7B,QAAQ,WAAW,CAAC,YAAY,EAAE,CAAC;YACjC,KAAK,YAAY,CAAC;YAClB,KAAK,wBAAwB,CAAC,CAAC,CAAC;gBAC9B,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACrC,OAAO,QAAQ,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,WAAW,EAAE,CAAC;YACxD,CAAC;YACD,KAAK,kBAAkB,CAAC;YACxB,KAAK,wBAAwB,CAAC,CAAC,CAAC;gBAC9B,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,MAAM,CAAW,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QACpD,GAAG,CAAC,GAAU,CAAC,GAAG,KAAK,CAAC;QACxB,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAc,CAAC,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAkC,EACpE,QAAQ,EACR,mBAAmB,EACnB,KAAK,GAKN,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,mBAAmB,EAAE,GAAG,CAAC,CAAC,kBAAkB,EAAE,EAAE,CAC9C,oBAAoB,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,GAAG,CAAC,CACjE,IAAI,EAAE,CACR,CAAC;IACF,IAAI,CAAC,QAAQ,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IACzD,MAAM,WAAW,GAAG;QAClB,GAAG,QAAQ;QACX,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;KACvE,CAAC;IAEF,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1C,OAAO,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACpC,OAAO;IACT,CAAC;IACD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAE/D,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/C,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAC5D,OAAO;IACT,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IACD,MAAM,GAAG,GAAG,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,oDAAoD;IACpD,MAAM,aAAa,GAAG,sBAAsB,CAC1C,GAAG,CAAC,WAAW,CAAC,IAAI,EACpB,GAAG,CAAC,WAAW,CAAC,YAAY,CAC7B,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC;MACE,GAAG,CAAC,WAAW,CAAC,YAAY,KAAK,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,aAAa;cAC3E,GAAG,CAAC,MAAM;oBACJ,GAAG,CAAC,aAAa;cACvB,GAAG,CAAC,UAAU,EAAE,CAC3B,CAAC;IACF,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}

package/dist/utils/consolidation/validator-info.d.ts

@@ -1,4 +1,4 @@
 import { Hex } from 'viem';
-import { ValidatorsInfo } from '../fetchCL.js';
+import { ValidatorsInfo } from '../fetch-cl.js';
 import { TargetAndSourceValidators } from './types.js';
 export declare const getTargetAndSourceValidatorsInfo: (targetPubkeys: Hex[], targetValidatorsInfo: ValidatorsInfo, sourcePubkeys: Hex[][], sourceValidatorsInfo: ValidatorsInfo) => TargetAndSourceValidators;

package/dist/utils/consolidation/validator-info.js

@@ -1,7 +1,7 @@
 import { parseGwei } from 'viem';
 export const getTargetAndSourceValidatorsInfo = (targetPubkeys, targetValidatorsInfo, sourcePubkeys, sourceValidatorsInfo) => {
     const targetAndSourceValidatorsInfo = new Map();
-    targetPubkeys.forEach((targetPubkey, i) => {
+    for (const [i, targetPubkey] of targetPubkeys.entries()) {
         const targetValidatorInfo = targetValidatorsInfo.data.find((validator) => validator.validator.pubkey === targetPubkey);
         if (!targetValidatorInfo) {
             throw new Error(`Target validator with pubkey ${targetPubkey} not found`);
@@ -16,7 +16,7 @@ export const getTargetAndSourceValidatorsInfo = (targetPubkeys, targetValidators
             sourceValidators: new Map(),
         });
         const sourcePubkeysGroup = sourcePubkeys[i] ?? [];
-        sourcePubkeysGroup.forEach((sourcePubkey) => {
+        for (const sourcePubkey of sourcePubkeysGroup) {
             const sourceValidatorInfo = sourceValidatorsInfo.data.find((validator) => validator.validator.pubkey === sourcePubkey);
             if (!sourceValidatorInfo) {
                 throw new Error(`Source validator with pubkey ${sourcePubkey} not found`);
@@ -29,8 +29,8 @@ export const getTargetAndSourceValidatorsInfo = (targetPubkeys, targetValidators
                 index: sourceValidatorInfo.index,
                 effectiveBalance: parseGwei(sourceValidatorInfo.validator.effective_balance),
             });
-        });
-    });
+        }
+    }
     return targetAndSourceValidatorsInfo;
 };
 //# sourceMappingURL=validator-info.js.map

package/dist/utils/consolidation/validator-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"validator-info.js","sourceRoot":"","sources":["../../../utils/consolidation/validator-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,SAAS,EAAE,MAAM,MAAM,CAAC;AAMtC,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,aAAoB,EACpB,oBAAoC,EACpC,aAAsB,EACtB,oBAAoC,EACT,EAAE;IAC7B,MAAM,6BAA6B,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC3E,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE;QACxC,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CACxD,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,YAAY,CAC3D,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,YAAY,CAAC,CAAC;QAC5E,CAAC;QACD,6BAA6B,CAAC,GAAG,CAAC,YAAY,EAAE;YAC9C,IAAI,EAAE;gBACJ,MAAM,EAAE,mBAAmB,CAAC,MAAM;gBAClC,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAC/C,KAAK,EAAE,mBAAmB,CAAC,KAAK;gBAChC,gBAAgB,EAAE,SAAS,CACzB,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAChD;aACF;YACD,gBAAgB,EAAE,IAAI,GAAG,EAAE;SAC5B,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClD,kBAAkB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE;YAC1C,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CACxD,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,YAAY,CAC3D,CAAC;YACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CACb,gCAAgC,YAAY,YAAY,CACzD,CAAC;YACJ,CAAC;YACD,6BAA6B;iBAC1B,GAAG,CAAC,YAAY,CAAC;gBAClB,EAAE,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE;gBACnC,MAAM,EAAE,mBAAmB,CAAC,MAAM;gBAClC,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAC/C,KAAK,EAAE,mBAAmB,CAAC,KAAK;gBAChC,gBAAgB,EAAE,SAAS,CACzB,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAChD;aACF,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,6BAA6B,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"validator-info.js","sourceRoot":"","sources":["../../../utils/consolidation/validator-info.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,SAAS,EAAE,MAAM,MAAM,CAAC;AAMtC,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAC9C,aAAoB,EACpB,oBAAoC,EACpC,aAAsB,EACtB,oBAAoC,EACT,EAAE;IAC7B,MAAM,6BAA6B,GAA8B,IAAI,GAAG,EAAE,CAAC;IAC3E,KAAK,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CACxD,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,YAAY,CAC3D,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,YAAY,CAAC,CAAC;QAC5E,CAAC;QACD,6BAA6B,CAAC,GAAG,CAAC,YAAY,EAAE;YAC9C,IAAI,EAAE;gBACJ,MAAM,EAAE,mBAAmB,CAAC,MAAM;gBAClC,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAC/C,KAAK,EAAE,mBAAmB,CAAC,KAAK;gBAChC,gBAAgB,EAAE,SAAS,CACzB,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAChD;aACF;YACD,gBAAgB,EAAE,IAAI,GAAG,EAAE;SAC5B,CAAC,CAAC;QACH,MAAM,kBAAkB,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAClD,KAAK,MAAM,YAAY,IAAI,kBAAkB,EAAE,CAAC;YAC9C,MAAM,mBAAmB,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CACxD,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,KAAK,YAAY,CAC3D,CAAC;YACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CACb,gCAAgC,YAAY,YAAY,CACzD,CAAC;YACJ,CAAC;YACD,6BAA6B;iBAC1B,GAAG,CAAC,YAAY,CAAC;gBAClB,EAAE,gBAAgB,CAAC,GAAG,CAAC,YAAY,EAAE;gBACnC,MAAM,EAAE,mBAAmB,CAAC,MAAM;gBAClC,OAAO,EAAE,SAAS,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBAC/C,KAAK,EAAE,mBAAmB,CAAC,KAAK;gBAChC,gBAAgB,EAAE,SAAS,CACzB,mBAAmB,CAAC,SAAS,CAAC,iBAAiB,CAChD;aACF,CAAC,CAAC;QACP,CAAC;IACH,CAAC;IACD,OAAO,6BAA6B,CAAC;AACvC,CAAC,CAAC"}

package/dist/utils/consolidation/validators-checks.d.ts

@@ -1,5 +1,5 @@
 import { Hex } from 'viem';
-import { ValidatorsInfo } from '../fetchCL.js';
+import { ValidatorsInfo } from '../fetch-cl.js';
 import { TargetAndSourceValidators } from './types.js';
 export declare const getValidatorsInfo: (sourcePubkeys: Hex[][], targetPubkeys: Hex[]) => Promise<{
     sourceValidatorsInfo: ValidatorsInfo;

package/dist/utils/consolidation/validators-checks.js

@@ -1,5 +1,5 @@
-import assert from 'assert';
-import { finalityCheckpoints, fetchValidatorsInfo, } from '../fetchCL.js';
+import assert from 'node:assert';
+import { finalityCheckpoints, fetchValidatorsInfo, } from '../fetch-cl.js';
 const MIN_256_EPOCHS = 256;
 export const getValidatorsInfo = async (sourcePubkeys, targetPubkeys) => {
     const finalityCheckpointsInfo = await finalityCheckpoints();
@@ -25,18 +25,18 @@ export const getValidatorsInfo = async (sourcePubkeys, targetPubkeys) => {
 export const checkSourceValidators = (sourceValidatorsInfoData, finalizedEpoch) => {
     const incorrectWCSourceValidators = sourceValidatorsInfoData.filter((validator) => !validator.validator.withdrawal_credentials.startsWith('0x01') &&
         !validator.validator.withdrawal_credentials.startsWith('0x02'));
-    assert(incorrectWCSourceValidators.length === 0, 'All source pubkeys must have a withdrawal credentials starting with 0x01 or 0x02. Wrong pubkeys:' +
+    assert.ok(incorrectWCSourceValidators.length === 0, 'All source pubkeys must have a withdrawal credentials starting with 0x01 or 0x02. Wrong pubkeys:' +
         incorrectWCSourceValidators.map((v) => v.validator.pubkey).join(', '));
     const sourceValidatorsWithLess256Epochs = sourceValidatorsInfoData.filter((validator) => finalizedEpoch - Number(validator.validator.activation_epoch) <
         MIN_256_EPOCHS);
-    assert(sourceValidatorsWithLess256Epochs.length === 0, 'All source pubkeys must have an activation epoch less than the finalized epoch by at least 256 epochs. Wrong pubkeys:' +
+    assert.ok(sourceValidatorsWithLess256Epochs.length === 0, 'All source pubkeys must have an activation epoch less than the finalized epoch by at least 256 epochs. Wrong pubkeys:' +
         sourceValidatorsWithLess256Epochs
             .map((v) => v.validator.pubkey)
             .join(', '));
 };
 export const checkTargetValidators = (targetValidatorsInfoData) => {
     const wrongWCTargetValidators = targetValidatorsInfoData.filter((validator) => !validator.validator.withdrawal_credentials.startsWith('0x02'));
-    assert(wrongWCTargetValidators.length === 0, 'All target pubkeys must have a withdrawal credentials starting with 0x02. Wrong pubkeys:' +
+    assert.ok(wrongWCTargetValidators.length === 0, 'All target pubkeys must have a withdrawal credentials starting with 0x02. Wrong pubkeys:' +
         wrongWCTargetValidators.map((v) => v.validator.pubkey).join(', '));
 };
 export const removeInactiveValidators = (targetAndSourceValidators) => {

package/dist/utils/consolidation/validators-checks.js.map

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

package/dist/utils/csv-file.js

@@ -11,7 +11,7 @@ const escapeCsv = (s, delimiter) => {
         s.includes('"') ||
         s.includes('\n') ||
         s.includes('\r');
-    const escaped = s.replace(/"/g, '""');
+    const escaped = s.replaceAll('"', '""');
     return needsQuote ? `"${escaped}"` : escaped;
 };
 const rowsToCsv = (rows, delimiter) => rows

package/dist/utils/csv-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"csv-file.js","sourceRoot":"","sources":["../../utils/csv-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,UAAU,GAAG,CAAC,CAAU,EAAU,EAAE;IACxC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC7C,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,SAAiB,EAAU,EAAE;IACzD,MAAM,UAAU,GACd,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QACrB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QACf,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,SAAiB,EAAU,EAAE,CAChE,IAAI;KACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,IAAI,EACJ,IAAI,EACJ,SAAS,GAAG,GAAG,EACf,OAAO,GAMR,EAAE,EAAE;IACH,IAAI,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAe,EAAE,CAAC;QAE5B,SAAS;QACT,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QAEzD,OAAO;QACP,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YACjC,CAAC;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE3B,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"csv-file.js","sourceRoot":"","sources":["../../utils/csv-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,UAAU,CAAC;AAE1B,MAAM,UAAU,GAAG,CAAC,CAAU,EAAU,EAAE;IACxC,IAAI,OAAO,CAAC,KAAK,QAAQ;QAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC7C,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,SAAiB,EAAU,EAAE;IACzD,MAAM,UAAU,GACd,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;QACrB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QACf,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QAChB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxC,OAAO,UAAU,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,SAAiB,EAAU,EAAE,CAChE,IAAI;KACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjE,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAEvB,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,EACxB,IAAI,EACJ,IAAI,EACJ,SAAS,GAAG,GAAG,EACf,OAAO,GAMR,EAAE,EAAE;IACH,IAAI,CAAC;QACH,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAEtD,MAAM,IAAI,GAAe,EAAE,CAAC;QAE5B,SAAS;QACT,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QAEzD,OAAO;QACP,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YACjC,CAAC;iBAAM,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;gBAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;YAChD,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAED,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACvC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE3B,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACpD,CAAC;AACH,CAAC,CAAC"}