gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-06 10:11:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'capella' of https://github.com/sigp/lighthouse into eip4844

Browse Source
This commit is contained in:
sean
2022-12-12 22:41:54 +00:00
parent 9806f54f2d f7a54afde5
commit 2a7a1b31dc
8 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
consensus/state_processing/src/per_block_processing/errors.rs
View File

@@ -305,7 +305,7 @@ pub enum AttesterSlashingInvalid {
/// Describes why an object is invalid.
#[derive(Debug, PartialEq, Clone)]
pub enum AttestationInvalid {
/// Commmittee index exceeds number of committees in that slot.
/// Committee index exceeds number of committees in that slot.
BadCommitteeIndex,
/// Attestation included before the inclusion delay.
IncludedTooEarly {
@@ -420,11 +420,11 @@ pub enum ExitInvalid {
pub enum BlsExecutionChangeInvalid {
/// The specified validator is not in the state's validator registry.
ValidatorUnknown(u64),
/// Validator does not have BLS Withdrawal credentials before this change
/// Validator does not have BLS Withdrawal credentials before this change.
NonBlsWithdrawalCredentials,
/// Provided BLS pubkey does not match withdrawal credentials
/// Provided BLS pubkey does not match withdrawal credentials.
WithdrawalCredentialsMismatch,
/// The signature is invalid
/// The signature is invalid.
BadSignature,
}

2
consensus/state_processing/src/per_block_processing/process_operations.rs
View File

@@ -293,7 +293,7 @@ pub fn process_exits<T: EthSpec>(
/// Validates each `bls_to_execution_change` and updates the state
///
/// Returns `Ok(())` if the validation and state updates completed successfully. Otherwise returs
/// Returns `Ok(())` if the validation and state updates completed successfully. Otherwise returns
/// an `Err` describing the invalid object or cause of failure.
pub fn process_bls_to_execution_changes<T: EthSpec>(
state: &mut BeaconState<T>,

2
consensus/state_processing/src/upgrade/eip4844.rs
View File

@@ -67,7 +67,7 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
#[cfg(feature = "withdrawals")]
next_withdrawal_index: pre.next_withdrawal_index,
#[cfg(feature = "withdrawals")]
next_withdrawal_validator_index: 0,
next_withdrawal_validator_index: pre.next_withdrawal_validator_index,
// Caches
total_active_balance: pre.total_active_balance,
committee_caches: mem::take(&mut pre.committee_caches),