mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 19:02:42 +00:00
## Issue Addressed NA ## Proposed Changes Implements the "union" type from the SSZ spec for `ssz`, `ssz_derive`, `tree_hash` and `tree_hash_derive` so it may be derived for `enums`: https://github.com/ethereum/consensus-specs/blob/v1.1.0-beta.3/ssz/simple-serialize.md#union The union type is required for the merge, since the `Transaction` type is defined as a single-variant union `Union[OpaqueTransaction]`. ### Crate Updates This PR will (hopefully) cause CI to publish new versions for the following crates: - `eth2_ssz_derive`: `0.2.1` -> `0.3.0` - `eth2_ssz`: `0.3.0` -> `0.4.0` - `eth2_ssz_types`: `0.2.0` -> `0.2.1` - `tree_hash`: `0.3.0` -> `0.4.0` - `tree_hash_derive`: `0.3.0` -> `0.4.0` These these crates depend on each other, I've had to add a workspace-level `[patch]` for these crates. A follow-up PR will need to remove this patch, ones the new versions are published. ### Union Behaviors We already had SSZ `Encode` and `TreeHash` derive for enums, however it just did a "transparent" pass-through of the inner value. Since the "union" decoding from the spec is in conflict with the transparent method, I've required that all `enum` have exactly one of the following enum-level attributes: #### SSZ - `#[ssz(enum_behaviour = "union")]` - matches the spec used for the merge - `#[ssz(enum_behaviour = "transparent")]` - maintains existing functionality - not supported for `Decode` (never was) #### TreeHash - `#[tree_hash(enum_behaviour = "union")]` - matches the spec used for the merge - `#[tree_hash(enum_behaviour = "transparent")]` - maintains existing functionality This means that we can maintain the existing transparent behaviour, but all existing users will get a compile-time error until they explicitly opt-in to being transparent. ### Legacy Option Encoding Before this PR, we already had a union-esque encoding for `Option<T>`. However, this was with the *old* SSZ spec where the union selector was 4 bytes. During merge specification, the spec was changed to use 1 byte for the selector. Whilst the 4-byte `Option` encoding was never used in the spec, we used it in our database. Writing a migrate script for all occurrences of `Option` in the database would be painful, especially since it's used in the `CommitteeCache`. To avoid the migrate script, I added a serde-esque `#[ssz(with = "module")]` field-level attribute to `ssz_derive` so that we can opt into the 4-byte encoding on a field-by-field basis. The `ssz::legacy::four_byte_impl!` macro allows a one-liner to define the module required for the `#[ssz(with = "module")]` for some `Option<T> where T: Encode + Decode`. Notably, **I have removed `Encode` and `Decode` impls for `Option`**. I've done this to force a break on downstream users. Like I mentioned, `Option` isn't used in the spec so I don't think it'll be *that* annoying. I think it's nicer than quietly having two different union implementations or quietly breaking the existing `Option` impl. ### Crate Publish Ordering I've modified the order in which CI publishes crates to ensure that we don't publish a crate without ensuring we already published a crate that it depends upon. ## TODO - [ ] Queue a follow-up `[patch]`-removing PR.
338 lines
11 KiB
Rust
338 lines
11 KiB
Rust
#![recursion_limit = "256"]
|
|
use darling::FromDeriveInput;
|
|
use proc_macro::TokenStream;
|
|
use quote::quote;
|
|
use std::convert::TryInto;
|
|
use syn::{parse_macro_input, Attribute, DataEnum, DataStruct, DeriveInput, Meta};
|
|
|
|
/// The highest possible union selector value (higher values are reserved for backwards compatible
|
|
/// extensions).
|
|
const MAX_UNION_SELECTOR: u8 = 127;
|
|
|
|
#[derive(Debug, FromDeriveInput)]
|
|
#[darling(attributes(tree_hash))]
|
|
struct StructOpts {
|
|
#[darling(default)]
|
|
enum_behaviour: Option<String>,
|
|
}
|
|
|
|
const ENUM_TRANSPARENT: &str = "transparent";
|
|
const ENUM_UNION: &str = "union";
|
|
const ENUM_VARIANTS: &[&str] = &[ENUM_TRANSPARENT, ENUM_UNION];
|
|
const NO_ENUM_BEHAVIOUR_ERROR: &str = "enums require an \"enum_behaviour\" attribute, \
|
|
e.g., #[tree_hash(enum_behaviour = \"transparent\")]";
|
|
|
|
enum EnumBehaviour {
|
|
Transparent,
|
|
Union,
|
|
}
|
|
|
|
impl EnumBehaviour {
|
|
pub fn new(s: Option<String>) -> Option<Self> {
|
|
s.map(|s| match s.as_ref() {
|
|
ENUM_TRANSPARENT => EnumBehaviour::Transparent,
|
|
ENUM_UNION => EnumBehaviour::Union,
|
|
other => panic!(
|
|
"{} is an invalid enum_behaviour, use either {:?}",
|
|
other, ENUM_VARIANTS
|
|
),
|
|
})
|
|
}
|
|
}
|
|
|
|
/// Return a Vec of `syn::Ident` for each named field in the struct, whilst filtering out fields
|
|
/// that should not be hashed.
|
|
///
|
|
/// # Panics
|
|
/// Any unnamed struct field (like in a tuple struct) will raise a panic at compile time.
|
|
fn get_hashable_fields(struct_data: &syn::DataStruct) -> Vec<&syn::Ident> {
|
|
get_hashable_fields_and_their_caches(struct_data)
|
|
.into_iter()
|
|
.map(|(ident, _, _)| ident)
|
|
.collect()
|
|
}
|
|
|
|
/// Return a Vec of the hashable fields of a struct, and each field's type and optional cache field.
|
|
fn get_hashable_fields_and_their_caches(
|
|
struct_data: &syn::DataStruct,
|
|
) -> Vec<(&syn::Ident, syn::Type, Option<syn::Ident>)> {
|
|
struct_data
|
|
.fields
|
|
.iter()
|
|
.filter_map(|f| {
|
|
if should_skip_hashing(f) {
|
|
None
|
|
} else {
|
|
let ident = f
|
|
.ident
|
|
.as_ref()
|
|
.expect("tree_hash_derive only supports named struct fields");
|
|
let opt_cache_field = get_cache_field_for(f);
|
|
Some((ident, f.ty.clone(), opt_cache_field))
|
|
}
|
|
})
|
|
.collect()
|
|
}
|
|
|
|
/// Parse the cached_tree_hash attribute for a field.
|
|
///
|
|
/// Extract the cache field name from `#[cached_tree_hash(cache_field_name)]`
|
|
///
|
|
/// Return `Some(cache_field_name)` if the field has a cached tree hash attribute,
|
|
/// or `None` otherwise.
|
|
fn get_cache_field_for(field: &syn::Field) -> Option<syn::Ident> {
|
|
use syn::{MetaList, NestedMeta};
|
|
|
|
let parsed_attrs = cached_tree_hash_attr_metas(&field.attrs);
|
|
if let [Meta::List(MetaList { nested, .. })] = &parsed_attrs[..] {
|
|
nested.iter().find_map(|x| match x {
|
|
NestedMeta::Meta(Meta::Path(path)) => path.get_ident().cloned(),
|
|
_ => None,
|
|
})
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
/// Process the `cached_tree_hash` attributes from a list of attributes into structured `Meta`s.
|
|
fn cached_tree_hash_attr_metas(attrs: &[Attribute]) -> Vec<Meta> {
|
|
attrs
|
|
.iter()
|
|
.filter(|attr| attr.path.is_ident("cached_tree_hash"))
|
|
.flat_map(|attr| attr.parse_meta())
|
|
.collect()
|
|
}
|
|
|
|
/// Returns true if some field has an attribute declaring it should not be hashed.
|
|
///
|
|
/// The field attribute is: `#[tree_hash(skip_hashing)]`
|
|
fn should_skip_hashing(field: &syn::Field) -> bool {
|
|
field.attrs.iter().any(|attr| {
|
|
attr.path.is_ident("tree_hash")
|
|
&& attr.tokens.to_string().replace(" ", "") == "(skip_hashing)"
|
|
})
|
|
}
|
|
|
|
/// Implements `tree_hash::TreeHash` for some `struct`.
|
|
///
|
|
/// Fields are hashed in the order they are defined.
|
|
#[proc_macro_derive(TreeHash, attributes(tree_hash))]
|
|
pub fn tree_hash_derive(input: TokenStream) -> TokenStream {
|
|
let item = parse_macro_input!(input as DeriveInput);
|
|
let opts = StructOpts::from_derive_input(&item).unwrap();
|
|
let enum_opt = EnumBehaviour::new(opts.enum_behaviour);
|
|
|
|
match &item.data {
|
|
syn::Data::Struct(s) => {
|
|
if enum_opt.is_some() {
|
|
panic!("enum_behaviour is invalid for structs");
|
|
}
|
|
tree_hash_derive_struct(&item, s)
|
|
}
|
|
syn::Data::Enum(s) => match enum_opt.expect(NO_ENUM_BEHAVIOUR_ERROR) {
|
|
EnumBehaviour::Transparent => tree_hash_derive_enum_transparent(&item, s),
|
|
EnumBehaviour::Union => tree_hash_derive_enum_union(&item, s),
|
|
},
|
|
_ => panic!("tree_hash_derive only supports structs and enums."),
|
|
}
|
|
}
|
|
|
|
fn tree_hash_derive_struct(item: &DeriveInput, struct_data: &DataStruct) -> TokenStream {
|
|
let name = &item.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &item.generics.split_for_impl();
|
|
|
|
let idents = get_hashable_fields(struct_data);
|
|
let num_leaves = idents.len();
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
|
|
unreachable!("Struct should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Struct should never be packed.")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
let mut hasher = tree_hash::MerkleHasher::with_leaves(#num_leaves);
|
|
|
|
#(
|
|
hasher.write(self.#idents.tree_hash_root().as_bytes())
|
|
.expect("tree hash derive should not apply too many leaves");
|
|
)*
|
|
|
|
hasher.finish().expect("tree hash derive should not have a remaining buffer")
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
/// Derive `TreeHash` for an enum in the "transparent" method.
|
|
///
|
|
/// The "transparent" method is distinct from the "union" method specified in the SSZ specification.
|
|
/// When using "transparent", the enum will be ignored and the contained field will be hashed as if
|
|
/// the enum does not exist.
|
|
///
|
|
///## Limitations
|
|
///
|
|
/// Only supports:
|
|
/// - Enums with a single field per variant, where
|
|
/// - All fields are "container" types.
|
|
///
|
|
/// ## Panics
|
|
///
|
|
/// Will panic at compile-time if the single field requirement isn't met, but will panic *at run
|
|
/// time* if the container type requirement isn't met.
|
|
fn tree_hash_derive_enum_transparent(
|
|
derive_input: &DeriveInput,
|
|
enum_data: &DataEnum,
|
|
) -> TokenStream {
|
|
let name = &derive_input.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &derive_input.generics.split_for_impl();
|
|
|
|
let (patterns, type_exprs): (Vec<_>, Vec<_>) = enum_data
|
|
.variants
|
|
.iter()
|
|
.map(|variant| {
|
|
let variant_name = &variant.ident;
|
|
|
|
if variant.fields.len() != 1 {
|
|
panic!("TreeHash can only be derived for enums with 1 field per variant");
|
|
}
|
|
|
|
let pattern = quote! {
|
|
#name::#variant_name(ref inner)
|
|
};
|
|
|
|
let ty = &(&variant.fields).into_iter().next().unwrap().ty;
|
|
let type_expr = quote! {
|
|
<#ty as tree_hash::TreeHash>::tree_hash_type()
|
|
};
|
|
(pattern, type_expr)
|
|
})
|
|
.unzip();
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
#(
|
|
assert_eq!(
|
|
#type_exprs,
|
|
tree_hash::TreeHashType::Container,
|
|
"all variants must be of container type"
|
|
);
|
|
)*
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
match self {
|
|
#(
|
|
#patterns => inner.tree_hash_root(),
|
|
)*
|
|
}
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
/// Derive `TreeHash` for an `enum` following the "union" SSZ spec.
|
|
///
|
|
/// The union selector will be determined based upon the order in which the enum variants are
|
|
/// defined. E.g., the top-most variant in the enum will have a selector of `0`, the variant
|
|
/// beneath it will have a selector of `1` and so on.
|
|
///
|
|
/// # Limitations
|
|
///
|
|
/// Only supports enums where each variant has a single field.
|
|
fn tree_hash_derive_enum_union(derive_input: &DeriveInput, enum_data: &DataEnum) -> TokenStream {
|
|
let name = &derive_input.ident;
|
|
let (impl_generics, ty_generics, where_clause) = &derive_input.generics.split_for_impl();
|
|
|
|
let patterns: Vec<_> = enum_data
|
|
.variants
|
|
.iter()
|
|
.map(|variant| {
|
|
let variant_name = &variant.ident;
|
|
|
|
if variant.fields.len() != 1 {
|
|
panic!("TreeHash can only be derived for enums with 1 field per variant");
|
|
}
|
|
|
|
quote! {
|
|
#name::#variant_name(ref inner)
|
|
}
|
|
})
|
|
.collect();
|
|
|
|
let union_selectors = compute_union_selectors(patterns.len());
|
|
|
|
let output = quote! {
|
|
impl #impl_generics tree_hash::TreeHash for #name #ty_generics #where_clause {
|
|
fn tree_hash_type() -> tree_hash::TreeHashType {
|
|
tree_hash::TreeHashType::Container
|
|
}
|
|
|
|
fn tree_hash_packed_encoding(&self) -> Vec<u8> {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_packing_factor() -> usize {
|
|
unreachable!("Enum should never be packed")
|
|
}
|
|
|
|
fn tree_hash_root(&self) -> tree_hash::Hash256 {
|
|
match self {
|
|
#(
|
|
#patterns => {
|
|
let root = inner.tree_hash_root();
|
|
let selector = #union_selectors;
|
|
tree_hash::mix_in_selector(&root, selector)
|
|
.expect("derive macro should prevent out-of-bounds selectors")
|
|
},
|
|
)*
|
|
}
|
|
}
|
|
}
|
|
};
|
|
output.into()
|
|
}
|
|
|
|
fn compute_union_selectors(num_variants: usize) -> Vec<u8> {
|
|
let union_selectors = (0..num_variants)
|
|
.map(|i| {
|
|
i.try_into()
|
|
.expect("union selector exceeds u8::max_value, union has too many variants")
|
|
})
|
|
.collect::<Vec<u8>>();
|
|
|
|
let highest_selector = union_selectors
|
|
.last()
|
|
.copied()
|
|
.expect("0-variant union is not permitted");
|
|
|
|
assert!(
|
|
highest_selector <= MAX_UNION_SELECTOR,
|
|
"union selector {} exceeds limit of {}, enum has too many variants",
|
|
highest_selector,
|
|
MAX_UNION_SELECTOR
|
|
);
|
|
|
|
union_selectors
|
|
}
|