@lidofinance/lsv-cli 1.0.0-alpha.60 → 1.0.0-alpha.62

package/dist/programs/use-cases/deposits/write.js

@@ -1,6 +1,6 @@
 import { formatEther, parseEther } from 'viem';
 import { Option } from 'commander';
-import { logInfo, getCommandsJson, stringToAddress, confirmOperation, callWriteMethodWithReceipt, parseDepositArray, expandBLSSignature, confirmMakeProof, stringToNumberArray, stringToNumber, etherToWei, } from '../../../utils/index.js';
+import { logInfo, getCommandsJson, stringToAddress, confirmOperation, callWriteMethodWithReceipt, parseDepositArray, expandBLSSignature, confirmMakeProof, stringToNumberArray, stringToNumber, etherToWei, stringToBigIntArray, parseValidatorTopUpArray, } from '../../../utils/index.js';
 import { chooseVaultAndGetDashboard, checkBLSDeposits, makePDGProofByIndex, makePDGProofByIndexes, checkNOBalancePDGforDeposit, getAddress, checkNodeOperatorForDeposit, checkAndSpecifyNodeOperatorForTopUpOrWithdraw, getGuarantor, } from '../../../features/index.js';
 import { getPredepositGuaranteeContract, getStakingVaultContract, } from '../../../contracts/index.js';
 import { deposits } from './main.js';
@@ -64,7 +64,7 @@ depositsWrite
 depositsWrite
     .command('proof-and-prove')
     .aliases(['prove'])
