gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-22 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use smallvec for tree hash packed encoding

Browse Source
This commit is contained in:
Michael Sproul
2022-02-15 16:52:33 +11:00
parent e86cff2f8b
commit 5340c49de7
12 changed files with 31 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@@ -91,6 +91,7 @@ warp = { git = "https://github.com/macladson/warp", rev ="7e75acc" }
eth2_ssz = { path = "consensus/ssz" }
eth2_ssz_types = { path = "consensus/ssz_types" }
tree_hash = { path = "consensus/tree_hash" }
tree_hash_derive = { path = "consensus/tree_hash_derive" }
eth2_serde_utils = { path = "consensus/serde_utils" }
[profile.release]

4
consensus/ssz_types/src/bitfield.rs
View File

@@ -611,7 +611,7 @@ impl<N: Unsigned + Clone> tree_hash::TreeHash for Bitfield<Variable<N>> {
tree_hash::TreeHashType::List
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("List should never be packed.")
}
@@ -632,7 +632,7 @@ impl<N: Unsigned + Clone> tree_hash::TreeHash for Bitfield<Fixed<N>> {
tree_hash::TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Vector should never be packed.")
}

2
consensus/ssz_types/src/fixed_vector.rs
View File

@@ -167,7 +167,7 @@ where
tree_hash::TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Vector should never be packed.")
}

2
consensus/ssz_types/src/variable_list.rs
View File

@@ -184,7 +184,7 @@ where
tree_hash::TreeHashType::List
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("List should never be packed.")
}

25
consensus/tree_hash/src/impls.rs
View File

