progress on gossip stuff

consensus/types/src/blob.rs

@@ -1,6 +1,7 @@
 use ssz_types::VariableList;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use ssz::{Decode, DecodeError, Encode};
+use tree_hash::TreeHash;
 use crate::test_utils::RngCore;
 use crate::bls_field_element::BlsFieldElement;
 use crate::{EthSpec, Uint256};
@@ -20,4 +21,54 @@ impl <T: EthSpec> TestRandom for Blob<T> {
         }
         res
     }
-}
+}
+
+impl<T: EthSpec> Encode for Blob<T> {
+    fn is_ssz_fixed_len() -> bool {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob> as Encode>::is_ssz_fixed_len()
+    }
+
+    fn ssz_fixed_len() -> usize {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob> as Encode>::ssz_fixed_len()
+    }
+
+    fn ssz_bytes_len(&self) -> usize {
+        self.0.ssz_bytes_len()
+    }
+
+    fn ssz_append(&self, buf: &mut Vec<u8>) {
+        self.0.ssz_append(buf)
+    }
+}
+
+impl<T: EthSpec> Decode for Blob<T> {
+    fn is_ssz_fixed_len() -> bool {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob> as Decode>::is_ssz_fixed_len()
+    }
+
+    fn ssz_fixed_len() -> usize {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob> as Decode>::ssz_fixed_len()
+    }
+
+    fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob>>::from_ssz_bytes(bytes).map(Self)
+    }
+}
+
+impl<T: EthSpec> TreeHash for Blob<T> {
+    fn tree_hash_type() -> tree_hash::TreeHashType {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob>>::tree_hash_type()
+    }
+
+    fn tree_hash_packed_encoding(&self) -> Vec<u8> {
+        self.0.tree_hash_packed_encoding()
+    }
+
+    fn tree_hash_packing_factor() -> usize {
+        <VariableList<BlsFieldElement, T::FieldElementsPerBlob>>::tree_hash_packing_factor()
+    }
+
+    fn tree_hash_root(&self) -> tree_hash::Hash256 {
+        self.0.tree_hash_root()
+    }
+}

consensus/types/src/blobs_sidecar.rs

@@ -0,0 +1,16 @@
+use ssz_types::VariableList;
+use crate::{EthSpec, Hash256, Slot};
+use crate::blob::Blob;
+use crate::kzg_proof::KzgProof;
+use serde::{Serialize, Deserialize};
+use ssz_derive::{Encode, Decode};
+use tree_hash_derive::TreeHash;
+use derivative::Derivative;
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Encode, Decode, TreeHash, Derivative)]
+pub struct BlobsSidecar<T: EthSpec> {
+    beacon_block_root: Hash256,
+    beacon_block_slot: Slot,
+    blobs: VariableList<Blob<T>, T::MaxBlobsPerBlock>,
+    kzg_aggregate_proof: KzgProof,
+}

consensus/types/src/bls_field_element.rs

@@ -1,7 +1,59 @@
-use crate::Uint256;
+use crate::{EthSpec, Uint256};
 use serde::{Deserialize, Serialize};
 use ssz::{Decode, DecodeError, Encode};
+use tree_hash::TreeHash;
 
 #[derive(Default, Debug, PartialEq, Hash, Clone, Copy, Serialize, Deserialize)]
 #[serde(transparent)]
-pub struct BlsFieldElement(pub Uint256);
+pub struct BlsFieldElement(pub Uint256);
+
+
+impl Encode for BlsFieldElement {
+    fn is_ssz_fixed_len() -> bool {
+        <Uint256 as Encode>::is_ssz_fixed_len()
+    }
+
+    fn ssz_fixed_len() -> usize {
+        <Uint256 as Encode>::ssz_fixed_len()
+    }
+
+    fn ssz_bytes_len(&self) -> usize {
+        self.0.ssz_bytes_len()
+    }
+
+    fn ssz_append(&self, buf: &mut Vec<u8>) {
+        self.0.ssz_append(buf)
+    }
+}
+
+impl Decode for BlsFieldElement {
+    fn is_ssz_fixed_len() -> bool {
+        <Uint256 as Decode>::is_ssz_fixed_len()
+    }
+
+    fn ssz_fixed_len() -> usize {
+        <Uint256 as Decode>::ssz_fixed_len()
+    }
+
+    fn from_ssz_bytes(bytes: &[u8]) -> Result<Self, DecodeError> {
+        <Uint256 as Decode>::from_ssz_bytes(bytes).map(Self)
+    }
+}
+
+impl TreeHash for BlsFieldElement {
+    fn tree_hash_type() -> tree_hash::TreeHashType {
+        <Uint256>::tree_hash_type()
+    }
+
+    fn tree_hash_packed_encoding(&self) -> Vec<u8> {
+        self.0.tree_hash_packed_encoding()
+    }
+
+    fn tree_hash_packing_factor() -> usize {
+        <Uint256>::tree_hash_packing_factor()
+    }
+
+    fn tree_hash_root(&self) -> tree_hash::Hash256 {
+        self.0.tree_hash_root()
+    }
+}

consensus/types/src/lib.rs

@@ -96,6 +96,8 @@ pub mod kzg_commitment;
 pub mod kzg_proof;
 pub mod bls_field_element;
 pub mod blob;
+pub mod signed_blobs_sidecar;
+pub mod blobs_sidecar;
 
 use ethereum_types::{H160, H256};
 

consensus/types/src/signed_blobs_sidecar.rs

@@ -0,0 +1,13 @@
+use bls::Signature;
+use crate::blobs_sidecar::BlobsSidecar;
+use crate::EthSpec;
+use serde::{Serialize, Deserialize};
+use ssz_derive::{Encode, Decode};
+use tree_hash_derive::TreeHash;
+use derivative::Derivative;
+
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Encode, Decode, TreeHash, Derivative)]
+pub struct SignedBlobsSidecar<T: EthSpec> {
+    pub message: BlobsSidecar<T>,
+    pub signature: Signature,
+}