From 69bdd1d61f93b634afa86a1cf41a7827a316f245 Mon Sep 17 00:00:00 2001 From: Michael Sproul Date: Mon, 16 Jan 2023 17:24:58 +1100 Subject: [PATCH] Tree hash et al --- Cargo.toml | 6 ------ beacon_node/beacon_chain/Cargo.toml | 2 +- beacon_node/eth1/Cargo.toml | 2 +- beacon_node/execution_layer/Cargo.toml | 4 ++-- beacon_node/genesis/Cargo.toml | 2 +- beacon_node/http_api/Cargo.toml | 2 +- common/deposit_contract/Cargo.toml | 2 +- common/validator_dir/Cargo.toml | 2 +- consensus/cached_tree_hash/Cargo.toml | 2 +- consensus/state_processing/Cargo.toml | 6 +++--- consensus/types/Cargo.toml | 8 ++++---- crypto/bls/Cargo.toml | 2 +- lcli/Cargo.toml | 2 +- slasher/Cargo.toml | 4 ++-- testing/ef_tests/Cargo.toml | 4 ++-- validator_client/Cargo.toml | 2 +- 16 files changed, 23 insertions(+), 29 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b35cbbb89c..0ddde1c2b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -53,14 +53,8 @@ members = [ "consensus/fork_choice", "consensus/proto_array", "consensus/safe_arith", - "consensus/ssz", - "consensus/ssz_derive", - "consensus/ssz_types", - "consensus/serde_utils", "consensus/state_processing", "consensus/swap_or_not_shuffle", - "consensus/tree_hash", - "consensus/tree_hash_derive", "crypto/bls", "crypto/eth2_hashing", diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml index 9325b86c79..b0cb2d298c 100644 --- a/beacon_node/beacon_chain/Cargo.toml +++ b/beacon_node/beacon_chain/Cargo.toml @@ -35,7 +35,7 @@ ethereum_ssz = "1.0.0-beta.2" ssz_types = "1.0.0-beta.0" ethereum_ssz_derive = "1.0.0-beta.2" state_processing = { path = "../../consensus/state_processing" } -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" types = { path = "../../consensus/types" } tokio = "1.14.0" eth1 = { path = "../eth1" } diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml index fd04721f06..4725aeb668 100644 --- a/beacon_node/eth1/Cargo.toml +++ b/beacon_node/eth1/Cargo.toml @@ -22,7 +22,7 @@ types = { path = "../../consensus/types"} merkle_proof = { path = "../../consensus/merkle_proof"} ethereum_ssz = "1.0.0-beta.2" ethereum_ssz_derive = "1.0.0-beta.2" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" parking_lot = "0.12.0" slog = "2.5.2" superstruct = "0.5.0" diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml index 4841b93b5e..205e9d38b9 100644 --- a/beacon_node/execution_layer/Cargo.toml +++ b/beacon_node/execution_layer/Cargo.toml @@ -28,8 +28,8 @@ eth2 = { path = "../../common/eth2" } state_processing = { path = "../../consensus/state_processing" } lru = "0.7.1" exit-future = "0.2.0" -tree_hash = "0.4.1" -tree_hash_derive = { path = "../../consensus/tree_hash_derive"} +tree_hash = "1.0.0-beta.0" +tree_hash_derive = "1.0.0-beta.0" parking_lot = "0.12.0" slot_clock = { path = "../../common/slot_clock" } tempfile = "3.1.0" diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml index 33a9bb450b..91df080604 100644 --- a/beacon_node/genesis/Cargo.toml +++ b/beacon_node/genesis/Cargo.toml @@ -18,7 +18,7 @@ state_processing = { path = "../../consensus/state_processing" } merkle_proof = { path = "../../consensus/merkle_proof" } ethereum_ssz = "1.0.0-beta.2" eth2_hashing = "0.3.0" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" tokio = { version = "1.14.0", features = ["full"] } slog = "2.5.2" int_to_bytes = { path = "../../consensus/int_to_bytes" } diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml index d037783e2e..c4938cda61 100644 --- a/beacon_node/http_api/Cargo.toml +++ b/beacon_node/http_api/Cargo.toml @@ -32,7 +32,7 @@ parking_lot = "0.12.0" safe_arith = {path = "../../consensus/safe_arith"} task_executor = { path = "../../common/task_executor" } lru = "0.7.7" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" sysinfo = "0.26.5" system_health = { path = "../../common/system_health" } directory = { path = "../../common/directory" } diff --git a/common/deposit_contract/Cargo.toml b/common/deposit_contract/Cargo.toml index 4abf231dd0..49461bbfa2 100644 --- a/common/deposit_contract/Cargo.toml +++ b/common/deposit_contract/Cargo.toml @@ -15,5 +15,5 @@ hex = "0.4.2" [dependencies] types = { path = "../../consensus/types"} ethereum_ssz = "1.0.0-beta.2" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" ethabi = "16.0.0" diff --git a/common/validator_dir/Cargo.toml b/common/validator_dir/Cargo.toml index 0eba4cf232..b8d701de8d 100644 --- a/common/validator_dir/Cargo.toml +++ b/common/validator_dir/Cargo.toml @@ -16,7 +16,7 @@ filesystem = { path = "../filesystem" } types = { path = "../../consensus/types" } rand = "0.8.5" deposit_contract = { path = "../deposit_contract" } -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" hex = "0.4.2" derivative = "2.1.1" lockfile = { path = "../lockfile" } diff --git a/consensus/cached_tree_hash/Cargo.toml b/consensus/cached_tree_hash/Cargo.toml index 21593d2e6d..c3cefe6cf5 100644 --- a/consensus/cached_tree_hash/Cargo.toml +++ b/consensus/cached_tree_hash/Cargo.toml @@ -10,7 +10,7 @@ ssz_types = "1.0.0-beta.0" eth2_hashing = "0.3.0" ethereum_ssz_derive = "1.0.0-beta.2" ethereum_ssz = "1.0.0-beta.2" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" smallvec = "1.6.1" [dev-dependencies] diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml index 0a7c22b141..9da712d771 100644 --- a/consensus/state_processing/Cargo.toml +++ b/consensus/state_processing/Cargo.toml @@ -18,7 +18,7 @@ ethereum_ssz_derive = "1.0.0-beta.2" ssz_types = "1.0.0-beta.0" merkle_proof = { path = "../merkle_proof" } safe_arith = { path = "../safe_arith" } -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" types = { path = "../types", default-features = false } rayon = "1.4.1" eth2_hashing = "0.3.0" @@ -39,7 +39,7 @@ arbitrary-fuzz = [ "types/arbitrary-fuzz", "bls/arbitrary", "merkle_proof/arbitrary", - "eth2_ssz/arbitrary", - "eth2_ssz_types/arbitrary", + "ethereum_ssz/arbitrary", + "ssz_types/arbitrary", "tree_hash/arbitrary", ] diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml index cd764c02b7..18b363783f 100644 --- a/consensus/types/Cargo.toml +++ b/consensus/types/Cargo.toml @@ -30,8 +30,8 @@ ethereum_ssz_derive = "1.0.0-beta.2" ssz_types = "1.0.0-beta.0" swap_or_not_shuffle = { path = "../swap_or_not_shuffle" } test_random_derive = { path = "../../common/test_random_derive" } -tree_hash = "0.4.1" -tree_hash_derive = "0.4.0" +tree_hash = "1.0.0-beta.0" +tree_hash_derive = "1.0.0-beta.0" rand_xorshift = "0.3.0" cached_tree_hash = { path = "../cached_tree_hash" } serde_yaml = "0.8.13" @@ -67,8 +67,8 @@ arbitrary-fuzz = [ "arbitrary", "ethereum-types/arbitrary", "bls/arbitrary", - "eth2_ssz/arbitrary", - "eth2_ssz_types/arbitrary", + "ethereum_ssz/arbitrary", + "ssz_types/arbitrary", "swap_or_not_shuffle/arbitrary", "tree_hash/arbitrary", ] diff --git a/crypto/bls/Cargo.toml b/crypto/bls/Cargo.toml index 9fe73554ea..88dae16449 100644 --- a/crypto/bls/Cargo.toml +++ b/crypto/bls/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] ethereum_ssz = "1.0.0-beta.2" -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.4.2", optional = true } rand = "0.7.3" serde = "1.0.116" diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml index 9dffae00cd..8c1b34fbb2 100644 --- a/lcli/Cargo.toml +++ b/lcli/Cargo.toml @@ -25,7 +25,7 @@ environment = { path = "../lighthouse/environment" } eth2_network_config = { path = "../common/eth2_network_config" } genesis = { path = "../beacon_node/genesis" } deposit_contract = { path = "../common/deposit_contract" } -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" clap_utils = { path = "../common/clap_utils" } lighthouse_network = { path = "../beacon_node/lighthouse_network" } validator_dir = { path = "../common/validator_dir", features = ["insecure_keys"] } diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml index d3762eef3f..bffe6b4aba 100644 --- a/slasher/Cargo.toml +++ b/slasher/Cargo.toml @@ -26,8 +26,8 @@ serde = "1.0" serde_derive = "1.0" slog = "2.5.2" sloggers = { version = "2.1.1", features = ["json"] } -tree_hash = "0.4.1" -tree_hash_derive = "0.4.0" +tree_hash = "1.0.0-beta.0" +tree_hash_derive = "1.0.0-beta.0" types = { path = "../consensus/types" } strum = { version = "0.24.1", features = ["derive"] } diff --git a/testing/ef_tests/Cargo.toml b/testing/ef_tests/Cargo.toml index 065382f957..ecdf5a9685 100644 --- a/testing/ef_tests/Cargo.toml +++ b/testing/ef_tests/Cargo.toml @@ -24,8 +24,8 @@ serde_repr = "0.1.6" serde_yaml = "0.8.13" ethereum_ssz = "1.0.0-beta.2" ethereum_ssz_derive = "1.0.0-beta.2" -tree_hash = "0.4.1" -tree_hash_derive = "0.4.0" +tree_hash = "1.0.0-beta.0" +tree_hash_derive = "1.0.0-beta.0" cached_tree_hash = { path = "../../consensus/cached_tree_hash" } state_processing = { path = "../../consensus/state_processing" } swap_or_not_shuffle = { path = "../../consensus/swap_or_not_shuffle" } diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml index 27be13f878..2a1f4a54b2 100644 --- a/validator_client/Cargo.toml +++ b/validator_client/Cargo.toml @@ -13,7 +13,7 @@ tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] } logging = { path = "../common/logging" } [dependencies] -tree_hash = "0.4.1" +tree_hash = "1.0.0-beta.0" clap = "2.33.3" slashing_protection = { path = "./slashing_protection" } slot_clock = { path = "../common/slot_clock" }