@@ -1,5 +1,6 @@
use super::*;
use ethereum_types::{H160, H256, U128, U256};
use smallvec::{smallvec, ToSmallVec};
fn int_to_hash256(int: u64) -> Hash256 {
let mut bytes = [0; HASHSIZE];
@@ -14,8 +15,8 @@ macro_rules! impl_for_bitsize {
TreeHashType::Basic
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
self.to_le_bytes().to_vec()
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
self.to_le_bytes().to_smallvec()
}
fn tree_hash_packing_factor() -> usize {
@@ -41,7 +42,7 @@ impl TreeHash for bool {
TreeHashType::Basic
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
(*self as u8).tree_hash_packed_encoding()
}
@@ -62,7 +63,7 @@ macro_rules! impl_for_lt_32byte_u8_array {
TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
unreachable!("bytesN should never be packed.")
}
@@ -87,8 +88,8 @@ impl TreeHash for U128 {
TreeHashType::Basic
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
let mut result = vec![0; 16];
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
let mut result = smallvec![0; 16];
self.to_little_endian(&mut result);
result
}
@@ -109,8 +110,8 @@ impl TreeHash for U256 {
TreeHashType::Basic
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
let mut result = vec![0; 32];
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
let mut result = smallvec![0; 32];
self.to_little_endian(&mut result);
result
}
@@ -131,8 +132,8 @@ impl TreeHash for H160 {
TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
let mut result = vec![0; 32];
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
let mut result = smallvec![0; 32];
result[0..20].copy_from_slice(self.as_bytes());
result
}
@@ -153,8 +154,8 @@ impl TreeHash for H256 {
TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
self.as_bytes().to_vec()
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
self.as_bytes().to_smallvec()
}
fn tree_hash_packing_factor() -> usize {

52
consensus/tree_hash/src/lib.rs
View File

@@ -8,6 +8,7 @@ pub use merkleize_padded::merkleize_padded;
pub use merkleize_standard::merkleize_standard;
use eth2_hashing::{hash_fixed, ZERO_HASHES, ZERO_HASHES_MAX_INDEX};
use smallvec::SmallVec;
pub const BYTES_PER_CHUNK: usize = 32;
pub const HASHSIZE: usize = 32;
@@ -15,6 +16,7 @@ pub const MERKLE_HASH_CHUNK: usize = 2 * BYTES_PER_CHUNK;
pub const MAX_UNION_SELECTOR: u8 = 127;
pub type Hash256 = ethereum_types::H256;
pub type PackedEncoding = SmallVec<[u8; BYTES_PER_CHUNK]>;
/// Convenience method for `MerkleHasher` which also provides some fast-paths for small trees.
///
@@ -109,7 +111,7 @@ pub enum TreeHashType {
pub trait TreeHash {
fn tree_hash_type() -> TreeHashType;
fn tree_hash_packed_encoding(&self) -> Vec<u8>;
fn tree_hash_packed_encoding(&self) -> PackedEncoding;
fn tree_hash_packing_factor() -> usize;
@@ -125,7 +127,7 @@ where
T::tree_hash_type()
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> PackedEncoding {
T::tree_hash_packed_encoding(*self)
}
@@ -138,52 +140,6 @@ where
}
}
#[macro_export]
macro_rules! tree_hash_ssz_encoding_as_vector {
($type: ident) => {
impl tree_hash::TreeHash for $type {
fn tree_hash_type() -> tree_hash::TreeHashType {
tree_hash::TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
unreachable!("Vector should never be packed.")
}
fn tree_hash_packing_factor() -> usize {
unreachable!("Vector should never be packed.")
}
fn tree_hash_root(&self) -> Vec<u8> {
tree_hash::merkle_root(&ssz::ssz_encode(self))
}
}
};
}
#[macro_export]
macro_rules! tree_hash_ssz_encoding_as_list {
($type: ident) => {
impl tree_hash::TreeHash for $type {
fn tree_hash_type() -> tree_hash::TreeHashType {
tree_hash::TreeHashType::List
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
unreachable!("List should never be packed.")
}
fn tree_hash_packing_factor() -> usize {
unreachable!("List should never be packed.")
}
fn tree_hash_root(&self) -> Vec<u8> {
ssz::ssz_encode(self).tree_hash_root()
}
}
};
}
#[cfg(test)]
mod test {
use super::*;

6
consensus/tree_hash_derive/src/lib.rs
View File

@@ -150,7 +150,7 @@ fn tree_hash_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> Toke
tree_hash::TreeHashType::Container
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Struct should never be packed.")
}
@@ -231,7 +231,7 @@ fn tree_hash_derive_enum_transparent(
tree_hash::TreeHashType::Container
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Enum should never be packed")
}
@@ -288,7 +288,7 @@ fn tree_hash_derive_enum_union(derive_input: &DeriveInput, enum_data: &DataEnum)
tree_hash::TreeHashType::Container
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Enum should never be packed")
}

2
consensus/types/src/graffiti.rs
View File

@@ -159,7 +159,7 @@ impl TreeHash for Graffiti {
<[u8; GRAFFITI_BYTES_LEN]>::tree_hash_type()
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
self.0.tree_hash_packed_encoding()
}

2
consensus/types/src/participation_flags.rs
View File

@@ -78,7 +78,7 @@ impl TreeHash for ParticipationFlags {
u8::tree_hash_type()
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
self.bits.tree_hash_packed_encoding()
}

2
consensus/types/src/slot_epoch.rs
View File

@@ -16,7 +16,7 @@ use crate::{ChainSpec, SignedRoot};
use rand::RngCore;
use safe_arith::{ArithError, SafeArith};
use serde_derive::{Deserialize, Serialize};
use ssz::{ssz_encode, Decode, DecodeError, Encode};
use ssz::{Decode, DecodeError, Encode};
use std::fmt;
use std::hash::Hash;
use std::iter::Iterator;

4
consensus/types/src/slot_epoch_macros.rs
View File

@@ -290,8 +290,8 @@ macro_rules! impl_ssz {
tree_hash::TreeHashType::Basic
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
ssz_encode(self)
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
self.0.tree_hash_packed_encoding()
}
fn tree_hash_packing_factor() -> usize {

2
crypto/bls/src/macros.rs
View File

@@ -7,7 +7,7 @@ macro_rules! impl_tree_hash {
tree_hash::TreeHashType::Vector
}
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
fn tree_hash_packed_encoding(&self) -> tree_hash::PackedEncoding {
unreachable!("Vector should never be packed.")
}