Update block rewards API for Capella

This commit is contained in:
Michael Sproul 2023-02-14 12:09:40 +11:00
parent d53ccf8fc7
commit f7bd4bf06e
No known key found for this signature in database
GPG Key ID: 77B1309D2E54E914

View File

@ -15,12 +15,12 @@ use store::{
consts::altair::{PARTICIPATION_FLAG_WEIGHTS, PROPOSER_WEIGHT, WEIGHT_DENOMINATOR}, consts::altair::{PARTICIPATION_FLAG_WEIGHTS, PROPOSER_WEIGHT, WEIGHT_DENOMINATOR},
RelativeEpoch, RelativeEpoch,
}; };
use types::{BeaconBlockRef, BeaconState, BeaconStateError, ExecPayload, Hash256}; use types::{AbstractExecPayload, BeaconBlockRef, BeaconState, BeaconStateError, Hash256};
type BeaconBlockSubRewardValue = u64; type BeaconBlockSubRewardValue = u64;
impl<T: BeaconChainTypes> BeaconChain<T> { impl<T: BeaconChainTypes> BeaconChain<T> {
pub fn compute_beacon_block_reward<Payload: ExecPayload<T::EthSpec>>( pub fn compute_beacon_block_reward<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
block_root: Hash256, block_root: Hash256,
@ -97,7 +97,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
}) })
} }
fn compute_beacon_block_sync_aggregate_reward<Payload: ExecPayload<T::EthSpec>>( fn compute_beacon_block_sync_aggregate_reward<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
state: &BeaconState<T::EthSpec>, state: &BeaconState<T::EthSpec>,
@ -111,7 +111,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
} }
} }
fn compute_beacon_block_proposer_slashing_reward<Payload: ExecPayload<T::EthSpec>>( fn compute_beacon_block_proposer_slashing_reward<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
state: &BeaconState<T::EthSpec>, state: &BeaconState<T::EthSpec>,
@ -132,7 +132,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
Ok(proposer_slashing_reward) Ok(proposer_slashing_reward)
} }
fn compute_beacon_block_attester_slashing_reward<Payload: ExecPayload<T::EthSpec>>( fn compute_beacon_block_attester_slashing_reward<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
state: &BeaconState<T::EthSpec>, state: &BeaconState<T::EthSpec>,
@ -155,7 +155,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
Ok(attester_slashing_reward) Ok(attester_slashing_reward)
} }
fn compute_beacon_block_attestation_reward_base<Payload: ExecPayload<T::EthSpec>>( fn compute_beacon_block_attestation_reward_base<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
block_root: Hash256, block_root: Hash256,
@ -173,7 +173,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
Ok(block_attestation_reward) Ok(block_attestation_reward)
} }
fn compute_beacon_block_attestation_reward_altair<Payload: ExecPayload<T::EthSpec>>( fn compute_beacon_block_attestation_reward_altair<Payload: AbstractExecPayload<T::EthSpec>>(
&self, &self,
block: BeaconBlockRef<'_, T::EthSpec, Payload>, block: BeaconBlockRef<'_, T::EthSpec, Payload>,
state: &mut BeaconState<T::EthSpec>, state: &mut BeaconState<T::EthSpec>,