Crate renames

sigp · Jan 16, 2023 · 0d54534 · 0d54534
1 parent 38514c0
commit 0d54534
Show file tree

Hide file tree

Showing 30 changed files with 59 additions and 59 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -93,13 +93,13 @@ members = [
 [patch.crates-io]
 fixed-hash = { git = "https://github.com/paritytech/parity-common", rev="df638ab0885293d21d656dc300d39236b69ce57d" }
 warp = { git = "https://github.com/macladson/warp", rev="7e75acc368229a46a236a8c991bf251fe7fe50ef" }
-eth2_ssz = { path = "consensus/ssz" }
-eth2_ssz_derive = { path = "consensus/ssz_derive" }
-eth2_ssz_types = { path = "consensus/ssz_types" }
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
+ssz_types = "1.0.0-beta.0"
 eth2_hashing = { path = "crypto/eth2_hashing" }
 tree_hash = { path = "consensus/tree_hash" }
 tree_hash_derive = { path = "consensus/tree_hash_derive" }
-eth2_serde_utils = { path = "consensus/serde_utils" }
+ethereum_serde_utils = "1.0.0-beta.0"
 
 [profile.maxperf]
 inherits = "release"

diff --git a/beacon_node/beacon_chain/Cargo.toml b/beacon_node/beacon_chain/Cargo.toml
@@ -31,9 +31,9 @@ slog = { version = "2.5.2", features = ["max_level_trace"] }
 sloggers = { version = "2.1.1", features = ["json"] }
 slot_clock = { path = "../../common/slot_clock" }
 eth2_hashing = "0.3.0"
-eth2_ssz = "0.4.1"
-eth2_ssz_types = "0.2.2"
-eth2_ssz_derive = "0.3.0"
+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"
 types = { path = "../../consensus/types" }

diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml
@@ -20,8 +20,8 @@ serde = { version = "1.0.116", features = ["derive"] }
 hex = "0.4.2"
 types = { path = "../../consensus/types"}
 merkle_proof = { path = "../../consensus/merkle_proof"}
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 tree_hash = "0.4.1"
 parking_lot = "0.12.0"
 slog = "2.5.2"

diff --git a/beacon_node/execution_layer/Cargo.toml b/beacon_node/execution_layer/Cargo.toml
@@ -13,7 +13,7 @@ slog = "2.5.2"
 futures = "0.3.7"
 sensitive_url = { path = "../../common/sensitive_url" }
 reqwest = { version = "0.11.0", features = ["json","stream"] }
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 serde_json = "1.0.58"
 serde = { version = "1.0.116", features = ["derive"] }
 warp = { version = "0.3.2", features = ["tls"] }
@@ -22,8 +22,8 @@ environment = { path = "../../lighthouse/environment" }
 bytes = "1.1.0"
 task_executor = { path = "../../common/task_executor" }
 hex = "0.4.2"
-eth2_ssz = "0.4.1"
-eth2_ssz_types = "0.2.2"
+ethereum_ssz = "1.0.0-beta.2"
+ssz_types = "1.0.0-beta.0"
 eth2 = { path = "../../common/eth2" }
 state_processing = { path = "../../consensus/state_processing" }
 lru = "0.7.1"

diff --git a/beacon_node/genesis/Cargo.toml b/beacon_node/genesis/Cargo.toml
@@ -16,7 +16,7 @@ eth1 = { path = "../eth1"}
 rayon = "1.4.1"
 state_processing = { path = "../../consensus/state_processing" }
 merkle_proof = { path = "../../consensus/merkle_proof" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 eth2_hashing = "0.3.0"
 tree_hash = "0.4.1"
 tokio = { version = "1.14.0", features = ["full"] }

diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml
@@ -24,7 +24,7 @@ lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 lazy_static = "1.4.0"
 warp_utils = { path = "../../common/warp_utils" }
 slot_clock = { path = "../../common/slot_clock" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 bs58 = "0.4.0"
 futures = "0.3.8"
 execution_layer = {path = "../execution_layer"}

diff --git a/beacon_node/lighthouse_network/Cargo.toml b/beacon_node/lighthouse_network/Cargo.toml
@@ -8,11 +8,11 @@ edition = "2021"
 discv5 = { version = "0.1.0", features = ["libp2p"] }
 unsigned-varint = { version = "0.6.0", features = ["codec"] }
 types = { path =  "../../consensus/types" }
-eth2_ssz_types = "0.2.2"
+ssz_types = "1.0.0-beta.0"
 serde = { version = "1.0.116", features = ["derive"] }
 serde_derive = "1.0.116"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 lighthouse_version = { path = "../../common/lighthouse_version" }
 tokio = { version = "1.14.0", features = ["time", "macros"] }

diff --git a/beacon_node/network/Cargo.toml b/beacon_node/network/Cargo.toml
@@ -21,8 +21,8 @@ types = { path = "../../consensus/types" }
 slot_clock = { path = "../../common/slot_clock" }
 slog = { version = "2.5.2", features = ["max_level_trace"] }
 hex = "0.4.2"
-eth2_ssz = "0.4.1"
-eth2_ssz_types = "0.2.2"
+ethereum_ssz = "1.0.0-beta.2"
+ssz_types = "1.0.0-beta.0"
 futures = "0.3.7"
 error-chain = "0.12.4"
 tokio = { version = "1.14.0", features = ["full"] }

diff --git a/beacon_node/operation_pool/Cargo.toml b/beacon_node/operation_pool/Cargo.toml
@@ -12,8 +12,8 @@ lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
 parking_lot = "0.12.0"
 types = { path = "../../consensus/types" }
 state_processing = { path = "../../consensus/state_processing" }
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 rayon = "1.5.0"
 serde = "1.0.116"
 serde_derive = "1.0.116"

diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml
@@ -13,8 +13,8 @@ db-key = "0.0.5"
 leveldb = { version = "0.8.6", default-features = false }
 parking_lot = "0.12.0"
 itertools = "0.10.0"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 types = { path =  "../../consensus/types" }
 state_processing = { path = "../../consensus/state_processing" }
 slog = "2.5.2"

diff --git a/boot_node/Cargo.toml b/boot_node/Cargo.toml
@@ -10,7 +10,7 @@ clap = "2.33.3"
 clap_utils = { path = "../common/clap_utils" }
 lighthouse_network = { path = "../beacon_node/lighthouse_network" }
 types = { path = "../consensus/types" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 slog = "2.5.2"
 tokio = "1.14.0"
 log = "0.4.11"

diff --git a/common/clap_utils/Cargo.toml b/common/clap_utils/Cargo.toml
@@ -11,7 +11,7 @@ clap = "2.33.3"
 hex = "0.4.2"
 dirs = "3.0.1"
 eth2_network_config = { path = "../eth2_network_config" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 ethereum-types = "0.14.1"
 serde = "1.0.116"
 serde_json = "1.0.59"

diff --git a/common/deposit_contract/Cargo.toml b/common/deposit_contract/Cargo.toml
@@ -14,6 +14,6 @@ hex = "0.4.2"
 
 [dependencies]
 types = { path = "../../consensus/types"}
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 tree_hash = "0.4.1"
 ethabi = "16.0.0"
diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml
@@ -13,15 +13,15 @@ types = { path = "../../consensus/types" }
 reqwest = { version = "0.11.0", features = ["json","stream"] }
 lighthouse_network = { path = "../../beacon_node/lighthouse_network" }
 proto_array = { path = "../../consensus/proto_array", optional = true }
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 eth2_keystore = { path = "../../crypto/eth2_keystore" }
 libsecp256k1 = "0.7.0"
 ring = "0.16.19"
 bytes = "1.0.1"
 account_utils = { path = "../../common/account_utils" }
 sensitive_url = { path = "../../common/sensitive_url" }
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 futures-util = "0.3.8"
 futures = "0.3.8"
 store = { path = "../../beacon_node/store", optional = true }

diff --git a/common/eth2_network_config/Cargo.toml b/common/eth2_network_config/Cargo.toml
@@ -16,6 +16,6 @@ tempfile = "3.1.0"
 [dependencies]
 serde_yaml = "0.8.13"
 types = { path = "../../consensus/types"}
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 eth2_config = { path = "../eth2_config"}
 enr = { version = "0.6.2", features = ["ed25519", "k256"] }
diff --git a/consensus/cached_tree_hash/Cargo.toml b/consensus/cached_tree_hash/Cargo.toml
@@ -6,10 +6,10 @@ edition = "2021"
 
 [dependencies]
 ethereum-types = "0.14.1"
-eth2_ssz_types = "0.2.2"
+ssz_types = "1.0.0-beta.0"
 eth2_hashing = "0.3.0"
-eth2_ssz_derive = "0.3.0"
-eth2_ssz = "0.4.1"
+ethereum_ssz_derive = "1.0.0-beta.2"
+ethereum_ssz = "1.0.0-beta.2"
 tree_hash = "0.4.1"
 smallvec = "1.6.1"
 

diff --git a/consensus/fork_choice/Cargo.toml b/consensus/fork_choice/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 types = { path = "../types" }
 state_processing = { path = "../state_processing" }
 proto_array = { path = "../proto_array" }
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
 
 [dev-dependencies]

diff --git a/consensus/proto_array/Cargo.toml b/consensus/proto_array/Cargo.toml
@@ -10,8 +10,8 @@ path = "src/bin.rs"
 
 [dependencies]
 types = { path = "../types" }
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 serde_yaml = "0.8.13"

diff --git a/consensus/ssz/Cargo.toml b/consensus/ssz/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0"
 name = "ssz"
 
 [dev-dependencies]
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz_derive = "1.0.0-beta.2"
 
 [dependencies]
 ethereum-types = "0.14.1"

diff --git a/consensus/ssz_types/Cargo.toml b/consensus/ssz_types/Cargo.toml
@@ -13,8 +13,8 @@ name = "ssz_types"
 tree_hash = "0.4.1"
 serde = "1.0.116"
 serde_derive = "1.0.116"
-eth2_serde_utils = "0.1.1"
-eth2_ssz = "0.4.1"
+ethereum_serde_utils = "1.0.0-beta.0"
+ethereum_ssz = "1.0.0-beta.2"
 typenum = "1.12.0"
 arbitrary = { version = "1.0", features = ["derive"], optional = true }
 derivative = "2.1.1"

diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml
@@ -13,9 +13,9 @@ tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
 bls = { path = "../../crypto/bls" }
 integer-sqrt = "0.1.5"
 itertools = "0.10.0"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
-eth2_ssz_types = "0.2.2"
+ethereum_ssz = "1.0.0-beta.2"
+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"

diff --git a/consensus/tree_hash/Cargo.toml b/consensus/tree_hash/Cargo.toml
@@ -11,8 +11,8 @@ rand = "0.8.5"
 tree_hash_derive = "0.4.0"
 types = { path = "../types" }
 beacon_chain = { path = "../../beacon_node/beacon_chain" }
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 
 [dependencies]
 ethereum-types = "0.14.1"

diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
@@ -25,9 +25,9 @@ safe_arith = { path = "../safe_arith" }
 serde = {version = "1.0.116" , features = ["rc"] }
 serde_derive = "1.0.116"
 slog = "2.5.2"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
-eth2_ssz_types = "0.2.2"
+ethereum_ssz = "1.0.0-beta.2"
+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"
@@ -39,7 +39,7 @@ tempfile = "3.1.0"
 derivative = "2.1.1"
 rusqlite = { version = "0.25.3", features = ["bundled"], optional = true }
 arbitrary = { version = "1.0", features = ["derive"], optional = true }
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 regex = "1.5.5"
 lazy_static = "1.4.0"
 parking_lot = "0.12.0"

diff --git a/crypto/bls/Cargo.toml b/crypto/bls/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2021"
 
 [dependencies]
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 tree_hash = "0.4.1"
 milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.4.2", optional = true }
 rand = "0.7.3"
 serde = "1.0.116"
 serde_derive = "1.0.116"
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 hex = "0.4.2"
 eth2_hashing = "0.3.0"
 ethereum-types = "0.14.1"

diff --git a/lcli/Cargo.toml b/lcli/Cargo.toml
@@ -20,7 +20,7 @@ env_logger = "0.9.0"
 types = { path = "../consensus/types" }
 state_processing = { path = "../consensus/state_processing" }
 int_to_bytes = { path = "../consensus/int_to_bytes" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 environment = { path = "../lighthouse/environment" }
 eth2_network_config = { path = "../common/eth2_network_config" }
 genesis = { path = "../beacon_node/genesis" }

diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml
@@ -12,8 +12,8 @@ lmdb = ["lmdb-rkv", "lmdb-rkv-sys"]
 [dependencies]
 bincode = "1.3.1"
 byteorder = "1.3.4"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+ethereum_ssz = "1.0.0-beta.2"
+ethereum_ssz_derive = "1.0.0-beta.2"
 flate2 = { version = "1.0.14", features = ["zlib"], default-features = false }
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../common/lighthouse_metrics" }

diff --git a/testing/ef_tests/Cargo.toml b/testing/ef_tests/Cargo.toml
@@ -22,8 +22,8 @@ serde = "1.0.116"
 serde_derive = "1.0.116"
 serde_repr = "0.1.6"
 serde_yaml = "0.8.13"
-eth2_ssz = "0.4.1"
-eth2_ssz_derive = "0.3.0"
+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"
 cached_tree_hash = { path = "../../consensus/cached_tree_hash" }

diff --git a/testing/state_transition_vectors/Cargo.toml b/testing/state_transition_vectors/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 [dependencies]
 state_processing = { path = "../../consensus/state_processing" }
 types = { path = "../../consensus/types" }
-eth2_ssz = "0.4.1"
+ethereum_ssz = "1.0.0-beta.2"
 beacon_chain = { path = "../../beacon_node/beacon_chain" }
 lazy_static = "1.4.0"
 tokio = { version = "1.14.0", features = ["rt-multi-thread"] }
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
@@ -46,7 +46,7 @@ lighthouse_version = { path = "../common/lighthouse_version" }
 warp_utils = { path = "../common/warp_utils" }
 warp = "0.3.2"
 hyper = "0.14.4"
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 libsecp256k1 = "0.7.0"
 ring = "0.16.19"
 rand = { version = "0.8.5", features = ["small_rng"] }

diff --git a/validator_client/slashing_protection/Cargo.toml b/validator_client/slashing_protection/Cargo.toml
@@ -18,7 +18,7 @@ r2d2_sqlite = "0.18.0"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 serde_json = "1.0.58"
-eth2_serde_utils = "0.1.1"
+ethereum_serde_utils = "1.0.0-beta.0"
 filesystem = { path = "../../common/filesystem" }
 arbitrary = { version = "1.0", features = ["derive"], optional = true }