@lodestar/state-transition 1.40.0-dev.3be9500fa9 → 1.40.0-dev.45b04262dc

package/src/util/signatureSets.ts

@@ -1,11 +1,21 @@
-import {PublicKey, Signature, fastAggregateVerify, verify} from "@chainsafe/blst";
+import {PublicKey, Signature, aggregatePublicKeys, fastAggregateVerify, verify} from "@chainsafe/blst";
 import {Root} from "@lodestar/types";
+import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
 
 export enum SignatureSetType {
   single = "single",
   aggregate = "aggregate",
+  /**
+   * Single signature with validator index instead of pubkey.
+   * Pubkey lookup is deferred to verification time.
+   */
+  indexed = "indexed",
 }
 
+/**
+ * Single signature with pubkey directly.
+ * Used when pubkey comes from the message itself (e.g. BLS to execution change).
+ */
 export type SingleSignatureSet = {
   type: SignatureSetType.single;
   pubkey: PublicKey;
@@ -13,16 +23,57 @@ export type SingleSignatureSet = {
   signature: Uint8Array;
 };
 
+/**
+ * Single signature with validator index.
+ * Pubkey is looked up at verification time.
+ */
+export type IndexedSignatureSet = {
+  type: SignatureSetType.indexed;
+  index: number;
+  signingRoot: Root;
+  signature: Uint8Array;
+};
+
+/**
+ * Aggregate signature with validator indices.
+ * Pubkeys are looked up and aggregated at verification time.
+ */
 export type AggregatedSignatureSet = {
   type: SignatureSetType.aggregate;
-  pubkeys: PublicKey[];
+  indices: number[];
   signingRoot: Root;
   signature: Uint8Array;
 };
 
-export type ISignatureSet = SingleSignatureSet | AggregatedSignatureSet;
+export type ISignatureSet = SingleSignatureSet | IndexedSignatureSet | AggregatedSignatureSet;
+
+/**
+ * Get the pubkey for a signature set, performing aggregation if necessary.
+ * Requires index2pubkey cache for indexed and aggregate sets.
+ */
+export function getSignatureSetPubkey(signatureSet: ISignatureSet, index2pubkey: Index2PubkeyCache): PublicKey {
+  switch (signatureSet.type) {
+    case SignatureSetType.single:
+      return signatureSet.pubkey;
+
+    case SignatureSetType.indexed:
+      return index2pubkey[signatureSet.index];
+
+    case SignatureSetType.aggregate: {
+      const pubkeys = signatureSet.indices.map((i) => index2pubkey[i]);
+      return aggregatePublicKeys(pubkeys);
+    }
 
-export function verifySignatureSet(signatureSet: ISignatureSet): boolean {
+    default:
+      throw Error("Unknown signature set type");
+  }
+}
+
+export function verifySignatureSet(signatureSet: SingleSignatureSet, index2pubkey?: Index2PubkeyCache): boolean;
+export function verifySignatureSet(signatureSet: IndexedSignatureSet, index2pubkey: Index2PubkeyCache): boolean;
+export function verifySignatureSet(signatureSet: AggregatedSignatureSet, index2pubkey: Index2PubkeyCache): boolean;
+export function verifySignatureSet(signatureSet: ISignatureSet, index2pubkey: Index2PubkeyCache): boolean;
+export function verifySignatureSet(signatureSet: ISignatureSet, index2pubkey?: Index2PubkeyCache): boolean {
   // All signatures are not trusted and must be group checked (p2.subgroup_check)
   const signature = Signature.fromBytes(signatureSet.signature, true);
 
@@ -30,8 +81,20 @@ export function verifySignatureSet(signatureSet: ISignatureSet): boolean {
     case SignatureSetType.single:
       return verify(signatureSet.signingRoot, signatureSet.pubkey, signature);
 
-    case SignatureSetType.aggregate:
-      return fastAggregateVerify(signatureSet.signingRoot, signatureSet.pubkeys, signature);
+    case SignatureSetType.indexed: {
+      if (!index2pubkey) {
+        throw Error("index2pubkey required for indexed signature set");
+      }
+      return verify(signatureSet.signingRoot, index2pubkey[signatureSet.index], signature);
+    }
+
+    case SignatureSetType.aggregate: {
+      if (!index2pubkey) {
+        throw Error("index2pubkey required for aggregate signature set");
+      }
+      const pubkeys = signatureSet.indices.map((i) => index2pubkey[i]);
+      return fastAggregateVerify(signatureSet.signingRoot, pubkeys, signature);
+    }
 
     default:
       throw Error("Unknown signature set type");
@@ -51,14 +114,27 @@ export function createSingleSignatureSetFromComponents(
   };
 }
 
+export function createIndexedSignatureSetFromComponents(
+  index: number,
+  signingRoot: Root,
+  signature: Uint8Array
+): IndexedSignatureSet {
+  return {
+    type: SignatureSetType.indexed,
+    index,
+    signingRoot,
+    signature,
+  };
+}
+
 export function createAggregateSignatureSetFromComponents(
-  pubkeys: PublicKey[],
+  indices: number[],
   signingRoot: Root,
   signature: Uint8Array
 ): AggregatedSignatureSet {
   return {
     type: SignatureSetType.aggregate,
-    pubkeys,
+    indices,
     signingRoot,
     signature,
   };

package/src/util/validator.ts

@@ -2,13 +2,15 @@ import {ChainForkConfig} from "@lodestar/config";
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkSeq,
+  MAX_EFFECTIVE_BALANCE,
   MAX_EFFECTIVE_BALANCE_ELECTRA,
   MIN_ACTIVATION_BALANCE,
 } from "@lodestar/params";
 import {Epoch, ValidatorIndex, phase0} from "@lodestar/types";
 import {intDiv} from "@lodestar/utils";
 import {BeaconStateAllForks, CachedBeaconStateElectra, CachedBeaconStateGloas, EpochCache} from "../types.js";
-import {hasCompoundingWithdrawalCredential} from "./electra.js";
+import {hasEth1WithdrawalCredential} from "./capella.js";
+import {hasCompoundingWithdrawalCredential, hasExecutionWithdrawalCredential} from "./electra.js";
 
 /**
  * Check if [[validator]] is active
@@ -94,8 +96,35 @@ export function getMaxEffectiveBalance(withdrawalCredentials: Uint8Array): numbe
   return MIN_ACTIVATION_BALANCE;
 }
 
+/**
+ * Check if validator is partially withdrawable.
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/electra/beacon-chain.md#modified-is_partially_withdrawable_validator
+ */
+export function isPartiallyWithdrawableValidator(fork: ForkSeq, validator: phase0.Validator, balance: number): boolean {
+  const isPostElectra = fork >= ForkSeq.electra;
+
+  // Check withdrawal credentials
+  const hasWithdrawableCredentials = isPostElectra
+    ? hasExecutionWithdrawalCredential(validator.withdrawalCredentials)
+    : hasEth1WithdrawalCredential(validator.withdrawalCredentials);
+
+  if (!hasWithdrawableCredentials) {
+    return false;
+  }
+
+  // Get max effective balance based on fork
+  const maxEffectiveBalance = isPostElectra
+    ? getMaxEffectiveBalance(validator.withdrawalCredentials)
+    : MAX_EFFECTIVE_BALANCE;
+
+  // Check if at max effective balance and has excess balance
+  const hasMaxEffectiveBalance = validator.effectiveBalance === maxEffectiveBalance;
+  const hasExcessBalance = balance > maxEffectiveBalance;
+
+  return hasMaxEffectiveBalance && hasExcessBalance;
+}
+
 export function getPendingBalanceToWithdraw(
-  fork: ForkSeq,
   state: CachedBeaconStateElectra | CachedBeaconStateGloas,
   validatorIndex: ValidatorIndex
 ): number {
@@ -106,19 +135,5 @@ export function getPendingBalanceToWithdraw(
     }
   }
 
-  if (fork >= ForkSeq.gloas) {
-    const stateGloas = state as CachedBeaconStateGloas;
-    for (const item of stateGloas.builderPendingWithdrawals.getAllReadonly()) {
-      if (item.builderIndex === validatorIndex) {
-        total += item.amount;
-      }
-    }
-    for (const item of stateGloas.builderPendingPayments.getAllReadonly()) {
-      if (item.withdrawal.builderIndex === validatorIndex) {
-        total += item.withdrawal.amount;
-      }
-    }
-  }
-
   return total;
 }