Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra_attestation_changes

This commit is contained in:
realbigsean
2024-05-31 08:49:04 -04:00
160 changed files with 4660 additions and 3400 deletions

220
Cargo.lock generated
View File

@@ -18,7 +18,7 @@ version = "0.3.5"
dependencies = [
"account_utils",
"bls",
"clap",
"clap 4.5.4",
"clap_utils",
"directory",
"environment",
@@ -30,10 +30,7 @@ dependencies = [
"filesystem",
"safe_arith",
"sensitive_url",
"serde",
"serde_json",
"slashing_protection",
"slog",
"slot_clock",
"tempfile",
"tokio",
@@ -284,12 +281,51 @@ dependencies = [
]
[[package]]
name = "ansi_term"
version = "0.12.1"
name = "anstream"
version = "0.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540"
dependencies = [
"winapi",
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"utf8parse",
]
[[package]]
name = "anstyle"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
[[package]]
name = "anstyle-parse"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
dependencies = [
"utf8parse",
]
[[package]]
name = "anstyle-query"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
dependencies = [
"windows-sys 0.52.0",
]
[[package]]
name = "anstyle-wincon"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]
[[package]]
@@ -815,26 +851,22 @@ name = "beacon_node"
version = "5.1.3"
dependencies = [
"beacon_chain",
"clap",
"clap 4.5.4",
"clap_utils",
"client",
"directory",
"dirs",
"environment",
"eth2_config",
"eth2_network_config",
"execution_layer",
"futures",
"genesis",
"hex",
"http_api",
"hyper 1.3.1",
"lighthouse_network",
"lighthouse_version",
"monitoring_api",
"node_test_rig",
"sensitive_url",
"serde",
"serde_json",
"slasher",
"slog",
@@ -849,11 +881,8 @@ dependencies = [
name = "beacon_processor"
version = "0.1.0"
dependencies = [
"derivative",
"ethereum_ssz",
"fnv",
"futures",
"hex",
"itertools",
"lazy_static",
"lighthouse_metrics",
@@ -1028,7 +1057,7 @@ name = "boot_node"
version = "5.1.3"
dependencies = [
"beacon_node",
"clap",
"clap 4.5.4",
"clap_utils",
"eth2_network_config",
"ethereum_ssz",
@@ -1037,12 +1066,9 @@ dependencies = [
"log",
"logging",
"serde",
"serde_json",
"serde_yaml",
"slog",
"slog-async",
"slog-scope",
"slog-stdlog",
"slog-term",
"tokio",
"types",
@@ -1072,7 +1098,6 @@ dependencies = [
"reqwest",
"sensitive_url",
"serde",
"serde_json",
]
[[package]]
@@ -1294,20 +1319,44 @@ version = "2.34.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
dependencies = [
"ansi_term",
"atty",
"bitflags 1.3.2",
"strsim 0.8.0",
"textwrap",
"unicode-width",
"vec_map",
]
[[package]]
name = "clap"
version = "4.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
dependencies = [
"clap_builder",
]
[[package]]
name = "clap_builder"
version = "4.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
dependencies = [
"anstream",
"anstyle",
"clap_lex",
"strsim 0.11.0",
"terminal_size",
]
[[package]]
name = "clap_lex"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]]
name = "clap_utils"
version = "0.1.0"
dependencies = [
"clap",
"clap 4.5.4",
"dirs",
"eth2_network_config",
"ethereum-types 0.14.1",
@@ -1341,12 +1390,9 @@ dependencies = [
"lazy_static",
"lighthouse_metrics",
"lighthouse_network",
"logging",
"monitoring_api",
"network",
"num_cpus",
"operation_pool",
"parking_lot 0.12.2",
"sensitive_url",
"serde",
"serde_yaml",
@@ -1360,7 +1406,6 @@ dependencies = [
"time",
"timer",
"tokio",
"tree_hash",
"types",
]
@@ -1373,6 +1418,12 @@ dependencies = [
"cc",
]
[[package]]
name = "colorchoice"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "compare_fields"
version = "0.2.0"
@@ -1480,7 +1531,7 @@ checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
dependencies = [
"atty",
"cast",
"clap",
"clap 2.34.0",
"criterion-plot",
"csv",
"itertools",
@@ -1782,16 +1833,13 @@ version = "0.1.0"
dependencies = [
"beacon_chain",
"beacon_node",
"clap",
"clap 4.5.4",
"clap_utils",
"environment",
"hex",
"logging",
"slog",
"sloggers",
"store",
"strum",
"tempfile",
"types",
]
@@ -1975,7 +2023,7 @@ dependencies = [
name = "directory"
version = "0.1.0"
dependencies = [
"clap",
"clap 4.5.4",
"clap_utils",
"eth2_network_config",
]
@@ -2132,13 +2180,11 @@ version = "0.2.0"
dependencies = [
"beacon_chain",
"bls",
"cached_tree_hash",
"compare_fields",
"compare_fields_derive",
"derivative",
"eth2_network_config",
"ethereum-types 0.14.1",
"ethereum_serde_utils",
"ethereum_ssz",
"ethereum_ssz_derive",
"execution_layer",
@@ -2154,7 +2200,6 @@ dependencies = [
"serde_yaml",
"snap",
"state_processing",
"store",
"swap_or_not_shuffle",
"tree_hash",
"tree_hash_derive",
@@ -2336,15 +2381,12 @@ dependencies = [
"ethereum_ssz_derive",
"execution_layer",
"futures",
"hex",
"lazy_static",
"lighthouse_metrics",
"merkle_proof",
"parking_lot 0.12.2",
"reqwest",
"sensitive_url",
"serde",
"serde_json",
"serde_yaml",
"slog",
"sloggers",
@@ -2386,7 +2428,6 @@ dependencies = [
"libsecp256k1",
"lighthouse_network",
"mediatype",
"mime",
"pretty_reqwest_error",
"procfs",
"proto_array",
@@ -2400,7 +2441,6 @@ dependencies = [
"ssz_types",
"store",
"tokio",
"tree_hash",
"types",
]
@@ -2472,7 +2512,6 @@ dependencies = [
"pretty_reqwest_error",
"reqwest",
"sensitive_url",
"serde_json",
"serde_yaml",
"sha2 0.9.9",
"slog",
@@ -2802,7 +2841,6 @@ version = "0.1.0"
dependencies = [
"async-channel",
"deposit_contract",
"environment",
"ethers-core",
"ethers-providers",
"execution_layer",
@@ -2827,7 +2865,6 @@ dependencies = [
"alloy-consensus",
"alloy-rlp",
"arc-swap",
"async-trait",
"builder_client",
"bytes",
"environment",
@@ -2837,7 +2874,6 @@ dependencies = [
"ethereum_ssz",
"ethers-core",
"fork_choice",
"futures",
"hash-db",
"hash256-std-hasher",
"hex",
@@ -3340,7 +3376,6 @@ dependencies = [
"futures-timer",
"getrandom",
"hex_fmt",
"instant",
"libp2p",
"prometheus-client",
"quick-protobuf",
@@ -3350,9 +3385,9 @@ dependencies = [
"regex",
"serde",
"sha2 0.10.8",
"smallvec",
"tracing",
"void",
"web-time",
]
[[package]]
@@ -4287,10 +4322,9 @@ dependencies = [
"account_utils",
"beacon_chain",
"bls",
"clap",
"clap 4.5.4",
"clap_utils",
"deposit_contract",
"directory",
"env_logger 0.9.3",
"environment",
"eth1_test_rig",
@@ -4302,7 +4336,6 @@ dependencies = [
"execution_layer",
"genesis",
"hex",
"int_to_bytes",
"lighthouse_network",
"lighthouse_version",
"log",
@@ -4866,7 +4899,7 @@ dependencies = [
"beacon_processor",
"bls",
"boot_node",
"clap",
"clap 4.5.4",
"clap_utils",
"database_manager",
"directory",
@@ -4889,10 +4922,8 @@ dependencies = [
"slasher",
"slashing_protection",
"slog",
"sloggers",
"task_executor",
"tempfile",
"tracing-subscriber",
"types",
"unused_port",
"validator_client",
@@ -4904,7 +4935,6 @@ dependencies = [
name = "lighthouse_metrics"
version = "0.2.0"
dependencies = [
"lazy_static",
"prometheus",
]
@@ -4913,8 +4943,6 @@ name = "lighthouse_network"
version = "0.2.0"
dependencies = [
"async-channel",
"base64 0.21.7",
"byteorder",
"bytes",
"delay_map",
"directory",
@@ -4926,12 +4954,8 @@ dependencies = [
"ethereum_ssz_derive",
"fnv",
"futures",
"futures-ticker",
"getrandom",
"gossipsub",
"hex",
"hex_fmt",
"instant",
"lazy_static",
"libp2p",
"libp2p-mplex",
@@ -4961,9 +4985,6 @@ dependencies = [
"tokio",
"tokio-io-timeout",
"tokio-util 0.6.10",
"tracing",
"tree_hash",
"tree_hash_derive",
"types",
"unsigned-varint 0.6.0",
"unused_port",
@@ -5053,7 +5074,6 @@ dependencies = [
"serde",
"serde_json",
"slog",
"slog-async",
"slog-term",
"sloggers",
"take_mut",
@@ -5487,10 +5507,8 @@ dependencies = [
"beacon_processor",
"delay_map",
"derivative",
"environment",
"error-chain",
"eth2",
"ethereum-types 0.14.1",
"ethereum_ssz",
"execution_layer",
"fnv",
@@ -5504,10 +5522,8 @@ dependencies = [
"lighthouse_metrics",
"lighthouse_network",
"logging",
"lru",
"lru_cache",
"matches",
"num_cpus",
"operation_pool",
"parking_lot 0.12.2",
"rand",
@@ -5524,7 +5540,6 @@ dependencies = [
"task_executor",
"tokio",
"tokio-stream",
"tokio-util 0.6.10",
"types",
]
@@ -7586,11 +7601,9 @@ dependencies = [
name = "simulator"
version = "0.2.0"
dependencies = [
"clap",
"clap 4.5.4",
"env_logger 0.9.3",
"eth1",
"eth2_network_config",
"ethereum-types 0.14.1",
"execution_layer",
"futures",
"node_test_rig",
@@ -7598,7 +7611,6 @@ dependencies = [
"rayon",
"sensitive_url",
"serde_json",
"ssz_types",
"tokio",
"types",
]
@@ -7642,7 +7654,6 @@ dependencies = [
"safe_arith",
"serde",
"slog",
"sloggers",
"strum",
"tempfile",
"tree_hash",
@@ -7952,7 +7963,6 @@ name = "store"
version = "0.2.0"
dependencies = [
"beacon_chain",
"bls",
"db-key",
"directory",
"ethereum_ssz",
@@ -7961,14 +7971,11 @@ dependencies = [
"lazy_static",
"leveldb",
"lighthouse_metrics",
"logging",
"lru",
"parking_lot 0.12.2",
"safe_arith",
"serde",
"slog",
"sloggers",
"smallvec",
"state_processing",
"strum",
"tempfile",
@@ -7986,18 +7993,18 @@ dependencies = [
"unicode-normalization",
]
[[package]]
name = "strsim"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
[[package]]
name = "strsim"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "strsim"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
[[package]]
name = "strum"
version = "0.24.1"
@@ -8137,7 +8144,6 @@ dependencies = [
"lighthouse_network",
"parking_lot 0.12.2",
"serde",
"serde_json",
"sysinfo",
"types",
]
@@ -8213,6 +8219,16 @@ dependencies = [
"winapi-util",
]
[[package]]
name = "terminal_size"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
dependencies = [
"rustix 0.38.34",
"windows-sys 0.48.0",
]
[[package]]
name = "test-test_logger"
version = "0.1.0"
@@ -8811,7 +8827,6 @@ dependencies = [
"smallvec",
"ssz_types",
"state_processing",
"strum",
"superstruct",
"swap_or_not_shuffle",
"tempfile",
@@ -8978,6 +8993,12 @@ dependencies = [
"percent-encoding",
]
[[package]]
name = "utf8parse"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "uuid"
version = "0.8.2"
@@ -8995,7 +9016,7 @@ dependencies = [
"account_utils",
"bincode",
"bls",
"clap",
"clap 4.5.4",
"clap_utils",
"deposit_contract",
"directory",
@@ -9067,12 +9088,10 @@ name = "validator_manager"
version = "0.1.0"
dependencies = [
"account_utils",
"bls",
"clap",
"clap 4.5.4",
"clap_utils",
"environment",
"eth2",
"eth2_keystore",
"eth2_network_config",
"eth2_wallet",
"ethereum_serde_utils",
@@ -9308,13 +9327,12 @@ dependencies = [
"beacon_chain",
"beacon_node",
"bls",
"byteorder",
"clap",
"clap 4.5.4",
"clap_utils",
"diesel",
"diesel_migrations",
"env_logger 0.9.3",
"eth2",
"hex",
"http_api",
"hyper 1.3.1",
"log",
@@ -9345,6 +9363,16 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "web-time"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]]
name = "web3signer_tests"
version = "0.1.0"