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

op-pool: rename to verify_*_time_independent_only

Browse Source
This commit is contained in:
Michael Sproul
2019-03-20 16:13:06 +11:00
parent b2fe14e12c
commit 95ed402228
3 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
eth2/state_processing/src/per_block_processing/verify_transfer.rs
View File

@@ -16,18 +16,24 @@ pub fn verify_transfer(
transfer: &Transfer,
spec: &ChainSpec,
) -> Result<(), Error> {
verify_transfer_partial(state, transfer, spec, false)
verify_transfer_parametric(state, transfer, spec, false)
}
/// Parametric version of `verify_transfer` that allows some checks to be skipped.
///
/// In everywhere except the operation pool, `verify_transfer` should be preferred over this
/// function.
pub fn verify_transfer_partial(
/// Like `verify_transfer` but doesn't run checks which may become true in future states.
pub fn verify_transfer_time_independent_only(
state: &BeaconState,
transfer: &Transfer,
spec: &ChainSpec,
for_op_pool: bool,
) -> Result<(), Error> {
verify_transfer_parametric(state, transfer, spec, true)
}
/// Parametric version of `verify_transfer` that allows some checks to be skipped.
fn verify_transfer_parametric(
state: &BeaconState,
transfer: &Transfer,
spec: &ChainSpec,
time_independent_only: bool,
) -> Result<(), Error> {
let sender_balance = *state
.validator_balances
@@ -40,17 +46,17 @@ pub fn verify_transfer_partial(
.ok_or_else(|| Error::Invalid(Invalid::FeeOverflow(transfer.amount, transfer.fee)))?;
verify!(
for_op_pool || sender_balance >= transfer.amount,
time_independent_only || sender_balance >= transfer.amount,
Invalid::FromBalanceInsufficient(transfer.amount, sender_balance)
);
verify!(
for_op_pool || sender_balance >= transfer.fee,
time_independent_only || sender_balance >= transfer.fee,
Invalid::FromBalanceInsufficient(transfer.fee, sender_balance)
);
verify!(
for_op_pool
time_independent_only
|| (sender_balance == total_amount)
|| (sender_balance >= (total_amount + spec.min_deposit_amount)),
Invalid::InvalidResultingFromBalance(
@@ -59,7 +65,7 @@ pub fn verify_transfer_partial(
)
);
if for_op_pool {
if time_independent_only {
verify!(
state.slot <= transfer.slot,
Invalid::TransferSlotInPast(state.slot, transfer.slot)
@@ -78,7 +84,7 @@ pub fn verify_transfer_partial(
let epoch = state.slot.epoch(spec.slots_per_epoch);
verify!(
for_op_pool
time_independent_only
|| sender_validator.is_withdrawable_at(epoch)
|| sender_validator.activation_epoch == spec.far_future_epoch,
Invalid::FromValidatorIneligableForTransfer(transfer.sender)