Merge branch 'unstable' of https://github.com/sigp/lighthouse into gloas-payload-processing

This commit is contained in:
Eitan Seri- Levi
2026-02-22 09:40:46 -08:00
3 changed files with 7 additions and 15 deletions

19
Cargo.lock generated
View File

@@ -3199,7 +3199,7 @@ dependencies = [
"sha2", "sha2",
"tempfile", "tempfile",
"unicode-normalization", "unicode-normalization",
"uuid 0.8.2", "uuid",
"zeroize", "zeroize",
] ]
@@ -3239,7 +3239,7 @@ dependencies = [
"serde_repr", "serde_repr",
"tempfile", "tempfile",
"tiny-bip39", "tiny-bip39",
"uuid 0.8.2", "uuid",
] ]
[[package]] [[package]]
@@ -5901,7 +5901,7 @@ dependencies = [
"rustc_version 0.4.1", "rustc_version 0.4.1",
"smallvec", "smallvec",
"tagptr", "tagptr",
"uuid 1.19.0", "uuid",
] ]
[[package]] [[package]]
@@ -7168,7 +7168,7 @@ checksum = "a2ebd03c29250cdf191da93a35118b4567c2ef0eacab54f65e058d6f4c9965f6"
dependencies = [ dependencies = [
"r2d2", "r2d2",
"rusqlite", "rusqlite",
"uuid 1.19.0", "uuid",
] ]
[[package]] [[package]]
@@ -9519,16 +9519,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]]
name = "uuid"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
"getrandom 0.2.16",
"serde",
]
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.19.0" version = "1.19.0"
@@ -9538,6 +9528,7 @@ dependencies = [
"getrandom 0.3.4", "getrandom 0.3.4",
"js-sys", "js-sys",
"rand 0.9.2", "rand 0.9.2",
"serde_core",
"wasm-bindgen", "wasm-bindgen",
] ]

View File

@@ -273,7 +273,7 @@ tree_hash_derive = "0.12.0"
typenum = "1" typenum = "1"
types = { path = "consensus/types", features = ["saturating-arith"] } types = { path = "consensus/types", features = ["saturating-arith"] }
url = "2" url = "2"
uuid = { version = "0.8", features = ["serde", "v4"] } uuid = { version = "1", features = ["serde", "v4"] }
validator_client = { path = "validator_client" } validator_client = { path = "validator_client" }
validator_dir = { path = "common/validator_dir" } validator_dir = { path = "common/validator_dir" }
validator_http_api = { path = "validator_client/http_api" } validator_http_api = { path = "validator_client/http_api" }

View File

@@ -18,6 +18,7 @@ deny = [
{ crate = "pbkdf2", deny-multiple-versions = true, reason = "takes a long time to compile" }, { crate = "pbkdf2", deny-multiple-versions = true, reason = "takes a long time to compile" },
{ crate = "scrypt", deny-multiple-versions = true, reason = "takes a long time to compile" }, { crate = "scrypt", deny-multiple-versions = true, reason = "takes a long time to compile" },
{ crate = "syn", deny-multiple-versions = true, reason = "takes a long time to compile" }, { crate = "syn", deny-multiple-versions = true, reason = "takes a long time to compile" },
{ crate = "uuid", deny-multiple-versions = true, reason = "dependency hygiene" },
] ]
[sources] [sources]