-    .description('make proof and prove')
+    .description('permissionless method to prove correct Withdrawal Credentials for the validator and to send the activation deposit')
     .option('-i, --index <index>', 'validator index', stringToNumber)
     .action(async ({ index }) => {
     const pdgContract = await getPredepositGuaranteeContract();
@@ -74,7 +74,7 @@ depositsWrite
     const { proof, pubkey, childBlockTimestamp, slot, proposerIndex } = await makePDGProofByIndex(validatorIndex);
     await callWriteMethodWithReceipt({
         contract: pdgContract,
-        methodName: 'proveValidatorWC',
+        methodName: 'proveWCAndActivate',
         payload: [
             {
                 proof,
@@ -88,21 +88,12 @@ depositsWrite
     });
 });
 depositsWrite
-    .command('prove-and-deposit')
-    .description('shortcut for the node operator: prove, top up and deposit to proven validators')
+    .command('prove-and-top-up')
+    .description('prove validators to unlock NO balance, activate the validators from stash, and optionally top up NO balance')
     .argument('<indexes>', 'validator indexes', stringToNumberArray)
-    .argument('<deposits>', 'deposits', parseDepositArray)
+    .argument('<amounts>', 'array of amounts to top up NO balance', stringToBigIntArray)
     .option('-v, --vault <string>', 'vault address', stringToAddress)
-    .addHelpText('after', `Deposit format:
-  '[{
-    "pubkey": "...",
-    "signature": "...",
-    "amount": "...",
-    "deposit_data_root": "..."
-  }
-  {second deposit}
-  ...]'`)
-    .action(async (indexes, deposits, { vault }) => {
+    .action(async (indexes, amounts, { vault }) => {
     const { vault: vaultAddress } = await chooseVaultAndGetDashboard({
         vault,
     });
@@ -114,41 +105,40 @@ depositsWrite
         return;
     await callWriteMethodWithReceipt({
         contract: pdgContract,
-        methodName: 'proveAndDeposit',
-        payload: [witnesses, deposits, vaultAddress],
+        methodName: 'proveWCActivateAndTopUpValidators',
+        payload: [witnesses, amounts],
     });
 });
 depositsWrite
-    .command('deposit-to-beacon-chain')
+    .command('top-up-existing-validators')
+    .aliases(['top-up-val'])
     .description('deposits ether to proven validators from staking vault')
-    .argument('<deposits>', 'deposits', parseDepositArray)
+    .argument('<topUps>', 'array of ValidatorTopUp structs with pubkey and amounts', parseValidatorTopUpArray)
     .option('-v, --vault <string>', 'vault address', stringToAddress)
-    .addHelpText('after', `Deposit format:
+    .addHelpText('after', `ValidatorTopUp format:
   '[{
     "pubkey": "...",
-    "signature": "...",
     "amount": "...",
-    "deposit_data_root": "..."
   }
-  {second deposit}
+  {second topUp}
   ...]'`)
-    .action(async (deposits, { vault }) => {
+    .action(async (topUps, { vault }) => {
     const { vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
     const pdgContract = await getPredepositGuaranteeContract();
     const vaultContract = getStakingVaultContract(vaultAddress);
     await checkNodeOperatorForDeposit(vaultContract);
-    const confirm = await confirmOperation(`Are you sure you want to deposit ${deposits.length} deposits to the vault ${vaultAddress}?`);
+    const confirm = await confirmOperation(`Are you sure you want to top up ${topUps.length} validators with ${topUps.map((topUp) => formatEther(topUp.amount)).join(', ')} ETH?`);
     if (!confirm)
         return;
     await callWriteMethodWithReceipt({
         contract: pdgContract,
-        methodName: 'depositToBeaconChain',
-        payload: [vaultAddress, deposits],
+        methodName: 'topUpExistingValidators',
+        payload: [topUps],
     });
 });
 depositsWrite
-    .command('top-up')
-    .description('top up no balance')
+    .command('top-up-no')
+    .description('top up Node Operator balance')
     .argument('<amount>', 'amount in ETH', etherToWei)
     .option('-v, --vault <string>', 'vault address', stringToAddress)
     .action(async (amount, { vault }) => {
@@ -171,7 +161,7 @@ depositsWrite
 });
 depositsWrite
     .command('withdraw-no-balance')
-    .description('withdraw node operator balance')
+    .description('withdraw Node Operator balance')
     .argument('<amount>', 'amount in ETH', etherToWei)
     .option('-v, --vault <string>', 'vault address', stringToAddress)
     .option('-r, --recipient <string>', 'address of the recipient', stringToAddress)
@@ -196,7 +186,7 @@ depositsWrite
 depositsWrite
     .command('set-no-guarantor')
     .aliases(['set-no-g'])
-    .description('set node operator guarantor')
+    .description('set Node Operator guarantor')
     .action(async () => {
     const pdgContract = await getPredepositGuaranteeContract();
     const { newGuarantor, currentAccount } = await getGuarantor(pdgContract);

package/dist/programs/use-cases/deposits/write.js.map

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

package/dist/programs/use-cases/metrics/read.js

@@ -2,7 +2,7 @@ import { formatEther } from 'viem';
 import { Option } from 'commander';
 import { program } from '../../../command/index.js';
 import { getLazyOracleContract } from '../../../contracts/index.js';
-import { logInfo, getCommandsJson, getVaultReport, callReadMethod, getReportStatisticData, getVaultPreviousReport, logResult, formatRatio, fetchAprChartsData, renderAprCharts, fetchRewardsChartsData, renderRewardsCharts, stringToNumber, renderSimpleCharts, getVaultReportHistory, prepareGrossStakingRewards, prepareNodeOperatorRewards, prepareNetStakingRewards, callReadMethodSilent, cache, prepareGrossStakingAPR, prepareNetStakingAPR, prepareCarrySpread, prepareBottomLine, formatTimestamp, } from '../../../utils/index.js';
+import { logInfo, getCommandsJson, getVaultReport, callReadMethod, getReportStatisticData, getVaultPreviousReport, logResult, formatRatio, fetchAprChartsData, renderAprCharts, fetchRewardsChartsData, renderRewardsCharts, stringToNumber, renderSimpleCharts, getVaultReportHistory, prepareGrossStakingRewards, prepareNodeOperatorRewards, prepareNetStakingRewards, callReadMethodSilent, cache, prepareGrossStakingAPR, prepareNetStakingAPR, prepareCarrySpread, prepareBottomLine, prepareDailyLidoFees, formatTimestamp, } from '../../../utils/index.js';
 import { checkQuarantine, chooseVaultAndGetDashboard } from '../../../features/index.js';
 import { metrics } from './main.js';
 const metricsRead = metrics
@@ -23,8 +23,8 @@ metricsRead
     const { address: dashboardAddress, vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
-    const { cacheUse } = program.opts();
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const { cacheUse, csv } = program.opts();
     const reportCurrent = await getVaultReport({
         vault: vaultAddress,
         cid: vaultsDataReportCid,
@@ -65,6 +65,7 @@ metricsRead
             ['Carry Spread, %', formatRatio(statisticData.carrySpread.apr_percent)],
             ['Bottom Line, ETH', formatEther(statisticData.bottomLine)],
         ],
+        csvPath: csv,
     });
 });
 metricsRead
@@ -73,12 +74,13 @@ metricsRead
     .argument('<count>', 'count of reports', stringToNumber)
     .option('-v, --vault <string>', 'vault address')
     .option('-g, --gateway', 'ipfs gateway url')
-    .action(async (count, { vault, gateway }) => {
+    .option('--no-utc', 'do not use UTC time zone')
+    .action(async (count, { vault, gateway, utc }) => {
     const { contract: dashboardContract, vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
-    const { cacheUse } = program.opts();
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const { cacheUse, csv } = program.opts();
     const history = await getVaultReportHistory({
         vault: vaultAddress,
         cid: vaultsDataReportCid,
@@ -91,14 +93,15 @@ metricsRead
     for (const r of history) {
         let fee = await cache.getNodeOperatorFeeRate(vault, r.blockNumber);
         if (fee === null) {
-            fee = await callReadMethodSilent(dashboardContract, 'nodeOperatorFeeRate', {
+            const feeRate = await callReadMethodSilent(dashboardContract, 'feeRate', {
                 blockNumber: BigInt(r.blockNumber),
             });
+            fee = BigInt(feeRate);
             await cache.setNodeOperatorFeeRate(vault, r.blockNumber, fee);
         }
         nodeOperatorFeeBPs.push(fee);
     }
-    const [grossStakingRewards, nodeOperatorRewards, netStakingRewards, grossStakingAPR, netStakingAPR, carrySpread, bottomLine,] = await Promise.all([
+    const [grossStakingRewards, nodeOperatorRewards, netStakingRewards, grossStakingAPR, netStakingAPR, carrySpread, bottomLine, dailyLidoFees,] = await Promise.all([
         prepareGrossStakingRewards(history),
         prepareNodeOperatorRewards(history, nodeOperatorFeeBPs),
         prepareNetStakingRewards(history, nodeOperatorFeeBPs),
@@ -106,6 +109,7 @@ metricsRead
         prepareNetStakingAPR(history, nodeOperatorFeeBPs),
         prepareCarrySpread(history, nodeOperatorFeeBPs, vaultAddress),
         prepareBottomLine(history, nodeOperatorFeeBPs, vaultAddress),
+        prepareDailyLidoFees(history),
     ]);
     logResult({
         data: [
@@ -116,11 +120,66 @@ metricsRead
             ['Net Staking APR, %', ...netStakingAPR.values.map(formatRatio)],
             ['Carry Spread, %', ...carrySpread.values.map(formatRatio)],
             ['Bottom Line, WEI', ...bottomLine.values],
+            ['Daily Lido Fees, ETH', ...dailyLidoFees.values],
+            ['Timestamp', ...grossStakingRewards.timestamp],
+        ],
+        params: {
+            head: [
+                'Metric',
+                ...grossStakingRewards.timestamp.map((ts) => formatTimestamp(ts, 'dd.mm hh:mm', utc ? 'UTC' : 'local')),
+            ],
+        },
+        csvPath: csv,
+    });
+});
+metricsRead
+    .command('report-data')
+    .description('get report data for Vault from N last reports')
+    .argument('<count>', 'count of reports', stringToNumber)
+    .option('-v, --vault <string>', 'vault address')
+    .option('-g, --gateway', 'ipfs gateway url')
+    .option('--no-utc', 'do not use UTC time zone')
+    .action(async (count, { vault, gateway, utc }) => {
+    const { vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
+    await checkQuarantine(vaultAddress);
+    const lazyOracleContract = await getLazyOracleContract();
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const { cacheUse } = program.opts();
+    const history = await getVaultReportHistory({
+        vault: vaultAddress,
+        cid: vaultsDataReportCid,
+        limit: count,
+        direction: 'asc',
+        gateway,
+    }, cacheUse);
+    logResult({
+        data: [
+            ['Vault Address', ...history.map((r) => r.data.vaultAddress)],
+            ['Total Value, WEI', ...history.map((r) => r.data.totalValueWei)],
+            ['Fee, WEI', ...history.map((r) => r.data.fee)],
+            [
+                'Liability Shares, WEI',
+                ...history.map((r) => r.data.liabilityShares),
+            ],
+            [
+                'Slashing Reserve, WEI',
+                ...history.map((r) => r.data.slashingReserve),
+            ],
+            ['In/Out Delta, WEI', ...history.map((r) => r.extraData.inOutDelta)],
+            ['Prev Fee, WEI', ...history.map((r) => r.extraData.prevFee)],
+            ['Infra Fee, WEI', ...history.map((r) => r.extraData.infraFee)],
+            ['Liquidity Fee, WEI', ...history.map((r) => r.extraData.liquidityFee)],
+            [
+                'Reservation Fee, WEI',
+                ...history.map((r) => r.extraData.reservationFee),
+            ],
+            ['Timestamp', ...history.map((r) => r.timestamp)],
+            ['CID', ...history.map((r) => r.cid)],
         ],
         params: {
             head: [
                 'Metric',
-                ...grossStakingRewards.timestamp.map((ts) => formatTimestamp(ts, 'dd.mm hh:mm')),
+                ...history.map((r) => formatTimestamp(r.timestamp, 'dd.mm hh:mm', utc ? 'UTC' : 'local')),
             ],
         },
     });
@@ -137,7 +196,7 @@ metricsRead
     });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
     const { cacheUse } = program.opts();
     if (simplified) {
         await renderSimpleCharts({
@@ -168,7 +227,7 @@ metricsRead
     });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
     const { cacheUse } = program.opts();
     const chartsData = await fetchRewardsChartsData({
         cid: vaultsDataReportCid,

package/dist/programs/use-cases/metrics/read.js.map

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

package/dist/programs/use-cases/report/read.js

@@ -1,6 +1,6 @@
 import { Option } from 'commander';
 import { program } from '../../../command/index.js';
-import { callReadMethod, getAllVaultsReports, getCommandsJson, getVaultReport, logInfo, getReportProofByVault, callReadMethodSilent, fetchIPFS, } from '../../../utils/index.js';
+import { getAllVaultsReports, getCommandsJson, getVaultReport, logInfo, getReportProofByVault, callReadMethodSilent, fetchIPFS, logTable, } from '../../../utils/index.js';
 import { getLazyOracleContract } from '../../../contracts/index.js';
 import { checkQuarantine, chooseVaultAndGetDashboard } from '../../../features/index.js';
 import { report } from './main.js';
@@ -19,8 +19,15 @@ reportRead
     .description('get the latest report data')
     .action(async () => {
     const lazyOracleContract = await getLazyOracleContract();
-    const [timestamp, root, cid] = await callReadMethod(lazyOracleContract, 'latestReportData');
-    logInfo(timestamp, root, cid);
+    const [timestamp, refSlot, root, cid] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
+    logTable({
+        data: [
+            ['Timestamp', timestamp],
+            ['Ref Slot', refSlot],
+            ['Root', root],
+            ['CID', cid],
+        ],
+    });
 });
 reportRead
     .command('by-vault')
@@ -31,7 +38,7 @@ reportRead
     const { vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
     const { cacheUse } = program.opts();
     const report = await getVaultReport({
         vault: vaultAddress,
@@ -54,7 +61,7 @@ reportRead
     const { vault: vaultAddress } = await chooseVaultAndGetDashboard({ vault });
     await checkQuarantine(vaultAddress);
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
     const { cacheUse } = program.opts();
     const proof = await getReportProofByVault({
         vault: vaultAddress,
@@ -74,7 +81,7 @@ reportRead
     .option('-g, --gateway', 'ipfs gateway url')
     .action(async ({ gateway }) => {
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
     const { cacheUse } = program.opts();
     const allVaultsReports = await getAllVaultsReports({
         cid: vaultsDataReportCid,
@@ -93,7 +100,7 @@ reportRead
     .option('-u, --url', 'ipfs gateway url')
     .action(async ({ url }) => {
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethodSilent(lazyOracleContract, 'latestReportData');
     logInfo({
         vaultsDataTreeRoot: _vaultsDataTreeRoot,
         vaultsDataTimestamp: _vaultsDataTimestamp,

package/dist/programs/use-cases/report/read.js.map

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

package/dist/programs/use-cases/report/write.js

@@ -1,7 +1,6 @@
 import { Option } from 'commander';
-import cliProgress from 'cli-progress';
 import { getLazyOracleContract } from '../../../contracts/index.js';
-import { callWriteMethodWithReceipt, callReadMethod, logInfo, getCommandsJson, logError, withInterruptHandling, submitReport, getReportProofByVaults, getReportProofs, } from '../../../utils/index.js';
+import { callWriteMethodWithReceiptBatchPayloads, callReadMethod, logInfo, getCommandsJson, withInterruptHandling, submitReport, getReportProofByVaults, getReportProofs, logError, } from '../../../utils/index.js';
 import { chooseVaultAndGetDashboard, checkQuarantine } from '../../../features/index.js';
 import { report } from './main.js';
 const reportWrite = report
@@ -32,42 +31,30 @@ reportWrite
     .option('-e, --skip-error', 'skip error')
     .action(withInterruptHandling(async (vaults, { gateway, skipError }) => {
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
     const proofs = await getReportProofByVaults({
         cid: vaultsDataReportCid,
         gateway,
         vaults,
     });
-    const progressBar = new cliProgress.SingleBar({
-        format: 'Progress |{bar}| {percentage}% || {value}/{total} Vaults Updated',
-        stopOnComplete: true,
-    }, cliProgress.Presets.shades_classic);
-    progressBar.start(vaults.length, 0);
-    for (const [_index, vault] of vaults.entries()) {
-        const vaultReport = proofs.find((v) => v.data.vaultAddress === vault);
-        if (!vaultReport) {
-            logError(`Vault ${vault} not found`);
-            continue;
-        }
-        await checkQuarantine(vault);
-        await callWriteMethodWithReceipt({
-            contract: lazyOracleContract,
-            methodName: 'updateVaultData',
-            payload: [
-                vault,
-                BigInt(vaultReport.data.totalValueWei),
-                BigInt(vaultReport.data.fee),
-                BigInt(vaultReport.data.liabilityShares),
-                BigInt(vaultReport.data.slashingReserve),
-                vaultReport.proof,
-            ],
-            withSpinner: false,
-            silent: true,
-            skipError,
-        });
-        progressBar.increment();
-    }
-    progressBar.stop();
+    const payloads = proofs.map((report) => [
+        report.data.vaultAddress,
+        BigInt(report.data.totalValueWei),
+        BigInt(report.data.fee),
+        BigInt(report.data.liabilityShares),
+        BigInt(report.data.maxLiabilityShares),
+        BigInt(report.data.slashingReserve),
+        report.proof,
+    ]);
+    // TODO: await checkQuarantine(vault);
+    await callWriteMethodWithReceiptBatchPayloads({
+        contract: lazyOracleContract,
+        methodName: 'updateVaultData',
+        payloads,
+        withSpinner: false,
+        silent: true,
+        skipError,
+    });
 }));
 reportWrite
     .command('submit-all')
@@ -76,41 +63,37 @@ reportWrite
     .option('-e, --skip-error', 'skip error')
     .action(withInterruptHandling(async ({ gateway, skipError }) => {
     const lazyOracleContract = await getLazyOracleContract();
-    const [_vaultsDataTimestamp, _vaultsDataTreeRoot, vaultsDataReportCid] = await callReadMethod(lazyOracleContract, 'latestReportData');
+    const [_vaultsDataTimestamp, _vaultsDataRefSlot, _vaultsDataTreeRoot, vaultsDataReportCid,] = await callReadMethod(lazyOracleContract, 'latestReportData');
     const proofs = await getReportProofs({
         cid: vaultsDataReportCid,
         gateway,
     });
-    const progressBar = new cliProgress.SingleBar({
-        format: 'Progress |{bar}| {percentage}% || {value}/{total} Vaults Updated',
-    }, cliProgress.Presets.shades_classic);
-    progressBar.start(proofs.length, 0);
-    for (const [_index, report] of proofs.entries()) {
-        try {
-            await callWriteMethodWithReceipt({
-                contract: lazyOracleContract,
-                methodName: 'updateVaultData',
-                payload: [
-                    report.data.vaultAddress,
-                    BigInt(report.data.totalValueWei),
-                    BigInt(report.data.fee),
-                    BigInt(report.data.liabilityShares),
-                    BigInt(report.data.slashingReserve),
-                    report.proof,
-                ],
-                withSpinner: false,
-                silent: true,
-                skipError,
-            });
-        }
-        catch (err) {
-            if ('shortMessage' in err)
-                logError(err.shortMessage, 'Error when submitting report');
-            else
-                logError('Error when submitting report');
-        }
-        progressBar.increment();
+    const payloads = 
+    // eslint-disable-next-line sonarjs/no-identical-functions
+    proofs.map((report) => [
+        report.data.vaultAddress,
+        BigInt(report.data.totalValueWei),
+        BigInt(report.data.fee),
+        BigInt(report.data.liabilityShares),
+        BigInt(report.data.maxLiabilityShares),
+        BigInt(report.data.slashingReserve),
+        report.proof,
+    ]);
+    try {
+        await callWriteMethodWithReceiptBatchPayloads({
+            contract: lazyOracleContract,
+            methodName: 'updateVaultData',
+            payloads,
+            withSpinner: false,
+            silent: true,
+            skipError,
+        });
+    }
+    catch (err) {
+        if ('shortMessage' in err)
+            logError(err.shortMessage, 'Error when submitting report');
+        else
+            logError('Error when submitting report');
     }
-    progressBar.stop();
 }));
 //# sourceMappingURL=write.js.map

package/dist/programs/use-cases/report/write.js.map

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