fe52322088
## 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.
108 lines
3.4 KiB
Rust
108 lines
3.4 KiB
Rust
use crate::Config;
|
|
use crate::{
|
|
block_cache::{BlockCache, Eth1Block},
|
|
deposit_cache::{DepositCache, SszDepositCache},
|
|
service::EndpointsCache,
|
|
};
|
|
use parking_lot::RwLock;
|
|
use ssz::four_byte_option_impl;
|
|
use ssz::{Decode, Encode};
|
|
use ssz_derive::{Decode, Encode};
|
|
use std::sync::Arc;
|
|
use types::ChainSpec;
|
|
|
|
// Define "legacy" implementations of `Option<u64>` which use four bytes for encoding the union
|
|
// selector.
|
|
four_byte_option_impl!(four_byte_option_u64, u64);
|
|
|
|
#[derive(Default)]
|
|
pub struct DepositUpdater {
|
|
pub cache: DepositCache,
|
|
pub last_processed_block: Option<u64>,
|
|
}
|
|
|
|
impl DepositUpdater {
|
|
pub fn new(deposit_contract_deploy_block: u64) -> Self {
|
|
let cache = DepositCache::new(deposit_contract_deploy_block);
|
|
DepositUpdater {
|
|
cache,
|
|
last_processed_block: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Default)]
|
|
pub struct Inner {
|
|
pub block_cache: RwLock<BlockCache>,
|
|
pub deposit_cache: RwLock<DepositUpdater>,
|
|
pub endpoints_cache: RwLock<Option<Arc<EndpointsCache>>>,
|
|
pub config: RwLock<Config>,
|
|
pub remote_head_block: RwLock<Option<Eth1Block>>,
|
|
pub spec: ChainSpec,
|
|
}
|
|
|
|
impl Inner {
|
|
/// Prunes the block cache to `self.target_block_cache_len`.
|
|
///
|
|
/// Is a no-op if `self.target_block_cache_len` is `None`.
|
|
pub fn prune_blocks(&self) {
|
|
if let Some(block_cache_truncation) = self.config.read().block_cache_truncation {
|
|
self.block_cache.write().truncate(block_cache_truncation);
|
|
}
|
|
}
|
|
|
|
/// Encode the eth1 block and deposit cache as bytes.
|
|
pub fn as_bytes(&self) -> Vec<u8> {
|
|
let ssz_eth1_cache = SszEth1Cache::from_inner(self);
|
|
ssz_eth1_cache.as_ssz_bytes()
|
|
}
|
|
|
|
/// Recover `Inner` given byte representation of eth1 deposit and block caches.
|
|
pub fn from_bytes(bytes: &[u8], config: Config, spec: ChainSpec) -> Result<Self, String> {
|
|
let ssz_cache = SszEth1Cache::from_ssz_bytes(bytes)
|
|
.map_err(|e| format!("Ssz decoding error: {:?}", e))?;
|
|
ssz_cache.to_inner(config, spec)
|
|
}
|
|
|
|
/// Returns a reference to the specification.
|
|
pub fn spec(&self) -> &ChainSpec {
|
|
&self.spec
|
|
}
|
|
}
|
|
|
|
#[derive(Encode, Decode, Clone)]
|
|
pub struct SszEth1Cache {
|
|
block_cache: BlockCache,
|
|
deposit_cache: SszDepositCache,
|
|
#[ssz(with = "four_byte_option_u64")]
|
|
last_processed_block: Option<u64>,
|
|
}
|
|
|
|
impl SszEth1Cache {
|
|
pub fn from_inner(inner: &Inner) -> Self {
|
|
let deposit_updater = inner.deposit_cache.read();
|
|
let block_cache = inner.block_cache.read();
|
|
Self {
|
|
block_cache: (*block_cache).clone(),
|
|
deposit_cache: SszDepositCache::from_deposit_cache(&deposit_updater.cache),
|
|
last_processed_block: deposit_updater.last_processed_block,
|
|
}
|
|
}
|
|
|
|
pub fn to_inner(&self, config: Config, spec: ChainSpec) -> Result<Inner, String> {
|
|
Ok(Inner {
|
|
block_cache: RwLock::new(self.block_cache.clone()),
|
|
deposit_cache: RwLock::new(DepositUpdater {
|
|
cache: self.deposit_cache.to_deposit_cache()?,
|
|
last_processed_block: self.last_processed_block,
|
|
}),
|
|
endpoints_cache: RwLock::new(None),
|
|
// Set the remote head_block zero when creating a new instance. We only care about
|
|
// present and future eth1 nodes.
|
|
remote_head_block: RwLock::new(None),
|
|
config: RwLock::new(config),
|
|
spec,
|
|
})
|
|
}
|
|
}
|