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.
73 lines
2.5 KiB
TOML
73 lines
2.5 KiB
TOML
[package]
|
|
name = "validator_client"
|
|
version = "0.3.5"
|
|
authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>", "Luke Anderson <luke@lukeanderson.com.au>"]
|
|
edition = "2018"
|
|
|
|
[lib]
|
|
name = "validator_client"
|
|
path = "src/lib.rs"
|
|
|
|
[dev-dependencies]
|
|
tokio = { version = "1.10.0", features = ["time", "rt-multi-thread", "macros"] }
|
|
deposit_contract = { path = "../common/deposit_contract" }
|
|
|
|
[dependencies]
|
|
eth2_ssz = "0.4.0"
|
|
eth2_config = { path = "../common/eth2_config" }
|
|
tree_hash = "0.4.0"
|
|
clap = "2.33.3"
|
|
eth2_interop_keypairs = { path = "../common/eth2_interop_keypairs" }
|
|
slashing_protection = { path = "./slashing_protection" }
|
|
slot_clock = { path = "../common/slot_clock" }
|
|
types = { path = "../consensus/types" }
|
|
safe_arith = { path = "../consensus/safe_arith" }
|
|
serde = "1.0.116"
|
|
serde_derive = "1.0.116"
|
|
bincode = "1.3.1"
|
|
serde_json = "1.0.58"
|
|
serde_yaml = "0.8.13"
|
|
slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
|
|
slog-async = "2.5.0"
|
|
slog-term = "2.6.0"
|
|
tokio = { version = "1.10.0", features = ["time"] }
|
|
futures = "0.3.7"
|
|
dirs = "3.0.1"
|
|
directory = { path = "../common/directory" }
|
|
lockfile = { path = "../common/lockfile" }
|
|
logging = { path = "../common/logging" }
|
|
environment = { path = "../lighthouse/environment" }
|
|
parking_lot = "0.11.0"
|
|
exit-future = "0.2.0"
|
|
filesystem = { path = "../common/filesystem" }
|
|
libc = "0.2.79"
|
|
eth2_ssz_derive = "0.3.0"
|
|
hex = "0.4.2"
|
|
deposit_contract = { path = "../common/deposit_contract" }
|
|
bls = { path = "../crypto/bls" }
|
|
eth2 = { path = "../common/eth2" }
|
|
tempfile = "3.1.0"
|
|
rayon = "1.4.1"
|
|
validator_dir = { path = "../common/validator_dir" }
|
|
clap_utils = { path = "../common/clap_utils" }
|
|
eth2_keystore = { path = "../crypto/eth2_keystore" }
|
|
account_utils = { path = "../common/account_utils" }
|
|
lighthouse_version = { path = "../common/lighthouse_version" }
|
|
warp_utils = { path = "../common/warp_utils" }
|
|
warp = { git = "https://github.com/paulhauner/warp ", branch = "cors-wildcard" }
|
|
hyper = "0.14.4"
|
|
eth2_serde_utils = "0.1.0"
|
|
libsecp256k1 = "0.6.0"
|
|
ring = "0.16.19"
|
|
rand = "0.7.3"
|
|
scrypt = { version = "0.7.0", default-features = false }
|
|
lighthouse_metrics = { path = "../common/lighthouse_metrics" }
|
|
lazy_static = "1.4.0"
|
|
fallback = { path = "../common/fallback" }
|
|
itertools = "0.10.0"
|
|
monitoring_api = { path = "../common/monitoring_api" }
|
|
sensitive_url = { path = "../common/sensitive_url" }
|
|
task_executor = { path = "../common/task_executor" }
|
|
reqwest = { version = "0.11.0", features = ["json","stream"] }
|
|
url = "2.2.2"
|