add light versions of some entities

impl From for beacon BlockHeader

Author: gshep

ethereum-common/src/beacon/block_header.rs

@@ -10,3 +10,15 @@ pub struct BlockHeader {
     pub state_root: Hash256,
     pub body_root: Hash256,
 }
+
+impl From<Block> for BlockHeader {
+    fn from(value: Block) -> Self {
+        Self {
+            slot: value.slot,
+            proposer_index: value.proposer_index,
+            parent_root: value.parent_root,
+            state_root: value.state_root,
+            body_root: value.body.tree_hash_root(),
+        }
+    }
+}

ethereum-common/src/beacon/light.rs

@@ -0,0 +1,113 @@
+// Module contains lightened versions of the entities.
+
+use super::*;
+
+#[derive(Debug, Clone, Decode, Encode, Deserialize, tree_hash_derive::TreeHash)]
+pub struct ExecutionPayload {
+    pub parent_hash: Bytes32,
+    pub fee_recipient: Address,
+    pub state_root: Bytes32,
+    pub receipts_root: Bytes32,
+    pub logs_bloom: H256,
+    pub prev_randao: Bytes32,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub block_number: u64,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub gas_limit: u64,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub gas_used: u64,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub timestamp: u64,
+    pub extra_data: base_types::ByteList<32>,
+    #[serde(deserialize_with = "utils::deserialize_u256")]
+    pub base_fee_per_gas: U256,
+    pub block_hash: Bytes32,
+    pub transactions: H256,
+    pub withdrawals: H256,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub blob_gas_used: u64,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub excess_blob_gas: u64,
+}
+
+impl From<super::ExecutionPayload> for ExecutionPayload {
+    fn from(value: super::ExecutionPayload) -> Self {
+        Self {
+            parent_hash: value.parent_hash,
+            fee_recipient: value.fee_recipient,
+            state_root: value.state_root,
+            receipts_root: value.receipts_root,
+            logs_bloom: value.logs_bloom.tree_hash_root(),
+            prev_randao: value.prev_randao,
+            block_number: value.block_number,
+            gas_limit: value.gas_limit,
+            gas_used: value.gas_used,
+            timestamp: value.timestamp,
+            extra_data: value.extra_data,
+            base_fee_per_gas: value.base_fee_per_gas,
+            block_hash: value.block_hash,
+            transactions: value.transactions.tree_hash_root(),
+            withdrawals: value.withdrawals.tree_hash_root(),
+            blob_gas_used: value.blob_gas_used,
+            excess_blob_gas: value.excess_blob_gas,
+        }
+    }
+}
+
+#[derive(Debug, Clone, Decode, Encode, tree_hash_derive::TreeHash, Deserialize)]
+pub struct BlockBody {
+    pub randao_reveal: H256,
+    pub eth1_data: H256,
+    pub graffiti: Bytes32,
+    pub proposer_slashings: H256,
+    pub attester_slashings: H256,
+    pub attestations: H256,
+    pub deposits: H256,
+    pub voluntary_exits: H256,
+    pub sync_aggregate: H256,
+    pub execution_payload: ExecutionPayload,
+    pub bls_to_execution_changes: H256,
+    pub blob_kzg_commitments: H256,
+}
+
+impl From<super::BlockBody> for BlockBody {
+    fn from(value: super::BlockBody) -> Self {
+        Self {
+            randao_reveal: value.randao_reveal.tree_hash_root(),
+            eth1_data: value.eth1_data.tree_hash_root(),
+            graffiti: value.graffiti,
+            proposer_slashings: value.proposer_slashings.tree_hash_root(),
+            attester_slashings: value.attester_slashings.tree_hash_root(),
+            attestations: value.attestations.tree_hash_root(),
+            deposits: value.deposits.tree_hash_root(),
+            voluntary_exits: value.voluntary_exits.tree_hash_root(),
+            sync_aggregate: value.sync_aggregate.tree_hash_root(),
+            execution_payload: value.execution_payload.into(),
+            bls_to_execution_changes: value.bls_to_execution_changes.tree_hash_root(),
+            blob_kzg_commitments: value.blob_kzg_commitments.tree_hash_root(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, tree_hash_derive::TreeHash, Decode, Encode, Deserialize)]
+pub struct Block {
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub slot: u64,
+    #[serde(deserialize_with = "utils::deserialize_u64")]
+    pub proposer_index: u64,
+    pub parent_root: Hash256,
+    pub state_root: Hash256,
+    pub body: BlockBody,
+}
+
+impl From<super::Block> for Block {
+    fn from(value: super::Block) -> Self {
+        Self {
+            slot: value.slot,
+            proposer_index: value.proposer_index,
+            parent_root: value.parent_root,
+            state_root: value.state_root,
+            body: value.body.into(),
+        }
+    }
+}

ethereum-common/src/beacon/mod.rs

@@ -5,6 +5,7 @@ mod block_body;
 mod block_header;
 mod common;
 mod execution_payload;
+pub mod light;
 
 pub use block::Block;
 pub use block_body::BlockBody;

gear-programs/checkpoint-light-client/io/src/lib.rs

@@ -16,7 +16,9 @@ pub use ark_bls12_381::{G1Projective as G1, G2Projective as G2};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 pub use ethereum_common::{
     self,
-    beacon::{BLSPubKey, BlockHeader as BeaconBlockHeader, Bytes32, SyncAggregate},
+    beacon::{
+        BLSPubKey, Block as BeaconBlock, BlockHeader as BeaconBlockHeader, Bytes32, SyncAggregate,
+    },
     network::Network,
     tree_hash, SYNC_COMMITTEE_SIZE,
 };