Merge branch 'unstable' into validator-manager

This commit is contained in:
Paul Hauner
2023-05-15 15:54:31 +10:00
400 changed files with 13266 additions and 12760 deletions

View File

@@ -17,8 +17,8 @@ eth2_keystore = { path = "../crypto/eth2_keystore" }
account_utils = { path = "../common/account_utils" }
serde = { version = "1.0.116", features = ["derive"] }
serde_json = "1.0.58"
eth2_serde_utils = "0.1.1"
tree_hash = "0.4.1"
ethereum_serde_utils = "0.5.0"
tree_hash = "0.5.0"
eth2 = { path = "../common/eth2", features = ["lighthouse"]}
hex = "0.4.2"
tokio = { version = "1.14.0", features = ["time", "rt-multi-thread", "macros"] }

View File

@@ -293,7 +293,7 @@ mod bytes_4_without_0x_prefix {
where
D: serde::Deserializer<'de>,
{
let decoded = deserializer.deserialize_str(eth2_serde_utils::hex::HexVisitor)?;
let decoded = deserializer.deserialize_str(serde_utils::hex::HexVisitor)?;
if decoded.len() != BYTES_LEN {
return Err(D::Error::custom(format!(