gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Duplicate KZG Commitment Merkle Proof Code (#5874)

Browse Source 
* Remove Duplicate KZG Commitment Merkle Proof Code

* s/tree_lists/fields/
This commit is contained in:
ethDreamer
2024-06-01 18:51:00 +02:00
committed by GitHub
parent 29ed1c5c26
commit f9d354539a
1 changed files with 82 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
consensus/types/src/beacon_block_body.rs
View File

@@ -2,6 +2,7 @@ use crate::test_utils::TestRandom;
use crate::*; use crate::*;
use derivative::Derivative; use derivative::Derivative;
use merkle_proof::{MerkleTree, MerkleTreeError}; use merkle_proof::{MerkleTree, MerkleTreeError};
use metastruct::metastruct;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use ssz_derive::{Decode, Encode}; use ssz_derive::{Decode, Encode};
use std::marker::PhantomData; use std::marker::PhantomData;
@@ -50,6 +51,14 @@ pub const BLOB_KZG_COMMITMENTS_INDEX: usize = 11;
), ),
arbitrary(bound = "E: EthSpec, Payload: AbstractExecPayload<E>"), arbitrary(bound = "E: EthSpec, Payload: AbstractExecPayload<E>"),
), ),
specific_variant_attributes(
Base(metastruct(mappings(beacon_block_body_base_fields(groups(fields))))),
Altair(metastruct(mappings(beacon_block_body_altair_fields(groups(fields))))),
Bellatrix(metastruct(mappings(beacon_block_body_bellatrix_fields(groups(fields))))),
Capella(metastruct(mappings(beacon_block_body_capella_fields(groups(fields))))),
Deneb(metastruct(mappings(beacon_block_body_deneb_fields(groups(fields))))),
Electra(metastruct(mappings(beacon_block_body_electra_fields(groups(fields))))),
),
cast_error(ty = "Error", expr = "Error::IncorrectStateVariant"), cast_error(ty = "Error", expr = "Error::IncorrectStateVariant"),
partial_getter_error(ty = "Error", expr = "Error::IncorrectStateVariant") partial_getter_error(ty = "Error", expr = "Error::IncorrectStateVariant")
)] )]
@@ -108,6 +117,7 @@ pub struct BeaconBlockBody<E: EthSpec, Payload: AbstractExecPayload<E> = FullPay
#[superstruct(only(Electra))] #[superstruct(only(Electra))]
pub consolidations: VariableList<SignedConsolidation, E::MaxConsolidations>, pub consolidations: VariableList<SignedConsolidation, E::MaxConsolidations>,
#[superstruct(only(Base, Altair))] #[superstruct(only(Base, Altair))]
#[metastruct(exclude_from(fields))]
#[ssz(skip_serializing, skip_deserializing)] #[ssz(skip_serializing, skip_deserializing)]
#[tree_hash(skip_hashing)] #[tree_hash(skip_hashing)]
#[serde(skip)] #[serde(skip)]
@@ -132,139 +142,88 @@ impl<'a, E: EthSpec, Payload: AbstractExecPayload<E>> BeaconBlockBodyRef<'a, E,
} }
} }
fn body_merkle_leaves(&self) -> Vec<Hash256> {
let mut leaves = vec![];
match self {
Self::Base(body) => {
beacon_block_body_base_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
Self::Altair(body) => {
beacon_block_body_altair_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
Self::Bellatrix(body) => {
beacon_block_body_bellatrix_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
Self::Capella(body) => {
beacon_block_body_capella_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
Self::Deneb(body) => {
beacon_block_body_deneb_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
Self::Electra(body) => {
beacon_block_body_electra_fields!(body, |_, field| leaves
.push(field.tree_hash_root()));
}
}
leaves
}
/// Produces the proof of inclusion for a `KzgCommitment` in `self.blob_kzg_commitments` /// Produces the proof of inclusion for a `KzgCommitment` in `self.blob_kzg_commitments`
/// at `index`. /// at `index`.
pub fn kzg_commitment_merkle_proof( pub fn kzg_commitment_merkle_proof(
&self, &self,
index: usize, index: usize,
) -> Result<FixedVector<Hash256, E::KzgCommitmentInclusionProofDepth>, Error> { ) -> Result<FixedVector<Hash256, E::KzgCommitmentInclusionProofDepth>, Error> {
match self { // We compute the branches by generating 2 merkle trees:
Self::Base(_) | Self::Altair(_) | Self::Bellatrix(_) | Self::Capella(_) => { // 1. Merkle tree for the `blob_kzg_commitments` List object
Err(Error::IncorrectStateVariant) // 2. Merkle tree for the `BeaconBlockBody` container
} // We then merge the branches for both the trees all the way up to the root.
Self::Deneb(body) => {
// We compute the branches by generating 2 merkle trees:
// 1. Merkle tree for the `blob_kzg_commitments` List object
// 2. Merkle tree for the `BeaconBlockBody` container
// We then merge the branches for both the trees all the way up to the root.
// Part1 (Branches for the subtree rooted at `blob_kzg_commitments`) // Part1 (Branches for the subtree rooted at `blob_kzg_commitments`)
// //
// Branches for `blob_kzg_commitments` without length mix-in // Branches for `blob_kzg_commitments` without length mix-in
let depth = E::max_blob_commitments_per_block() let blob_leaves = self
.next_power_of_two() .blob_kzg_commitments()?
.ilog2(); .iter()
let leaves: Vec<_> = body .map(|commitment| commitment.tree_hash_root())
.blob_kzg_commitments .collect::<Vec<_>>();
.iter() let depth = E::max_blob_commitments_per_block()
.map(|commitment| commitment.tree_hash_root()) .next_power_of_two()
.collect(); .ilog2();
let tree = MerkleTree::create(&leaves, depth as usize); let tree = MerkleTree::create(&blob_leaves, depth as usize);
let (_, mut proof) = tree let (_, mut proof) = tree
.generate_proof(index, depth as usize) .generate_proof(index, depth as usize)
.map_err(Error::MerkleTreeError)?; .map_err(Error::MerkleTreeError)?;
// Add the branch corresponding to the length mix-in. // Add the branch corresponding to the length mix-in.
let length = body.blob_kzg_commitments.len(); let length = blob_leaves.len();
let usize_len = std::mem::size_of::<usize>(); let usize_len = std::mem::size_of::<usize>();
let mut length_bytes = [0; BYTES_PER_CHUNK]; let mut length_bytes = [0; BYTES_PER_CHUNK];
length_bytes length_bytes
.get_mut(0..usize_len) .get_mut(0..usize_len)
.ok_or(Error::MerkleTreeError(MerkleTreeError::PleaseNotifyTheDevs))? .ok_or(Error::MerkleTreeError(MerkleTreeError::PleaseNotifyTheDevs))?
.copy_from_slice(&length.to_le_bytes()); .copy_from_slice(&length.to_le_bytes());
let length_root = Hash256::from_slice(length_bytes.as_slice()); let length_root = Hash256::from_slice(length_bytes.as_slice());
proof.push(length_root); proof.push(length_root);
// Part 2 // Part 2
// Branches for `BeaconBlockBody` container // Branches for `BeaconBlockBody` container
let leaves = [ let body_leaves = self.body_merkle_leaves();
body.randao_reveal.tree_hash_root(), let beacon_block_body_depth = body_leaves.len().next_power_of_two().ilog2() as usize;
body.eth1_data.tree_hash_root(), let tree = MerkleTree::create(&body_leaves, beacon_block_body_depth);
body.graffiti.tree_hash_root(), let (_, mut proof_body) = tree
body.proposer_slashings.tree_hash_root(), .generate_proof(BLOB_KZG_COMMITMENTS_INDEX, beacon_block_body_depth)
body.attester_slashings.tree_hash_root(), .map_err(Error::MerkleTreeError)?;
body.attestations.tree_hash_root(), // Join the proofs for the subtree and the main tree
body.deposits.tree_hash_root(), proof.append(&mut proof_body);
body.voluntary_exits.tree_hash_root(), debug_assert_eq!(proof.len(), E::kzg_proof_inclusion_proof_depth());
body.sync_aggregate.tree_hash_root(),
body.execution_payload.tree_hash_root(),
body.bls_to_execution_changes.tree_hash_root(),
body.blob_kzg_commitments.tree_hash_root(),
];
let beacon_block_body_depth = leaves.len().next_power_of_two().ilog2() as usize;
let tree = MerkleTree::create(&leaves, beacon_block_body_depth);
let (_, mut proof_body) = tree
.generate_proof(BLOB_KZG_COMMITMENTS_INDEX, beacon_block_body_depth)
.map_err(Error::MerkleTreeError)?;
// Join the proofs for the subtree and the main tree
proof.append(&mut proof_body);
debug_assert_eq!(proof.len(), E::kzg_proof_inclusion_proof_depth()); Ok(proof.into())
Ok(proof.into())
}
// TODO(electra): De-duplicate proof computation.
Self::Electra(body) => {
// We compute the branches by generating 2 merkle trees:
// 1. Merkle tree for the `blob_kzg_commitments` List object
// 2. Merkle tree for the `BeaconBlockBody` container
// We then merge the branches for both the trees all the way up to the root.
// Part1 (Branches for the subtree rooted at `blob_kzg_commitments`)
//
// Branches for `blob_kzg_commitments` without length mix-in
let depth = E::max_blob_commitments_per_block()
.next_power_of_two()
.ilog2();
let leaves: Vec<_> = body
.blob_kzg_commitments
.iter()
.map(|commitment| commitment.tree_hash_root())
.collect();
let tree = MerkleTree::create(&leaves, depth as usize);
let (_, mut proof) = tree
.generate_proof(index, depth as usize)
.map_err(Error::MerkleTreeError)?;
// Add the branch corresponding to the length mix-in.
let length = body.blob_kzg_commitments.len();
let usize_len = std::mem::size_of::<usize>();
let mut length_bytes = [0; BYTES_PER_CHUNK];
length_bytes
.get_mut(0..usize_len)
.ok_or(Error::MerkleTreeError(MerkleTreeError::PleaseNotifyTheDevs))?
.copy_from_slice(&length.to_le_bytes());
let length_root = Hash256::from_slice(length_bytes.as_slice());
proof.push(length_root);
// Part 2
// Branches for `BeaconBlockBody` container
let leaves = [
body.randao_reveal.tree_hash_root(),
body.eth1_data.tree_hash_root(),
body.graffiti.tree_hash_root(),
body.proposer_slashings.tree_hash_root(),
body.attester_slashings.tree_hash_root(),
body.attestations.tree_hash_root(),
body.deposits.tree_hash_root(),
body.voluntary_exits.tree_hash_root(),
body.sync_aggregate.tree_hash_root(),
body.execution_payload.tree_hash_root(),
body.bls_to_execution_changes.tree_hash_root(),
body.blob_kzg_commitments.tree_hash_root(),
body.consolidations.tree_hash_root(),
];
let beacon_block_body_depth = leaves.len().next_power_of_two().ilog2() as usize;
let tree = MerkleTree::create(&leaves, beacon_block_body_depth);
let (_, mut proof_body) = tree
.generate_proof(BLOB_KZG_COMMITMENTS_INDEX, beacon_block_body_depth)
.map_err(Error::MerkleTreeError)?;
// Join the proofs for the subtree and the main tree
proof.append(&mut proof_body);
debug_assert_eq!(proof.len(), E::kzg_proof_inclusion_proof_depth());
Ok(proof.into())
}
}
} }
/// Return `true` if this block body has a non-zero number of blobs. /// Return `true` if this block body has a non-zero number of blobs.