Fix Consolidation Sigs & Withdrawals

sigp · May 12, 2024 · 217fa9f · 217fa9f
1 parent c900a88
commit 217fa9f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/consensus/state_processing/src/per_block_processing/process_operations.rs b/consensus/state_processing/src/per_block_processing/process_operations.rs
@@ -559,8 +559,8 @@ pub fn process_execution_layer_withdrawal_requests<E: EthSpec>(
         let has_correct_credential = validator.has_execution_withdrawal_credential(spec);
         let is_correct_source_address = validator
             .get_execution_withdrawal_address(spec)
-            .ok_or(BeaconStateError::NonExecutionAddresWithdrawalCredential)?
-            == request.source_address;
+            .map(|addr| addr == request.source_address)
+            .unwrap_or(false);
 
         if !(has_correct_credential && is_correct_source_address) {
             continue;

diff --git a/consensus/state_processing/src/per_block_processing/signature_sets.rs b/consensus/state_processing/src/per_block_processing/signature_sets.rs
@@ -681,10 +681,9 @@ where
     let source_index = consolidation.message.source_index as usize;
     let target_index = consolidation.message.target_index as usize;
 
-    let domain = spec.get_domain(
-        consolidation.message.epoch,
+    let domain = spec.compute_domain(
         Domain::Consolidation,
-        &state.fork(),
+        spec.genesis_fork_version,
         state.genesis_validators_root(),
     );