Validator blob signing for the unblinded flow (#4096)

* Implement validator blob signing (full block and full blob) * Fix compilation error and remove redundant slot check * Fix clippy error
sigp · Mar 17, 2023 · 1301c62 · 1301c62
1 parent 3c18e1a
commit 1301c62
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 114 deletions.
diff --git a/common/eth2/src/types.rs b/common/eth2/src/types.rs
@@ -1326,7 +1326,7 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> Into<BeaconBlock<T, Payload>>
 
 pub type BlockContentsTuple<T, Payload> = (
     SignedBeaconBlock<T, Payload>,
-    Option<VariableList<SignedBlobSidecar<T>, <T as EthSpec>::MaxBlobsPerBlock>>,
+    Option<SignedBlobSidecarList<T>>,
 );
 
 /// A wrapper over a [`SignedBeaconBlock`] or a [`SignedBeaconBlockAndBlobSidecars`].
@@ -1374,9 +1374,25 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> From<SignedBeaconBlock<T, Payl
     }
 }
 
+impl<T: EthSpec, Payload: AbstractExecPayload<T>> From<BlockContentsTuple<T, Payload>>
+    for SignedBlockContents<T, Payload>
+{
+    fn from(block_contents_tuple: BlockContentsTuple<T, Payload>) -> Self {
+        match block_contents_tuple {
+            (signed_block, None) => SignedBlockContents::Block(signed_block),
+            (signed_block, Some(signed_blob_sidecars)) => {
+                SignedBlockContents::BlockAndBlobSidecars(SignedBeaconBlockAndBlobSidecars {
+                    signed_block,
+                    signed_blob_sidecars,
+                })
+            }
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize, Encode)]
 #[serde(bound = "T: EthSpec")]
 pub struct SignedBeaconBlockAndBlobSidecars<T: EthSpec, Payload: AbstractExecPayload<T>> {
     pub signed_block: SignedBeaconBlock<T, Payload>,
-    pub signed_blob_sidecars: VariableList<SignedBlobSidecar<T>, <T as EthSpec>::MaxBlobsPerBlock>,
+    pub signed_blob_sidecars: SignedBlobSidecarList<T>,
 }
diff --git a/consensus/types/src/chain_spec.rs b/consensus/types/src/chain_spec.rs
@@ -14,7 +14,7 @@ pub enum Domain {
     BlsToExecutionChange,
     BeaconProposer,
     BeaconAttester,
-    BlobsSideCar,
+    BlobSidecar,
     Randao,
     Deposit,
     VoluntaryExit,
@@ -100,7 +100,7 @@ pub struct ChainSpec {
      */
     pub(crate) domain_beacon_proposer: u32,
     pub(crate) domain_beacon_attester: u32,
-    pub(crate) domain_blobs_sidecar: u32,
+    pub(crate) domain_blob_sidecar: u32,
     pub(crate) domain_randao: u32,
     pub(crate) domain_deposit: u32,
     pub(crate) domain_voluntary_exit: u32,
@@ -366,7 +366,7 @@ impl ChainSpec {
         match domain {
             Domain::BeaconProposer => self.domain_beacon_proposer,
             Domain::BeaconAttester => self.domain_beacon_attester,
-            Domain::BlobsSideCar => self.domain_blobs_sidecar,
+            Domain::BlobSidecar => self.domain_blob_sidecar,
             Domain::Randao => self.domain_randao,
             Domain::Deposit => self.domain_deposit,
             Domain::VoluntaryExit => self.domain_voluntary_exit,
@@ -574,7 +574,7 @@ impl ChainSpec {
             domain_voluntary_exit: 4,
             domain_selection_proof: 5,
             domain_aggregate_and_proof: 6,
-            domain_blobs_sidecar: 10, // 0x0a000000
+            domain_blob_sidecar: 11, // 0x0B000000
 
             /*
              * Fork choice
@@ -809,7 +809,7 @@ impl ChainSpec {
             domain_voluntary_exit: 4,
             domain_selection_proof: 5,
             domain_aggregate_and_proof: 6,
-            domain_blobs_sidecar: 10,
+            domain_blob_sidecar: 11,
 
             /*
              * Fork choice
@@ -1285,7 +1285,7 @@ mod tests {
 
         test_domain(Domain::BeaconProposer, spec.domain_beacon_proposer, &spec);
         test_domain(Domain::BeaconAttester, spec.domain_beacon_attester, &spec);
-        test_domain(Domain::BlobsSideCar, spec.domain_blobs_sidecar, &spec);
+        test_domain(Domain::BlobSidecar, spec.domain_blob_sidecar, &spec);
         test_domain(Domain::Randao, spec.domain_randao, &spec);
         test_domain(Domain::Deposit, spec.domain_deposit, &spec);
         test_domain(Domain::VoluntaryExit, spec.domain_voluntary_exit, &spec);
@@ -1311,7 +1311,7 @@ mod tests {
             &spec,
         );
 
-        test_domain(Domain::BlobsSideCar, spec.domain_blobs_sidecar, &spec);
+        test_domain(Domain::BlobSidecar, spec.domain_blob_sidecar, &spec);
     }
 
     fn apply_bit_mask(domain_bytes: [u8; 4], spec: &ChainSpec) -> u32 {

diff --git a/consensus/types/src/config_and_preset.rs b/consensus/types/src/config_and_preset.rs
@@ -78,7 +78,7 @@ pub fn get_extra_fields(spec: &ChainSpec) -> HashMap<String, Value> {
         "bls_withdrawal_prefix".to_uppercase() => u8_hex(spec.bls_withdrawal_prefix_byte),
         "domain_beacon_proposer".to_uppercase() => u32_hex(spec.domain_beacon_proposer),
         "domain_beacon_attester".to_uppercase() => u32_hex(spec.domain_beacon_attester),
-        "domain_blobs_sidecar".to_uppercase() => u32_hex(spec.domain_blobs_sidecar),
+        "domain_blob_sidecar".to_uppercase() => u32_hex(spec.domain_blob_sidecar),
         "domain_randao".to_uppercase()=> u32_hex(spec.domain_randao),
         "domain_deposit".to_uppercase()=> u32_hex(spec.domain_deposit),
         "domain_voluntary_exit".to_uppercase() => u32_hex(spec.domain_voluntary_exit),

diff --git a/consensus/types/src/signed_blob.rs b/consensus/types/src/signed_blob.rs
@@ -2,6 +2,7 @@ use crate::{test_utils::TestRandom, BlobSidecar, EthSpec, Signature};
 use derivative::Derivative;
 use serde_derive::{Deserialize, Serialize};
 use ssz_derive::{Decode, Encode};
+use ssz_types::VariableList;
 use test_random_derive::TestRandom;
 use tree_hash_derive::TreeHash;
 
@@ -25,3 +26,6 @@ pub struct SignedBlobSidecar<T: EthSpec> {
     pub message: BlobSidecar<T>,
     pub signature: Signature,
 }
+
+pub type SignedBlobSidecarList<T> =
+    VariableList<SignedBlobSidecar<T>, <T as EthSpec>::MaxBlobsPerBlock>;