Merge remote-tracking branch 'origin/unstable' into tree-states

This commit is contained in:
Michael Sproul
2022-11-30 14:14:17 +11:00
173 changed files with 6359 additions and 1655 deletions

View File

@@ -267,7 +267,7 @@ impl<T: EthSpec> OperationPool<T> {
&prev_epoch_key,
&*all_attestations,
state,
&*reward_cache,
&reward_cache,
total_active_balance,
prev_epoch_validity_filter,
spec,
@@ -278,7 +278,7 @@ impl<T: EthSpec> OperationPool<T> {
&curr_epoch_key,
&*all_attestations,
state,
&*reward_cache,
&reward_cache,
total_active_balance,
curr_epoch_validity_filter,
spec,