@lidofinance/lsv-cli 1.1.0 → 1.2.0

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

@@ -1,14 +1,15 @@
 import blessed from 'blessed';
 import contrib from 'blessed-contrib';
-import { callReadMethodSilent, cache, getVaultReportHistory } from '../../index.js';
+import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
 import { getDashboardContract } from '../../../contracts/index.js';
+import { getNodeOperatorAccruedFeeByBlockNumbers } 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';
 // Reports rework - adding inOutDelta
 const MIN_REPORT_TIMESTAMP = 1750699020;
 export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheUse = true, }) => {
-    const dashboardContract = getDashboardContract(dashboard);
+    const dashboardContract = await getDashboardContract(dashboard);
     const vault = await callReadMethodSilent(dashboardContract, 'stakingVault');
     const history = await getVaultReportHistory({
         vault,
@@ -19,23 +20,12 @@ export const fetchAprChartsData = async ({ cid, dashboard, limit = LIMIT, cacheU
     }, cacheUse);
     if (!history || history.length < 2)
         throw new Error('Not enough data');
-    // Get nodeOperatorFeeBP for each report block with caching
-    const nodeOperatorFeeBPs = [];
-    for (const r of history) {
-        let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
-        if (fee === null) {
-            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
-                blockNumber: BigInt(r.blockNumber),
-            });
-            fee = BigInt(feeRate);
-            await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
-        }
-        nodeOperatorFeeBPs.push(fee);
-    }
+    const blockNumbers = history.map((r) => r.blockNumber);
+    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
     const grossStakingAPR = prepareGrossStakingAPR(history);
-    const netStakingAPR = prepareNetStakingAPR(history, nodeOperatorFeeBPs);
-    const carrySpread = await prepareCarrySpread(history, nodeOperatorFeeBPs, vault);
-    const bottomLine = await prepareBottomLine(history, nodeOperatorFeeBPs, vault);
+    const netStakingAPR = prepareNetStakingAPR(history, nodeOperatorAccruedFees);
+    const carrySpread = await prepareCarrySpread(history, nodeOperatorAccruedFees, vault);
+    const bottomLine = await prepareBottomLine(history, nodeOperatorAccruedFees, 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":"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"}
+{"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

@@ -1,12 +1,13 @@
 import blessed from 'blessed';
 import contrib from 'blessed-contrib';
-import { callReadMethodSilent, cache, getVaultReportHistory } from '../../index.js';
+import { callReadMethodSilent, getVaultReportHistory } from '../../index.js';
 import { getDashboardContract } from '../../../contracts/index.js';
+import { getNodeOperatorAccruedFeeByBlockNumbers } 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 = getDashboardContract(dashboard);
+    const dashboardContract = await getDashboardContract(dashboard);
     const vault = await callReadMethodSilent(dashboardContract, 'stakingVault');
     const history = await getVaultReportHistory({
         vault,
@@ -16,22 +17,11 @@ export const fetchRewardsChartsData = async ({ cid, dashboard, limit = LIMIT, ca
     }, cacheUse);
     if (!history || history.length < 2)
         throw new Error('Not enough data');
-    // Get nodeOperatorFeeBP for each report block with caching
-    const nodeOperatorFeeBPs = [];
-    for (const r of history) {
-        let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
-        if (fee === null) {
-            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
-                blockNumber: BigInt(r.blockNumber),
-            });
-            fee = BigInt(feeRate);
-            await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
-        }
-        nodeOperatorFeeBPs.push(fee);
-    }
+    const blockNumbers = history.map((r) => r.blockNumber);
+    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
     const grossStakingRewards = prepareGrossStakingRewards(history);
-    const nodeOperatorRewards = prepareNodeOperatorRewards(history, nodeOperatorFeeBPs);
-    const netStakingRewards = prepareNetStakingRewards(history, nodeOperatorFeeBPs);
+    const nodeOperatorRewards = prepareNodeOperatorRewards(history, nodeOperatorAccruedFees);
+    const netStakingRewards = prepareNetStakingRewards(history, nodeOperatorAccruedFees);
     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[], nodeOperatorFeeBPs: bigint[], vaultAddress: string) => Promise<{
+export declare const prepareBottomLine: (history: VaultReport[], nodeOperatorAccruedFees: bigint[], 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[], nodeOperatorFeeBPs: bigint[]) => {
+export declare const prepareNetStakingAPR: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
     values: number[];
     timestamp: number[];
 };
-export declare const prepareCarrySpread: (history: VaultReport[], nodeOperatorFeeBPs: bigint[], vaultAddress: string) => Promise<{
+export declare const prepareCarrySpread: (history: VaultReport[], nodeOperatorAccruedFees: bigint[], 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[], nodeOperatorFeeBPs: bigint[]) => {
+export declare const prepareNodeOperatorRewards: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
     values: string[];
     timestamp: number[];
 };
-export declare const prepareNetStakingRewards: (history: VaultReport[], nodeOperatorFeeBPs: bigint[]) => {
+export declare const prepareNetStakingRewards: (history: VaultReport[], nodeOperatorAccruedFees: bigint[]) => {
     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, getNodeOperatorRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
+import { getBottomLine, getGrossStakingAPR, getNetStakingAPR, getCarrySpread, calculateLidoAPR, getGrossStakingRewards, getNetStakingRewards, getDailyLidoFees, } from '../../../index.js';
 import { getRebaseRewardFromCache, getShareRateFromCache } from '../../../index.js';
-export const prepareBottomLine = async (history, nodeOperatorFeeBPs, vaultAddress) => {
+export const prepareBottomLine = async (history, nodeOperatorAccruedFees, vaultAddress) => {
     const bottomLine = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -16,7 +16,7 @@ export const prepareBottomLine = async (history, nodeOperatorFeeBPs, vaultAddres
             liabilitySharesCurr: BigInt(current.data.liabilityShares),
             liabilitySharesPrev: BigInt(previous.data.liabilityShares),
         });
-        const bottomLineValue = getBottomLine(current, previous, nodeOperatorFeeBPs[i] ?? 0n, stEthLiabilityRebaseRewards);
+        const bottomLineValue = getBottomLine(current, previous, nodeOperatorAccruedFees[i] ?? 0n, 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, nodeOperatorFeeBPs) => {
+export const prepareNetStakingAPR = (history, nodeOperatorAccruedFees) => {
     const netStakingAPRPercent = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -44,13 +44,13 @@ export const prepareNetStakingAPR = (history, nodeOperatorFeeBPs) => {
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = getNetStakingAPR(current, previous, nodeOperatorFeeBPs[i] ?? 0n);
+        const value = getNetStakingAPR(current, previous, nodeOperatorAccruedFees[i] ?? 0n);
         netStakingAPRPercent.push(value.apr_percent);
         timestamp.push(current.timestamp);
     }
     return { values: netStakingAPRPercent, timestamp };
 };
-export const prepareCarrySpread = async (history, nodeOperatorFeeBPs, vaultAddress) => {
+export const prepareCarrySpread = async (history, nodeOperatorAccruedFees, vaultAddress) => {
     const carrySpreadPercent = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -65,7 +65,7 @@ export const prepareCarrySpread = async (history, nodeOperatorFeeBPs, vaultAddre
             liabilitySharesCurr: BigInt(current.data.liabilityShares),
             liabilitySharesPrev: BigInt(previous.data.liabilityShares),
         });
-        const value = getCarrySpread(current, previous, nodeOperatorFeeBPs[i] ?? 0n, stEthLiabilityRebaseRewards);
+        const value = getCarrySpread(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards);
         carrySpreadPercent.push(value.apr_percent);
         timestamp.push(current.timestamp);
     }
@@ -102,7 +102,7 @@ export const prepareGrossStakingRewards = (history) => {
     }
     return { values: grossStakingRewards, timestamp };
 };
-export const prepareNodeOperatorRewards = (history, nodeOperatorFeeBPs) => {
+export const prepareNodeOperatorRewards = (history, nodeOperatorAccruedFees) => {
     const nodeOperatorRewards = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -110,13 +110,13 @@ export const prepareNodeOperatorRewards = (history, nodeOperatorFeeBPs) => {
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = getNodeOperatorRewards(current, previous, nodeOperatorFeeBPs[i] ?? 0n);
+        const value = nodeOperatorAccruedFees[i] ?? 0n;
         nodeOperatorRewards.push(String(formatEther(value)));
         timestamp.push(current.timestamp);
     }
     return { values: nodeOperatorRewards, timestamp };
 };
-export const prepareNetStakingRewards = (history, nodeOperatorFeeBPs) => {
+export const prepareNetStakingRewards = (history, nodeOperatorAccruedFees) => {
     const netStakingRewards = [];
     const timestamp = [];
     for (let i = 1; i < history.length; i++) {
@@ -124,7 +124,7 @@ export const prepareNetStakingRewards = (history, nodeOperatorFeeBPs) => {
         const previous = history[i - 1];
         if (!current || !previous)
             continue;
-        const value = getNetStakingRewards(current, previous, nodeOperatorFeeBPs[i] ?? 0n);
+        const value = getNetStakingRewards(current, previous, nodeOperatorAccruedFees[i] ?? 0n);
         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/simple/simple-charts.js

@@ -1,11 +1,12 @@
 import { formatEther } from 'viem';
 import { getDashboardContract } from '../../../contracts/index.js';
-import { logError, logInfo, callReadMethodSilent, getVaultReportHistory, cache, getGrossStakingAPR, getGrossStakingRewards, getNetStakingAPR, getCarrySpread, getBottomLine, getRebaseRewardFromCache, formatTimestamp, } from '../../index.js';
+import { logError, logInfo, callReadMethodSilent, getVaultReportHistory, getGrossStakingAPR, getGrossStakingRewards, getNetStakingAPR, getCarrySpread, getBottomLine, getRebaseRewardFromCache, formatTimestamp, } from '../../index.js';
+import { getNodeOperatorAccruedFeeByBlockNumbers } from '../../../features/index.js';
 import { logGrossStakingAPRChart, logNetStakingAPRChart, logCarrySpreadChart, logBottomLineChart, } from '../metrics.js';
 // TODO: Refactor this file
 // Render simple charts for APR metrics
 export const renderSimpleCharts = async ({ dashboard, cid, limit = 20, cacheUse = true, }) => {
-    const dashboardContract = getDashboardContract(dashboard);
+    const dashboardContract = await getDashboardContract(dashboard);
     const vault = await callReadMethodSilent(dashboardContract, 'stakingVault');
     logInfo(`\n=== Getting report history for vault ${vault} (CID: ${cid}) ===\n`);
     let history;
@@ -34,19 +35,8 @@ export const renderSimpleCharts = async ({ dashboard, cid, limit = 20, cacheUse
     // eslint-disable-next-line sonarjs/no-unused-collection
     const grossStakingRewards = [];
     const timeLabels = [];
-    // Get nodeOperatorFeeBP for each report block with caching
-    const nodeOperatorFeeBPs = [];
-    for (const r of history) {
-        let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
-        if (fee === null) {
-            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
-                blockNumber: BigInt(r.blockNumber),
-            });
-            fee = BigInt(feeRate);
-            await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
-        }
-        nodeOperatorFeeBPs.push(fee);
-    }
+    const blockNumbers = history.map((r) => r.blockNumber);
+    const nodeOperatorAccruedFees = await getNodeOperatorAccruedFeeByBlockNumbers(vault, blockNumbers, dashboardContract);
     for (let i = 1; i < history.length; i++) {
         const current = history[i];
         const previous = history[i - 1];
@@ -61,10 +51,10 @@ export const renderSimpleCharts = async ({ dashboard, cid, limit = 20, cacheUse
         });
         grossStakingRewards.push(Number(formatEther(getGrossStakingRewards(current, previous), 'gwei')));
         grossStakingAPRPercent.push(getGrossStakingAPR(current, previous).apr_percent);
-        netStakingAPRPercent.push(getNetStakingAPR(current, previous, nodeOperatorFeeBPs[i] ?? 0n)
+        netStakingAPRPercent.push(getNetStakingAPR(current, previous, nodeOperatorAccruedFees[i] ?? 0n)
             .apr_percent);
-        carrySpreadPercent.push(getCarrySpread(current, previous, nodeOperatorFeeBPs[i] ?? 0n, stEthLiabilityRebaseRewards).apr_percent);
-        bottomLine.push(Number(getBottomLine(current, previous, nodeOperatorFeeBPs[i] ?? 0n, stEthLiabilityRebaseRewards)));
+        carrySpreadPercent.push(getCarrySpread(current, previous, nodeOperatorAccruedFees[i] ?? 0n, stEthLiabilityRebaseRewards).apr_percent);
+        bottomLine.push(Number(getBottomLine(current, previous, nodeOperatorAccruedFees[i] ?? 0n, 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":"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"}

package/dist/utils/commands/confirmations.js

@@ -24,7 +24,7 @@ export const formatConfirmationArgs = (args, functionName) => {
     }
 };
 export const getConfirmationsInfo = async (contract, abi) => {
-    const publicClient = getPublicClient();
+    const publicClient = await getPublicClient();
     const confirmExpire = await contract.read.getConfirmExpiry();
     const currentBlock = await publicClient.getBlockNumber();
     const confirmExpireInBlocks = confirmExpire / AVG_BLOCK_TIME_SEC;

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":"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"}

package/dist/utils/commands/report.d.ts

@@ -3,5 +3,5 @@ type SubmitReportArgs = {
     vault: Address;
     gateway?: string;
 };
-export declare const submitReport: ({ vault, gateway, }: SubmitReportArgs) => Promise<void>;
+export declare const submitReport: ({ vault, gateway, }: SubmitReportArgs) => Promise<boolean>;
 export {};

package/dist/utils/commands/report.js

@@ -8,7 +8,7 @@ export const submitReport = async ({ vault, gateway, }) => {
     const isReportFresh = await callReadMethodSilent(vaultHubContract, 'isReportFresh', [vault]);
     if (isReportFresh) {
         logCancel('Report is fresh. You dont need to submit it again');
-        return;
+        return true;
     }
     const { cacheUse } = program.opts();
     const proof = await getReportProofByVault({
@@ -24,7 +24,7 @@ export const submitReport = async ({ vault, gateway, }) => {
         `);
     if (!confirm) {
         logCancel('Report not submitted');
-        return;
+        return false;
     }
     await callWriteMethodWithReceipt({
         contract: lazyOracleContract,
@@ -39,5 +39,6 @@ export const submitReport = async ({ vault, gateway, }) => {
             proof.proof,
         ],
     });
+    return true;
 };
 //# sourceMappingURL=report.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../utils/commands/report.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,SAAS,EACT,0BAA0B,EAC1B,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,OAAO,CAAC;AAOf,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,KAAK,EACL,OAAO,GACU,EAAiB,EAAE;IACpC,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACzD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAC;IAErD,MAAM,CACJ,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACpB,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAC9C,gBAAgB,EAChB,eAAe,EACf,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,IAAI,aAAa,EAAE,CAAC;QAClB,SAAS,CAAC,mDAAmD,CAAC,CAAC;QAC/D,OAAO;IACT,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,qBAAqB,CACvC;QACE,KAAK;QACL,GAAG,EAAE,mBAAmB;QACxB,OAAO;KACR,EACD,QAAQ,CACT,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,oDAAoD,KAAK;2BAClC,KAAK,CAAC,IAAI,CAAC,aAAa;eACpC,KAAK,CAAC,IAAI,CAAC,GAAG;4BACD,KAAK,CAAC,IAAI,CAAC,eAAe;4BAC1B,KAAK,CAAC,IAAI,CAAC,eAAe;SAC7C,CACN,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,SAAS,CAAC,sBAAsB,CAAC,CAAC;QAClC,OAAO;IACT,CAAC;IAED,MAAM,0BAA0B,CAAC;QAC/B,QAAQ,EAAE,kBAAkB;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;YACP,KAAK;YACL,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClC,KAAK,CAAC,KAAK;SACZ;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../utils/commands/report.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,SAAS,EACT,0BAA0B,EAC1B,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,OAAO,CAAC;AAOf,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EACjC,KAAK,EACL,OAAO,GACU,EAAoB,EAAE;IACvC,MAAM,kBAAkB,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACzD,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,EAAE,CAAC;IAErD,MAAM,CACJ,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACpB,GAAG,MAAM,cAAc,CAAC,kBAAkB,EAAE,kBAAkB,CAAC,CAAC;IACjE,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAC9C,gBAAgB,EAChB,eAAe,EACf,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,IAAI,aAAa,EAAE,CAAC;QAClB,SAAS,CAAC,mDAAmD,CAAC,CAAC;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IACpC,MAAM,KAAK,GAAG,MAAM,qBAAqB,CACvC;QACE,KAAK;QACL,GAAG,EAAE,mBAAmB;QACxB,OAAO;KACR,EACD,QAAQ,CACT,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,oDAAoD,KAAK;2BAClC,KAAK,CAAC,IAAI,CAAC,aAAa;eACpC,KAAK,CAAC,IAAI,CAAC,GAAG;4BACD,KAAK,CAAC,IAAI,CAAC,eAAe;4BAC1B,KAAK,CAAC,IAAI,CAAC,eAAe;SAC7C,CACN,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,SAAS,CAAC,sBAAsB,CAAC,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,0BAA0B,CAAC;QAC/B,QAAQ,EAAE,kBAAkB;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;YACP,KAAK;YACL,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;YAChC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC;YACrC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YAClC,KAAK,CAAC,KAAK;SACZ;KACF,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

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

@@ -0,0 +1,7 @@
+import { Address, Hex } from 'viem';
+import { PubkeyMap } from './types.js';
+export declare const checkPubkeysArgs: (file: PubkeyMap, sourcePubkeys: Hex[][], targetPubkeys: Hex[]) => {
+    sourcePubkeys: `0x${string}`[][];
+    targetPubkeys: `0x${string}`[];
+};
+export declare const validateConsolidationInput: (sourcePubkeys: Hex[][], targetPubkeys: Hex[], dashboard: Address, refundRecipient?: Address) => void;

package/dist/utils/consolidation/checks.js

@@ -0,0 +1,40 @@
+import { hexToBytes, isHex, zeroAddress } from 'viem';
+import { toHex } from '../index.js';
+export const checkPubkeysArgs = (file, sourcePubkeys, targetPubkeys) => {
+    if (!file && !(sourcePubkeys && targetPubkeys)) {
+        throw new Error('Provide --file or both --source_pubkeys and --target_pubkeys');
+    }
+    const currentSourcePubkeys = file
+        ? Object.values(file)
+        : (sourcePubkeys ?? []);
+    const currentTargetPubkeys = file
+        ? Object.keys(file).map(toHex)
+        : (targetPubkeys ?? []);
+    return {
+        sourcePubkeys: currentSourcePubkeys,
+        targetPubkeys: currentTargetPubkeys,
+    };
+};
+export const validateConsolidationInput = (sourcePubkeys, targetPubkeys, dashboard, refundRecipient) => {
+    const sourcePubkeysFlat = sourcePubkeys.flat();
+    validatePubkeys(sourcePubkeysFlat);
+    validatePubkeys(targetPubkeys);
+    if (sourcePubkeys.length !== targetPubkeys.length) {
+        throw new Error('sourcePubkeys and targetPubkeys must have the same length');
+    }
+    if (refundRecipient != null && refundRecipient === zeroAddress) {
+        throw new Error('refundRecipient must be non-zero address');
+    }
+    if (dashboard === zeroAddress) {
+        throw new Error('dashboard address must be non-zero address');
+    }
+};
+const validatePubkeys = (pubkeys) => {
+    const invalid = pubkeys.filter((pubkey) => !(typeof pubkey === 'string' &&
+        isHex(pubkey) &&
+        hexToBytes(pubkey).length === 48));
+    if (invalid.length > 0) {
+        throw new Error('Invalid pubkeys (must be hex 0x + 48 bytes):\n' + invalid.join('\n'));
+    }
+};
+//# sourceMappingURL=checks.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"checks.js","sourceRoot":"","sources":["../../../utils/consolidation/checks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAI9B,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,IAAe,EACf,aAAsB,EACtB,aAAoB,EACpB,EAAE;IACF,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,aAAa,IAAI,aAAa,CAAC,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CACb,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,oBAAoB,GAAG,IAAI;QAC/B,CAAC,CAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAa;QAClC,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAC1B,MAAM,oBAAoB,GAAG,IAAI;QAC/B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;QAC9B,CAAC,CAAC,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;IAE1B,OAAO;QACL,aAAa,EAAE,oBAAoB;QACnC,aAAa,EAAE,oBAAoB;KACpC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,aAAsB,EACtB,aAAoB,EACpB,SAAkB,EAClB,eAAyB,EACzB,EAAE;IACF,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,EAAE,CAAC;IAC/C,eAAe,CAAC,iBAAiB,CAAC,CAAC;IACnC,eAAe,CAAC,aAAa,CAAC,CAAC;IAE/B,IAAI,aAAa,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,CAAC;IACD,IAAI,eAAe,IAAI,IAAI,IAAI,eAAe,KAAK,WAAW,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,SAAS,KAAK,WAAW,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,OAAc,EAAE,EAAE;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAC5B,CAAC,MAAM,EAAE,EAAE,CACT,CAAC,CACC,OAAO,MAAM,KAAK,QAAQ;QAC1B,KAAK,CAAC,MAAM,CAAC;QACb,UAAU,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,EAAE,CACjC,CACJ,CAAC;IACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,gDAAgD,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CACtE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC"}

package/dist/utils/consolidation/confirms.d.ts

@@ -0,0 +1,4 @@
+import { Address } from 'viem';
+import { TargetAndSourceValidators } from './types.js';
+export declare const confirmToConsolidate: (targetAndSourceValidators: TargetAndSourceValidators, dashboard: Address) => Promise<void>;
+export declare const calculateAndConfirmFeeExemption: (targetAndSourceValidators: TargetAndSourceValidators) => Promise<bigint>;

package/dist/utils/consolidation/confirms.js

@@ -0,0 +1,41 @@
+import { formatEther } from 'viem';
+import { logCancel, confirmOperation } from '../index.js';
+export const confirmToConsolidate = async (targetAndSourceValidators, dashboard) => {
+    const lines = [
+        'Are you sure you want to consolidate the following validators?\n',
+    ];
+    for (const [target, { sourceValidators }] of targetAndSourceValidators) {
+        for (const [source] of sourceValidators) {
+            lines.push(`Source: ${source}\nTarget: ${target}\n`);
+        }
+    }
+    lines.push(`Dashboard: ${dashboard}`);
+    const confirm = await confirmOperation(lines.join('\n'));
+    if (!confirm) {
+        logCancel('User cancelled confirmation to consolidate');
+        throw new Error('User cancelled consolidation');
+    }
+};
+export const calculateAndConfirmFeeExemption = async (targetAndSourceValidators) => {
+    let feeExemption = 0n;
+    for (const [, { sourceValidators }] of targetAndSourceValidators) {
+        for (const [source, sourceValidatorInfo] of sourceValidators) {
+            if (sourceValidatorInfo.status === 'active_ongoing') {
+                feeExemption += sourceValidatorInfo.balance;
+            }
+            else {
+                const confirm = await confirmOperation(`Validator with this pubkey ${source} is not in active state. Should we consider its balance for fee exemption?`);
+                if (confirm) {
+                    feeExemption += sourceValidatorInfo.balance;
+                }
+            }
+        }
+    }
+    const confirmFeeExemption = await confirmOperation(`Fee Exemption: ${formatEther(feeExemption)} ETH. Continue?`);
+    if (!confirmFeeExemption) {
+        logCancel('User cancelled fee exemption confirmation');
+        throw new Error('User cancelled consolidation');
+    }
+    return feeExemption;
+};
+//# sourceMappingURL=confirms.js.map

package/dist/utils/consolidation/confirms.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"confirms.js","sourceRoot":"","sources":["../../../utils/consolidation/confirms.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAIpD,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EACvC,yBAAoD,EACpD,SAAkB,EACH,EAAE;IACjB,MAAM,KAAK,GAAa;QACtB,kEAAkE;KACnE,CAAC;IACF,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,gBAAgB,EAAE,CAAC,IAAI,yBAAyB,EAAE,CAAC;QACvE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACxC,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,aAAa,MAAM,IAAI,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,cAAc,SAAS,EAAE,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,SAAS,CAAC,4CAA4C,CAAC,CAAC;QAExD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,yBAAoD,EACnC,EAAE;IACnB,IAAI,YAAY,GAAG,EAAE,CAAC;IAEtB,KAAK,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,CAAC,IAAI,yBAAyB,EAAE,CAAC;QACjE,KAAK,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,IAAI,gBAAgB,EAAE,CAAC;YAC7D,IAAI,mBAAmB,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;gBACpD,YAAY,IAAI,mBAAmB,CAAC,OAAO,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACN,MAAM,OAAO,GAAG,MAAM,gBAAgB,CACpC,8BAA8B,MAAM,4EAA4E,CACjH,CAAC;gBACF,IAAI,OAAO,EAAE,CAAC;oBACZ,YAAY,IAAI,mBAAmB,CAAC,OAAO,CAAC;gBAC9C,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAChD,kBAAkB,WAAW,CAAC,YAAY,CAAC,iBAAiB,CAC7D,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,SAAS,CAAC,2CAA2C,CAAC,CAAC;QAEvD,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}

package/dist/utils/consolidation/index.d.ts

@@ -0,0 +1,6 @@
+export * from './checks.js';
+export * from './validators-checks.js';
+export * from './validator-info.js';
+export * from './logs.js';
+export * from './confirms.js';
+export * from './pubkeys.js';

package/dist/utils/consolidation/index.js

@@ -0,0 +1,7 @@
+export * from './checks.js';
+export * from './validators-checks.js';
+export * from './validator-info.js';
+export * from './logs.js';
+export * from './confirms.js';
+export * from './pubkeys.js';
+//# sourceMappingURL=index.js.map

package/dist/utils/consolidation/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../utils/consolidation/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC"}

package/dist/utils/consolidation/logs.d.ts

@@ -0,0 +1,3 @@
+import { TargetAndSourceValidators } from './types.js';
+export declare const logAllTargetValidatorsTable: (targetAndSourceValidators: TargetAndSourceValidators) => Promise<void>;
+export declare const logAllSourceValidatorsTable: (targetAndSourceValidators: TargetAndSourceValidators) => Promise<void>;