beacon chain

beacon_node/beacon_chain/Cargo.toml

@@ -19,58 +19,60 @@ environment = { workspace = true }
 serde_json = { workspace = true }
 
 [dependencies]
-serde_json = { workspace = true }
+bitvec = { workspace = true }
+bls = { workspace = true }
+crossbeam-channel = { workspace = true }
+derivative = { workspace = true }
+eth1 = { workspace = true }
+eth2 = { workspace = true }
 eth2_network_config = { workspace = true }
-merkle_proof = { workspace = true }
-store = { workspace = true }
-parking_lot = { workspace = true }
+ethereum_hashing = { workspace = true }
+ethereum_serde_utils = { workspace = true }
+ethereum_ssz = { workspace = true }
+ethereum_ssz_derive = { workspace = true }
+execution_layer = { workspace = true }
+fork_choice = { workspace = true }
+futures = { workspace = true }
+genesis = { workspace = true }
+hex = { workspace = true }
+int_to_bytes = { workspace = true }
+itertools = { workspace = true }
+kzg = { workspace = true }
 lazy_static = { workspace = true }
-smallvec = { workspace = true }
 lighthouse_metrics = { workspace = true }
+logging = { workspace = true }
+lru = { workspace = true }
+merkle_proof = { workspace = true }
+oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
 operation_pool = { workspace = true }
+parking_lot = { workspace = true }
+promise_cache = { path = "../../common/promise_cache" }
+proto_array = { workspace = true }
+rand = { workspace = true }
 rayon = { workspace = true }
+safe_arith = { workspace = true }
+sensitive_url = { workspace = true }
 serde = { workspace = true }
-ethereum_serde_utils = { workspace = true }
+serde_json = { workspace = true }
+slasher = { workspace = true }
 slog = { workspace = true }
+slog-async = { workspace = true }
+slog-term = { workspace = true }
 sloggers = { workspace = true }
 slot_clock = { workspace = true }
-ethereum_hashing = { workspace = true }
-ethereum_ssz = { workspace = true }
+smallvec = { workspace = true }
 ssz_types = { workspace = true }
-ethereum_ssz_derive = { workspace = true }
 state_processing = { workspace = true }
-tree_hash_derive = { workspace = true }
-tree_hash = { workspace = true }
-types = { workspace = true }
-tokio = { workspace = true }
-tokio-stream = { workspace = true }
-eth1 = { workspace = true }
-futures = { workspace = true }
-genesis = { workspace = true }
-int_to_bytes = { workspace = true }
-rand = { workspace = true }
-proto_array = { workspace = true }
-lru = { workspace = true }
-tempfile = { workspace = true }
-bitvec = { workspace = true }
-bls = { workspace = true }
-kzg = { workspace = true }
-safe_arith = { workspace = true }
-fork_choice = { workspace = true }
-task_executor = { workspace = true }
-derivative = { workspace = true }
-itertools = { workspace = true }
-slasher = { workspace = true }
-eth2 = { workspace = true }
+store = { workspace = true }
 strum = { workspace = true }
-logging = { workspace = true }
-execution_layer = { workspace = true }
-sensitive_url = { workspace = true }
 superstruct = { workspace = true }
-hex = { workspace = true }
-oneshot_broadcast = { path = "../../common/oneshot_broadcast/" }
-slog-term = { workspace = true }
-slog-async = { workspace = true }
+task_executor = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true }
+tokio-stream = { workspace = true }
+tree_hash = { workspace = true }
+tree_hash_derive = { workspace = true }
+types = { workspace = true }
 
 [[test]]
 name = "beacon_chain_tests"

beacon_node/beacon_chain/src/attestation_rewards.rs

@@ -230,13 +230,13 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             let mut inactivity_penalty = 0i64;
 
             if eligible {
-                let effective_balance = validator.effective_balance;
+                let effective_balance = validator.effective_balance();
 
                 for flag_index in 0..PARTICIPATION_FLAG_WEIGHTS.len() {
                     let (ideal_reward, penalty) = ideal_rewards_hashmap
                         .get(&(flag_index, effective_balance))
                         .ok_or(BeaconChainError::AttestationRewardsError)?;
-                    let voted_correctly = !validator.slashed
+                    let voted_correctly = !validator.slashed()
                         && previous_epoch_participation_flags.has_flag(flag_index)?;
                     if voted_correctly {
                         if flag_index == TIMELY_HEAD_FLAG_INDEX {

beacon_node/beacon_chain/src/beacon_block_reward.rs

@@ -135,7 +135,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             proposer_slashing_reward.safe_add_assign(
                 state
                     .get_validator(proposer_slashing.proposer_index() as usize)?
-                    .effective_balance
+                    .effective_balance()
                     .safe_div(self.spec.whistleblower_reward_quotient)?,
             )?;
         }
@@ -157,7 +157,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 attester_slashing_reward.safe_add_assign(
                     state
                         .get_validator(attester_index as usize)?
-                        .effective_balance
+                        .effective_balance()
                         .safe_div(self.spec.whistleblower_reward_quotient)?,
                 )?;
             }