From 3055d6165f9d803fbc1c5a8aca87824cede7245a Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 14 Jan 2025 11:08:01 +0100 Subject: [PATCH] fix conflict # Conflicts: # Cargo.lock --- Cargo.lock | 197 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 151 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 45d2780..978b8e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1244,14 +1244,14 @@ dependencies = [ "arbitrary", "blst", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "hex", "rand", "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "serde", - "tree_hash", + "tree_hash 0.8.0", "zeroize", ] @@ -1264,14 +1264,14 @@ dependencies = [ "arbitrary", "blst", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "hex", "rand", "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "serde", - "tree_hash", + "tree_hash 0.8.0", "zeroize", ] @@ -1284,14 +1284,14 @@ dependencies = [ "arbitrary", "blst", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "hex", "rand", "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "serde", - "tree_hash", + "tree_hash 0.8.0", "zeroize", ] @@ -1524,7 +1524,7 @@ dependencies = [ "clap", "dirs 3.0.2", "eth2_network_config", - "ethereum_ssz", + "ethereum_ssz 0.7.1", "hex", "serde", "serde_json", @@ -2439,8 +2439,8 @@ dependencies = [ "derivative", "enr", "eth2_keystore", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "futures", "futures-util", @@ -2455,7 +2455,7 @@ dependencies = [ "serde", "serde_json", "slashing_protection", - "ssz_types", + "ssz_types 0.8.0", "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=anchor)", "zeroize", ] @@ -2563,6 +2563,33 @@ dependencies = [ "zip", ] +[[package]] +name = "ethbloom" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint 0.9.5", +] + [[package]] name = "ethereum_hashing" version = "0.7.0" @@ -2587,6 +2614,19 @@ dependencies = [ "serde_json", ] +[[package]] +name = "ethereum_serde_utils" +version = "1.0.0-beta.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c927663d966e972b65dba434972dc158b3b07d0d40feadf2ecc095f90dfb79f6" +dependencies = [ + "ethereum-types", + "hex", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "ethereum_ssz" version = "0.7.1" @@ -2598,6 +2638,21 @@ dependencies = [ "smallvec", ] +[[package]] +name = "ethereum_ssz" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862e41ea8eea7508f70cfd8cd560f0c34bb0af37c719a8e06c2672f0f031d8e5" +dependencies = [ + "alloy-primitives", + "ethereum_serde_utils 0.7.0", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "typenum", +] + [[package]] name = "ethereum_ssz_derive" version = "0.7.1" @@ -3765,6 +3820,24 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + +[[package]] +name = "impl-serde" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd" +dependencies = [ + "serde", +] + [[package]] name = "impl-trait-for-tuples" version = "0.2.3" @@ -3961,14 +4034,14 @@ dependencies = [ "c-kzg", "derivative", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "hex", "rust_eth_kzg", "serde", "serde_json", - "tree_hash", + "tree_hash 0.8.0", ] [[package]] @@ -3980,14 +4053,14 @@ dependencies = [ "c-kzg", "derivative", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "hex", "rust_eth_kzg", "serde", "serde_json", - "tree_hash", + "tree_hash 0.8.0", ] [[package]] @@ -3999,14 +4072,14 @@ dependencies = [ "c-kzg", "derivative", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "hex", "rust_eth_kzg", "serde", "serde_json", - "tree_hash", + "tree_hash 0.8.0", ] [[package]] @@ -4559,7 +4632,7 @@ dependencies = [ "dirs 3.0.2", "discv5", "either", - "ethereum_ssz", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "fnv", "futures", @@ -4581,7 +4654,7 @@ dependencies = [ "slog", "smallvec", "snap", - "ssz_types", + "ssz_types 0.8.0", "strum 0.24.1", "superstruct", "task_executor", @@ -4839,14 +4912,14 @@ dependencies = [ "arbitrary", "derivative", "ethereum_hashing", - "ethereum_ssz", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "itertools 0.13.0", "parking_lot", "rayon", "serde", "smallvec", - "tree_hash", + "tree_hash 0.8.0", "triomphe", "typenum", "vec_map", @@ -5033,12 +5106,13 @@ dependencies = [ "async-channel", "dirs 5.0.1", "discv5", - "ethereum_ssz", + "ethereum_serde_utils 1.0.0-beta.0", + "ethereum_ssz 0.8.2", "futures", "libp2p", "lighthouse_network", "serde", - "ssz_types", + "ssz_types 0.10.0", "task_executor", "tokio", "tracing", @@ -5586,6 +5660,8 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", + "impl-rlp", + "impl-serde", "uint 0.9.5", ] @@ -5732,7 +5808,7 @@ name = "proto_array" version = "0.2.0" source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ - "ethereum_ssz", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "serde", @@ -6853,7 +6929,7 @@ version = "0.1.0" source = "git+https://github.com/sigp/lighthouse?branch=anchor#997991f5513f22bb240816c2e2400cf6a1819a0c" dependencies = [ "arbitrary", - "ethereum_serde_utils", + "ethereum_serde_utils 0.7.0", "filesystem", "r2d2", "r2d2_sqlite", @@ -7049,7 +7125,7 @@ dependencies = [ "openssl", "qbft", "rusqlite", - "tree_hash", + "tree_hash 0.8.0", "tree_hash_derive", "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", ] @@ -7062,13 +7138,29 @@ checksum = "35e0719d2b86ac738a55ae71a8429f52aa2741da988f1fd0975b4cc610fd1e08" dependencies = [ "arbitrary", "derivative", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", + "itertools 0.13.0", + "serde", + "serde_derive", + "smallvec", + "tree_hash 0.8.0", + "typenum", +] + +[[package]] +name = "ssz_types" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22bc24c8a61256950632fb6b68ea09f6b5c988070924c6292eb5933635202e00" +dependencies = [ + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.8.2", "itertools 0.13.0", "serde", "serde_derive", "smallvec", - "tree_hash", + "tree_hash 0.9.0", "typenum", ] @@ -7785,6 +7877,19 @@ dependencies = [ "smallvec", ] +[[package]] +name = "tree_hash" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc60ae4c4236ee721305d0f0b5aa3e8ef5b66f3fa61d17072430bc246d6694a" +dependencies = [ + "alloy-primitives", + "ethereum_hashing", + "ethereum_ssz 0.8.2", + "smallvec", + "typenum", +] + [[package]] name = "tree_hash_derive" version = "0.8.0" @@ -7853,8 +7958,8 @@ dependencies = [ "derivative", "eth2_interop_keypairs 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "hex", @@ -7879,12 +7984,12 @@ dependencies = [ "serde_yaml", "slog", "smallvec", - "ssz_types", + "ssz_types 0.8.0", "superstruct", "swap_or_not_shuffle 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", "tempfile", "test_random_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=anchor)", - "tree_hash", + "tree_hash 0.8.0", "tree_hash_derive", ] @@ -7902,8 +8007,8 @@ dependencies = [ "derivative", "eth2_interop_keypairs 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "fixed_bytes 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "hex", @@ -7928,12 +8033,12 @@ dependencies = [ "serde_yaml", "slog", "smallvec", - "ssz_types", + "ssz_types 0.8.0", "superstruct", "swap_or_not_shuffle 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "tempfile", "test_random_derive 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", - "tree_hash", + "tree_hash 0.8.0", "tree_hash_derive", ] @@ -7951,8 +8056,8 @@ dependencies = [ "derivative", "eth2_interop_keypairs 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "ethereum_hashing", - "ethereum_serde_utils", - "ethereum_ssz", + "ethereum_serde_utils 0.7.0", + "ethereum_ssz 0.7.1", "ethereum_ssz_derive", "fixed_bytes 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "hex", @@ -7977,12 +8082,12 @@ dependencies = [ "serde_yaml", "slog", "smallvec", - "ssz_types", + "ssz_types 0.8.0", "superstruct", "swap_or_not_shuffle 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "tempfile", "test_random_derive 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", - "tree_hash", + "tree_hash 0.8.0", "tree_hash_derive", ]