feat: integrate validator checks into proof creation and dashboard error handling

Author: DiRaiks

abi/Dashboard.ts

@@ -1,6 +1,7 @@
 import { StakingVaultErrorsAbi } from './StakingVault.js';
 import { OperatorGridErrorsAbi } from './OperatorGrid.js';
 import { VaultHubErrorsAbi } from './VaultHub.js';
+import { PredepositGuaranteeErrorsAbi } from './PredepositGuarantee.js';
 
 export const DashboardErrorsAbi = [
   {
@@ -216,6 +217,7 @@ export const DashboardAbi = [
   ...StakingVaultErrorsAbi,
   ...OperatorGridErrorsAbi,
   ...VaultHubErrorsAbi,
+  ...PredepositGuaranteeErrorsAbi,
   {
     inputs: [
       {

abi/PredepositGuarantee.ts

@@ -1,33 +1,6 @@
 import { StakingVaultErrorsAbi } from './StakingVault.js';
 
-export const PredepositGuaranteeAbi = [
-  ...StakingVaultErrorsAbi,
-  {
-    inputs: [
-      {
-        internalType: 'bytes4',
-        name: '_genesisForkVersion',
-        type: 'bytes4',
-      },
-      {
-        internalType: 'GIndex',
-        name: '_gIFirstValidator',
-        type: 'bytes32',
-      },
-      {
-        internalType: 'GIndex',
-        name: '_gIFirstValidatorAfterChange',
-        type: 'bytes32',
-      },
-      {
-        internalType: 'uint64',
-        name: '_pivotSlot',
-        type: 'uint64',
-      },
-    ],
-    stateMutability: 'nonpayable',
-    type: 'constructor',
-  },
+export const PredepositGuaranteeErrorsAbi = [
   {
     inputs: [],
     name: 'AccessControlBadConfirmation',
@@ -379,6 +352,37 @@ export const PredepositGuaranteeAbi = [
     name: 'ZeroPauseDuration',
     type: 'error',
   },
+] as const;
+
+export const PredepositGuaranteeAbi = [
+  ...PredepositGuaranteeErrorsAbi,
+  ...StakingVaultErrorsAbi,
+  {
+    inputs: [
+      {
+        internalType: 'bytes4',
+        name: '_genesisForkVersion',
+        type: 'bytes4',
+      },
+      {
+        internalType: 'GIndex',
+        name: '_gIFirstValidator',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'GIndex',
+        name: '_gIFirstValidatorAfterChange',
+        type: 'bytes32',
+      },
+      {
+        internalType: 'uint64',
+        name: '_pivotSlot',
+        type: 'uint64',
+      },
+    ],
+    stateMutability: 'nonpayable',
+    type: 'constructor',
+  },
   {
     anonymous: false,
     inputs: [

features/deposits/index.ts

@@ -2,3 +2,4 @@ export * from './check-bls-deposits.js';
 export * from './make-pdg-proof.js';
 export * from './no-pdg.js';
 export * from './pdg.js';
+export * from './validators.js';

features/deposits/validators.ts

@@ -0,0 +1,47 @@
+import { formatEther, Hex } from 'viem';
+import { confirmOperation, logError, logInfo } from 'utils';
+
+type ValidatorInfo = {
+  pubkey: Hex;
+  effectiveBalance: number;
+  activationEpoch: number;
+  slashed: boolean;
+};
+
+const MIN_EFFECTIVE_BALANCE_GWEI = 32000000000;
+const NOT_ACTIVATED_EPOCH = Infinity;
+
+export const checkValidatorInfo = async (validator: ValidatorInfo) => {
+  let message = '';
+  let isValid = true;
+  if (validator.effectiveBalance < MIN_EFFECTIVE_BALANCE_GWEI) {
+    message += `Validator effective balance is less than ${formatEther(BigInt(MIN_EFFECTIVE_BALANCE_GWEI), 'gwei')} ETH (current: ${formatEther(BigInt(validator.effectiveBalance), 'gwei')} ETH)\n`;
+    isValid = false;
+  }
+
+  if (validator.activationEpoch === NOT_ACTIVATED_EPOCH) {
+    message += `Validator is not activated. (activationEpoch: ${validator.activationEpoch})\n`;
+    isValid = false;
+  }
+
+  if (validator.slashed) {
+    message += `Validator is slashed. (slashed: ${validator.slashed})\n`;
+    isValid = false;
+  }
+
+  logError(message);
+
+  const confirm = await confirmOperation(
+    `Do you want to skip this validator (pubkey: ${validator.pubkey})?`,
+  );
+
+  if (!confirm) {
+    throw new Error('Operation cancelled');
+  }
+
+  if (!isValid) {
+    logInfo('Validator is not valid. Skipping...');
+  }
+
+  return { isValid, skip: confirm };
+};

programs/contracts/dashboard/write.ts

@@ -15,6 +15,7 @@ import {
   checkBLSDeposits,
   checkPdgIsPaused,
   callWriteMethodsWithReportFresh,
+  checkValidatorInfo,
 } from 'features';
 import {
   callReadMethod,
@@ -655,10 +656,19 @@ dashboardWrite
         message: `Making proof for validator ${validatorIndex}...`,
       });
       const packageProof = await createPDGProof(Number(validatorIndex));
-      const { proof, pubkey, childBlockTimestamp, slot, proposerIndex } =
-        packageProof;
+      const {
+        proof,
+        pubkey,
+        childBlockTimestamp,
+        slot,
+        proposerIndex,
+        validator,
+      } = packageProof;
       hideSpinner();
 
+      const { skip } = await checkValidatorInfo({ pubkey, ...validator });
+      if (skip) continue;
+
       const confirm = await confirmOperation(
         `Are you sure you want to prove ${pubkey} validator (${validatorIndex}) to the Predeposit Guarantee contract ${pdgContractAddress} in the staking vault ${vault}?
       Witnesses length: ${proof.length}`,
@@ -676,6 +686,16 @@ dashboardWrite
       payload.push(proofItem);
     }
 
+    if (payload.length === 0) {
+      logInfo('No validators to prove. Exiting...');
+      return;
+    }
+
+    const confirmProof = await confirmOperation(
+      `Validators to prove (${payload.length}): ${payload.map((i) => i.pubkey).join(', ')}. Continue?`,
+    );
+    if (!confirmProof) return;
+
     await callWriteMethodWithReceipt({
       contract: dashboardContract,
       methodName: 'proveUnknownValidatorsToPDG',

programs/contracts/hub/write.ts

@@ -1,6 +1,7 @@
 import { Address, formatEther, Hex, parseEther } from 'viem';
 import { Option } from 'commander';
 
+import { checkValidatorInfo } from 'features';
 import {
   getOperatorGridContract,
   getStakingVaultContract,
@@ -434,8 +435,12 @@ VaultHubWrite.command('prove-unknown-validator-to-pdg')
         withdrawalCredentials,
         slot,
         proposerIndex,
+        validator,
       } = packageProof;
 
+      const { skip } = await checkValidatorInfo({ pubkey, ...validator });
+      if (skip) return;
+
       logResult({});
       logInfo('----------------------proof----------------------');
       logInfo(proof);

utils/interrupt-handler.ts

@@ -27,7 +27,9 @@ export const withInterruptHandling = (action: ActionHandler) => {
 
       return result;
     } catch (err) {
-      logError('Command failed:', err);
+      if (err instanceof Error) logError('Command failed:', err.message);
+      else logError('Command failed:', err);
+
       await disconnectWalletConnect();
       process.exit(1);
     } finally {

utils/proof/create-proof.ts

@@ -27,6 +27,11 @@ export interface ValidatorWitnessWithWC extends ValidatorWitness {
   withdrawalCredentials: Hex;
   slot: bigint;
   proposerIndex: bigint;
+  validator: {
+    effectiveBalance: number;
+    activationEpoch: number;
+    slashed: boolean;
+  };
 }
 
 const slotToTimestamp = (slot: number, genesisTimestamp: number): number => {
@@ -88,6 +93,11 @@ export const createPDGProof = async (
     childBlockTimestamp: BigInt(headerByParentTimestamp),
     slot: BigInt(beaconHeader.slot),
     proposerIndex: BigInt(beaconHeader.proposer_index),
+    validator: {
+      effectiveBalance: validator.effectiveBalance,
+      activationEpoch: validator.activationEpoch,
+      slashed: validator.slashed,
+    },
   };
 
   return result;