Add extra metadata to block rewards

beacon_node/beacon_chain/src/block_reward.rs

@@ -1,5 +1,5 @@
 use crate::{BeaconChain, BeaconChainError, BeaconChainTypes};
-use eth2::lighthouse::{AttestationRewards, BlockReward};
+use eth2::lighthouse::{AttestationRewards, BlockReward, BlockRewardMeta};
 use operation_pool::{AttMaxCover, MaxCover};
 use std::collections::HashMap;
 use types::{BeaconBlockRef, BeaconState, EthSpec, Hash256, RelativeEpoch};
@@ -78,8 +78,16 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             per_attestation_rewards,
         };
 
+        let meta = BlockRewardMeta {
+            slot: block.slot(),
+            parent_slot: state.latest_block_header().slot,
+            proposer_index: block.proposer_index(),
+            graffiti: block.body().graffiti().as_utf8_lossy(),
+        };
+
         Ok(BlockReward {
             block_root,
+            meta,
             attestation_rewards,
         })
     }

common/eth2/src/lighthouse.rs

@@ -14,7 +14,7 @@ use ssz::four_byte_option_impl;
 use ssz_derive::{Decode, Encode};
 use store::{AnchorInfo, Split};
 
-pub use block_rewards::{AttestationRewards, BlockReward, BlockRewardsQuery};
+pub use block_rewards::{AttestationRewards, BlockReward, BlockRewardMeta, BlockRewardsQuery};
 pub use eth2_libp2p::{types::SyncState, PeerInfo};
 
 // Define "legacy" implementations of `Option<T>` which use four bytes for encoding the union

common/eth2/src/lighthouse/block_rewards.rs

@@ -12,10 +12,20 @@ use types::{Hash256, Slot};
 pub struct BlockReward {
     /// Block root of the block that these rewards are for.
     pub block_root: Hash256,
+    /// Metadata about the block, particularly reward-relevant metadata.
+    pub meta: BlockRewardMeta,
     /// Rewards due to attestations.
     pub attestation_rewards: AttestationRewards,
 }
 
+#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
+pub struct BlockRewardMeta {
+    pub slot: Slot,
+    pub parent_slot: Slot,
+    pub proposer_index: u64,
+    pub graffiti: String,
+}
+
 #[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]
 pub struct AttestationRewards {
     /// Total block reward from attestations included.