mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-30 12:47:05 +00:00
Resolve merge conflicts
This commit is contained in:
30
Cargo.lock
generated
30
Cargo.lock
generated
@@ -1224,6 +1224,8 @@ name = "beacon_chain"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"alloy-primitives",
|
||||
"arbitrary",
|
||||
"beacon_chain",
|
||||
"bitvec",
|
||||
"bls",
|
||||
"criterion",
|
||||
@@ -1258,6 +1260,7 @@ dependencies = [
|
||||
"parking_lot",
|
||||
"proto_array",
|
||||
"rand 0.9.2",
|
||||
"rand_xorshift 0.4.0",
|
||||
"rayon",
|
||||
"safe_arith",
|
||||
"sensitive_url",
|
||||
@@ -1610,6 +1613,7 @@ dependencies = [
|
||||
name = "builder_client"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"bls",
|
||||
"context_deserialize",
|
||||
"eth2",
|
||||
@@ -1621,6 +1625,7 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"tokio",
|
||||
"types",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2740,6 +2745,7 @@ dependencies = [
|
||||
name = "doppelganger_service"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"beacon_node_fallback",
|
||||
"bls",
|
||||
"environment",
|
||||
@@ -3116,6 +3122,7 @@ dependencies = [
|
||||
name = "eth2"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"arbitrary",
|
||||
"bls",
|
||||
"context_deserialize",
|
||||
"educe",
|
||||
@@ -3132,7 +3139,6 @@ dependencies = [
|
||||
"multiaddr",
|
||||
"pretty_reqwest_error",
|
||||
"proto_array",
|
||||
"rand 0.9.2",
|
||||
"reqwest",
|
||||
"reqwest-eventsource",
|
||||
"sensitive_url",
|
||||
@@ -3140,7 +3146,6 @@ dependencies = [
|
||||
"serde_json",
|
||||
"ssz_types",
|
||||
"superstruct",
|
||||
"test_random_derive",
|
||||
"tokio",
|
||||
"types",
|
||||
"zeroize",
|
||||
@@ -3277,9 +3282,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ethereum_ssz"
|
||||
version = "0.10.1"
|
||||
version = "0.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2128a84f7a3850d54ee343334e3392cca61f9f6aa9441eec481b9394b43c238b"
|
||||
checksum = "368a4a4e4273b0135111fe9464e35465067766a8f664615b5a86338b73864407"
|
||||
dependencies = [
|
||||
"alloy-primitives",
|
||||
"arbitrary",
|
||||
@@ -3294,9 +3299,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ethereum_ssz_derive"
|
||||
version = "0.10.1"
|
||||
version = "0.10.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cd596f91cff004fc8d02be44c21c0f9b93140a04b66027ae052f5f8e05b48eba"
|
||||
checksum = "f2cd82c68120c89361e1a457245cf212f7d9f541bffaffed530c8f2d54a160b2"
|
||||
dependencies = [
|
||||
"darling 0.23.0",
|
||||
"proc-macro2",
|
||||
@@ -6053,6 +6058,7 @@ dependencies = [
|
||||
"alloy-primitives",
|
||||
"alloy-rlp",
|
||||
"anyhow",
|
||||
"arbitrary",
|
||||
"async-channel 1.9.0",
|
||||
"beacon_chain",
|
||||
"beacon_processor",
|
||||
@@ -8429,7 +8435,7 @@ dependencies = [
|
||||
"safe_arith",
|
||||
"smallvec",
|
||||
"ssz_types",
|
||||
"test_random_derive",
|
||||
"state_processing",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tree_hash",
|
||||
@@ -8714,14 +8720,6 @@ version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
|
||||
|
||||
[[package]]
|
||||
name = "test_random_derive"
|
||||
version = "0.2.0"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.117",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.69"
|
||||
@@ -9362,12 +9360,12 @@ dependencies = [
|
||||
"superstruct",
|
||||
"swap_or_not_shuffle",
|
||||
"tempfile",
|
||||
"test_random_derive",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tree_hash",
|
||||
"tree_hash_derive",
|
||||
"typenum",
|
||||
"types",
|
||||
"yaml_serde",
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user