Fix two small nits dealing with deposits (Consensys#8713)

zilm13 · Oct 14, 2024 · 542ebf2 · 542ebf2
1 parent b2a46b8
commit 542ebf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/.../spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java b/.../spec/src/main/java/tech/pegasys/teku/spec/logic/common/block/AbstractBlockProcessor.java
@@ -756,7 +756,7 @@ public void applyDeposit(
       // Verify the deposit signature (proof of possession) which is not checked by the deposit
       // contract
       if (signatureAlreadyVerified
-          || depositSignatureIsValid(pubkey, withdrawalCredentials, amount, signature)) {
+          || isValidDepositSignature(pubkey, withdrawalCredentials, amount, signature)) {
         addValidatorToRegistry(state, pubkey, withdrawalCredentials, amount);
       } else {
         handleInvalidDeposit(pubkey, maybePubkeyToIndexMap);
@@ -796,7 +796,7 @@ protected void handleInvalidDeposit(
   }
 
   /** is_valid_deposit_signature */
-  protected boolean depositSignatureIsValid(
+  protected boolean isValidDepositSignature(
       final BLSPublicKey pubkey,
       final Bytes32 withdrawalCredentials,
       final UInt64 amount,

diff --git a/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java b/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java
@@ -642,7 +642,7 @@ public void applyDeposit(
       // Verify the deposit signature (proof of possession) which is not checked by the deposit
       // contract
       if (signatureAlreadyVerified
-          || depositSignatureIsValid(pubkey, withdrawalCredentials, amount, signature)) {
+          || isValidDepositSignature(pubkey, withdrawalCredentials, amount, signature)) {
         addValidatorToRegistry(state, pubkey, withdrawalCredentials, ZERO);
         final PendingDeposit deposit =
             schemaDefinitionsElectra
@@ -777,18 +777,4 @@ private Optional<OperationInvalidReason> checkCommittees(
     }
     return Optional.empty();
   }
-
-  protected Validator getValidatorFromDeposit(
-      final BLSPublicKey pubkey, final Bytes32 withdrawalCredentials) {
-    final UInt64 effectiveBalance = UInt64.ZERO;
-    return new Validator(
-        pubkey,
-        withdrawalCredentials,
-        effectiveBalance,
-        false,
-        FAR_FUTURE_EPOCH,
-        FAR_FUTURE_EPOCH,
-        FAR_FUTURE_EPOCH,
-        FAR_FUTURE_EPOCH);
-  }
 }
diff --git a/...pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java b/...pegasys/teku/spec/logic/versions/electra/statetransition/epoch/EpochProcessorElectra.java
@@ -204,7 +204,7 @@ public void applyPendingDeposits(final MutableBeaconState state, final PendingDe
             validatorIndex ->
                 beaconStateMutators.increaseBalance(state, validatorIndex, deposit.getAmount()),
             () -> {
-              if (depositSignatureIsValid(deposit)) {
+              if (isValidDepositSignature(deposit)) {
                 addValidatorToRegistry(
                     state,
                     deposit.getPublicKey(),
@@ -214,9 +214,9 @@ public void applyPendingDeposits(final MutableBeaconState state, final PendingDe
             });
   }
 
-  // TODO-lucas Duplicates method depositSignatureIsValid from BlockProcessor
+  // TODO-lucas Duplicates method isValidDepositSignature from BlockProcessor
   /** is_valid_deposit_signature */
-  public boolean depositSignatureIsValid(final PendingDeposit deposit) {
+  public boolean isValidDepositSignature(final PendingDeposit deposit) {
     try {
       return depositSignatureVerifier.verify(
           deposit.getPublicKey(),