From 834891bb80692cd90b8e8907cbe238e8094e30fe Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Mon, 25 Nov 2024 14:47:24 +0000 Subject: [PATCH 01/10] move to separate files and pull in lighthouse types --- Cargo.lock | 7 +++++++ Cargo.toml | 4 +++- anchor/common/types/Cargo.toml | 7 +++++++ anchor/common/types/src/committee.rs | 19 +++++++++++++++++++ anchor/common/types/src/keyshare.rs | 25 +++++++++++++++++++++++++ anchor/common/types/src/lib.rs | 27 +++++++++++++++++++++++++++ anchor/common/types/src/operator.rs | 25 +++++++++++++++++++++++++ 7 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 anchor/common/types/Cargo.toml create mode 100644 anchor/common/types/src/committee.rs create mode 100644 anchor/common/types/src/keyshare.rs create mode 100644 anchor/common/types/src/lib.rs create mode 100644 anchor/common/types/src/operator.rs diff --git a/Cargo.lock b/Cargo.lock index 7b41410..0943ef2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8023,6 +8023,13 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "types" +version = "0.1.0" +dependencies = [ + "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", +] + [[package]] name = "types" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index bbdc34b..22bf7cc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,8 @@ members = [ "anchor/http_metrics", "anchor/qbft", "anchor/network", - "anchor/common/version" + "anchor/common/version", + "anchor/common/types" ] resolver = "2" @@ -28,6 +29,7 @@ validator_metrics = { git = "https://github.com/agemanning/lighthouse", branch = sensitive_url = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } slot_clock = { git = "https://github.com/agemanning/lighthouse", branch = "modularize-vc" } unused_port = { git = "https://github.com/sigp/lighthouse", branch = "unstable" } +types = { git = "https://github.com/sigp/lighthouse", branch = "unstable" } derive_more = { version = "1.0.0", features = ["full"] } async-channel = "1.9" axum = "0.7.7" diff --git a/anchor/common/types/Cargo.toml b/anchor/common/types/Cargo.toml new file mode 100644 index 0000000..5d5001f --- /dev/null +++ b/anchor/common/types/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "types" +version = "0.1.0" +edition = "2021" + +[dependencies] +types = { workspace = true} diff --git a/anchor/common/types/src/committee.rs b/anchor/common/types/src/committee.rs new file mode 100644 index 0000000..d631b7e --- /dev/null +++ b/anchor/common/types/src/committee.rs @@ -0,0 +1,19 @@ +type ValidatorIndex = usize; // this will come in from types +use crate::OperatorID; + +// Unique identifier for a committee +pub type CommitteeID = u64; + +// A committee of operators +pub struct Committee { + // Validator this committee corresponds with + pub validator_index: ValidatorIndex, + // Identification for the committee + pub id: CommitteeID, + // All of the operators in the committee + pub operators: Vec, + // How many operators are needed for consensus + pub threadhold: u64, + // Is this committee active + pub active: bool, +} diff --git a/anchor/common/types/src/keyshare.rs b/anchor/common/types/src/keyshare.rs new file mode 100644 index 0000000..01549ca --- /dev/null +++ b/anchor/common/types/src/keyshare.rs @@ -0,0 +1,25 @@ + +use types::{PublicKey, Address, Graffiti}; // ValidatorIndex +type ValidatorIndex = usize; // this will come from types +use crate::{OperatorID, CommitteeID}; + + +pub type SharePublicKey = u64; + +// A portion of a key given to an opeator +pub struct Keyshare { + // Index of the validator + pub validator_index: ValidatorIndex, + // Public key of the validator + pub validator_pubkey: PublicKey, + // The public key of the share + pub share_public_key: SharePublicKey, + // The operator who owns this share + pub operator_id: OperatorID, + // The committee this share is a part of + pub committe_id: CommitteeID, + // Graffiti filed + pub graffiti: Graffiti, + // Fee RecipientAddress + pub ethaddress: Address, +} diff --git a/anchor/common/types/src/lib.rs b/anchor/common/types/src/lib.rs new file mode 100644 index 0000000..f36ed91 --- /dev/null +++ b/anchor/common/types/src/lib.rs @@ -0,0 +1,27 @@ +use types::PublicKey; +pub type ValidatorIndex = usize; // this will be reexported + +// Reexports +pub use committee::{Committee, CommitteeID}; +pub use keyshare::{Keyshare, SharePublicKey}; +pub use operator::{Operator, OperatorStatus, OperatorID}; + +// modules +mod operator; +mod keyshare; +mod committee; + + + + +// Validator that is distributing its duties to a number of Operators +pub struct Validator { + // The index of the validator + pub validator_index: ValidatorIndex, + // Public key of the validator + pub public_key: PublicKey, + // The commit for the validator + pub committee: Committee, +} + + diff --git a/anchor/common/types/src/operator.rs b/anchor/common/types/src/operator.rs new file mode 100644 index 0000000..9d43db1 --- /dev/null +++ b/anchor/common/types/src/operator.rs @@ -0,0 +1,25 @@ +use types::PublicKey; +use crate::{Keyshare, Committee}; + +// Unique idetifier for an Operator +pub type OperatorID = usize; + +// Current operational status of an operator +pub enum OperatorStatus { + Active, + Inactive, +} + +// Client responsible for maintaining the overall health of the network. +pub struct Operator { + // ID to uniquely identify this operator + pub id: OperatorID, + // Public key of the operator + pub public_key: PublicKey, + // All of the validator shares this operator is reponsible for + pub keyshares: Vec, + // All of the committees this operator is in + pub committees: Vec, + // Operation status of the operator + pub status: OperatorStatus, +} From 0f0ef381f319153093062ad2441c073a44c0e138 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Tue, 26 Nov 2024 20:22:42 +0000 Subject: [PATCH 02/10] types according to spec --- anchor/common/types/src/committee.rs | 31 +++++++++-------- anchor/common/types/src/keyshare.rs | 25 ------------- anchor/common/types/src/lib.rs | 28 +++------------ anchor/common/types/src/operator.rs | 23 ++++-------- anchor/common/types/src/share.rs | 52 ++++++++++++++++++++++++++++ 5 files changed, 79 insertions(+), 80 deletions(-) delete mode 100644 anchor/common/types/src/keyshare.rs create mode 100644 anchor/common/types/src/share.rs diff --git a/anchor/common/types/src/committee.rs b/anchor/common/types/src/committee.rs index d631b7e..813d9e3 100644 --- a/anchor/common/types/src/committee.rs +++ b/anchor/common/types/src/committee.rs @@ -1,19 +1,22 @@ -type ValidatorIndex = usize; // this will come in from types -use crate::OperatorID; +use crate::{Operator, OperatorID, OperatorPublicKey}; +use types::Domain; // Unique identifier for a committee pub type CommitteeID = u64; -// A committee of operators -pub struct Committee { - // Validator this committee corresponds with - pub validator_index: ValidatorIndex, - // Identification for the committee - pub id: CommitteeID, - // All of the operators in the committee - pub operators: Vec, - // How many operators are needed for consensus - pub threadhold: u64, - // Is this committee active - pub active: bool, +// Member of a committee of operators +#[derive(Debug, Clone)] +pub struct CommitteeMember { + // Unique identifier for the operator + pub operator_id: OperatorID, + // Unique identifier for the committee this member is a part of + pub committee_id: CommitteeID, + // Base-64 encoded PEM RSA public key + pub share_public_key: OperatorPublicKey, + // Number of nodes that are faulty/malicious in the committee + pub faulty: u64, + // All of the operators that are a part of this committee + pub members: Vec, + // Signature domain + pub domain: Domain, } diff --git a/anchor/common/types/src/keyshare.rs b/anchor/common/types/src/keyshare.rs deleted file mode 100644 index 01549ca..0000000 --- a/anchor/common/types/src/keyshare.rs +++ /dev/null @@ -1,25 +0,0 @@ - -use types::{PublicKey, Address, Graffiti}; // ValidatorIndex -type ValidatorIndex = usize; // this will come from types -use crate::{OperatorID, CommitteeID}; - - -pub type SharePublicKey = u64; - -// A portion of a key given to an opeator -pub struct Keyshare { - // Index of the validator - pub validator_index: ValidatorIndex, - // Public key of the validator - pub validator_pubkey: PublicKey, - // The public key of the share - pub share_public_key: SharePublicKey, - // The operator who owns this share - pub operator_id: OperatorID, - // The committee this share is a part of - pub committe_id: CommitteeID, - // Graffiti filed - pub graffiti: Graffiti, - // Fee RecipientAddress - pub ethaddress: Address, -} diff --git a/anchor/common/types/src/lib.rs b/anchor/common/types/src/lib.rs index f36ed91..7a8b9fe 100644 --- a/anchor/common/types/src/lib.rs +++ b/anchor/common/types/src/lib.rs @@ -1,27 +1,7 @@ -use types::PublicKey; -pub type ValidatorIndex = usize; // this will be reexported - -// Reexports -pub use committee::{Committee, CommitteeID}; -pub use keyshare::{Keyshare, SharePublicKey}; -pub use operator::{Operator, OperatorStatus, OperatorID}; - -// modules +pub use committee::{CommitteeID, CommitteeMember}; +pub use share::SSVShare; +pub use operator::{Operator, OperatorPublicKey, OperatorID}; mod operator; -mod keyshare; +mod share; mod committee; - - - -// Validator that is distributing its duties to a number of Operators -pub struct Validator { - // The index of the validator - pub validator_index: ValidatorIndex, - // Public key of the validator - pub public_key: PublicKey, - // The commit for the validator - pub committee: Committee, -} - - diff --git a/anchor/common/types/src/operator.rs b/anchor/common/types/src/operator.rs index 9d43db1..fbf9788 100644 --- a/anchor/common/types/src/operator.rs +++ b/anchor/common/types/src/operator.rs @@ -1,25 +1,14 @@ -use types::PublicKey; -use crate::{Keyshare, Committee}; - // Unique idetifier for an Operator -pub type OperatorID = usize; +pub type OperatorID = u64; -// Current operational status of an operator -pub enum OperatorStatus { - Active, - Inactive, -} +// RSA public key +pub type OperatorPublicKey = [u8; 459]; // Client responsible for maintaining the overall health of the network. +#[derive(Debug, Clone)] pub struct Operator { // ID to uniquely identify this operator pub id: OperatorID, - // Public key of the operator - pub public_key: PublicKey, - // All of the validator shares this operator is reponsible for - pub keyshares: Vec, - // All of the committees this operator is in - pub committees: Vec, - // Operation status of the operator - pub status: OperatorStatus, + // Base-64 encoded PEM RSA public key + pub public_key: OperatorPublicKey, } diff --git a/anchor/common/types/src/share.rs b/anchor/common/types/src/share.rs new file mode 100644 index 0000000..2eb20cf --- /dev/null +++ b/anchor/common/types/src/share.rs @@ -0,0 +1,52 @@ +use types::{Address, Domain, Graffiti, PublicKey}; // ValidatorIndex +type ValidatorIndex = usize; // this will come from types +use crate::CommitteeID; +use std::time::SystemTime; + + +// Share of a key that a operator owns and accompanying metadata +#[derive(Debug, Clone)] +pub struct SSVShare { + pub share: Share, + pub metadata: Metadata, +} + +// One of N shares of a split validator key +#[derive(Debug, Clone)] +pub struct Share { + // Index of the validator + pub validator_index: ValidatorIndex, + // Public key of the validator + pub validator_pubkey: PublicKey, + // Public key for this portion of the share + pub share_public_key: PublicKey, + // All committee members that contain a sibling share + pub committee: Vec, + // Identifies the context/purpose of signature + pub domain_type: Domain, + // Eth1 fee address + pub fee_recipient: Address, + // Graffiti + pub graffiti: Graffiti, +} + +// A operator who also holds a portion of this share +// A less descriptive reference to a CommitteeMember +#[derive(Debug, Clone)] +pub struct ShareMember { + // Unique identifier for the operator + pub operator: CommitteeID, + // The public key for this members share + pub share_public_key: PublicKey, +} + +// Share metadata +#[derive(Debug, Clone)] +pub struct Metadata { + // The owner of the validator + pub owner: Address, + // Is the commitee this share part of currently liquidated + pub liquidated: bool, + // Track the last time the metadata was updated. todo!() this or chrono + pub last_updated: SystemTime, +} From 3676efe53d2777d48ed5f86291d61d0baf5290c3 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 13:09:35 +0000 Subject: [PATCH 03/10] update comments --- anchor/common/types/src/committee.rs | 8 +++++--- anchor/common/types/src/lib.rs | 5 ++--- anchor/common/types/src/operator.rs | 2 +- anchor/common/types/src/share.rs | 14 ++++++-------- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/anchor/common/types/src/committee.rs b/anchor/common/types/src/committee.rs index 813d9e3..08b77ff 100644 --- a/anchor/common/types/src/committee.rs +++ b/anchor/common/types/src/committee.rs @@ -1,17 +1,18 @@ use crate::{Operator, OperatorID, OperatorPublicKey}; use types::Domain; -// Unique identifier for a committee +/// Unique identifier for a committee. pub type CommitteeID = u64; -// Member of a committee of operators +/// Member of a SSV Committee. A `CommitteeMember` is just an operator that is part of the committee +/// a validator has chosen to distribute its keyshares to. #[derive(Debug, Clone)] pub struct CommitteeMember { // Unique identifier for the operator pub operator_id: OperatorID, // Unique identifier for the committee this member is a part of pub committee_id: CommitteeID, - // Base-64 encoded PEM RSA public key + // Base-64 encoded PEM RSA public key of the operator pub share_public_key: OperatorPublicKey, // Number of nodes that are faulty/malicious in the committee pub faulty: u64, @@ -20,3 +21,4 @@ pub struct CommitteeMember { // Signature domain pub domain: Domain, } + diff --git a/anchor/common/types/src/lib.rs b/anchor/common/types/src/lib.rs index 7a8b9fe..099c297 100644 --- a/anchor/common/types/src/lib.rs +++ b/anchor/common/types/src/lib.rs @@ -1,7 +1,6 @@ pub use committee::{CommitteeID, CommitteeMember}; +pub use operator::{Operator, OperatorID, OperatorPublicKey}; pub use share::SSVShare; -pub use operator::{Operator, OperatorPublicKey, OperatorID}; +mod committee; mod operator; mod share; -mod committee; - diff --git a/anchor/common/types/src/operator.rs b/anchor/common/types/src/operator.rs index fbf9788..8839fca 100644 --- a/anchor/common/types/src/operator.rs +++ b/anchor/common/types/src/operator.rs @@ -1,7 +1,7 @@ // Unique idetifier for an Operator pub type OperatorID = u64; -// RSA public key +// Operator RSA public key pub type OperatorPublicKey = [u8; 459]; // Client responsible for maintaining the overall health of the network. diff --git a/anchor/common/types/src/share.rs b/anchor/common/types/src/share.rs index 2eb20cf..ae94312 100644 --- a/anchor/common/types/src/share.rs +++ b/anchor/common/types/src/share.rs @@ -1,9 +1,8 @@ -use types::{Address, Domain, Graffiti, PublicKey}; // ValidatorIndex -type ValidatorIndex = usize; // this will come from types +use types::{Address, Domain, Graffiti, PublicKey}; +type ValidatorIndex = usize; // This will come from types use crate::CommitteeID; use std::time::SystemTime; - // Share of a key that a operator owns and accompanying metadata #[derive(Debug, Clone)] pub struct SSVShare { @@ -30,8 +29,7 @@ pub struct Share { pub graffiti: Graffiti, } -// A operator who also holds a portion of this share -// A less descriptive reference to a CommitteeMember +// A operator who holds a portion of the share #[derive(Debug, Clone)] pub struct ShareMember { // Unique identifier for the operator @@ -40,13 +38,13 @@ pub struct ShareMember { pub share_public_key: PublicKey, } -// Share metadata +// General metadata #[derive(Debug, Clone)] pub struct Metadata { // The owner of the validator pub owner: Address, - // Is the commitee this share part of currently liquidated + // Is the committee this share is a part of currently liquidated pub liquidated: bool, - // Track the last time the metadata was updated. todo!() this or chrono + // Track the last time the metadata was updated. pub last_updated: SystemTime, } From c8bdf73711e25a63c1e538c940f5ee8ad29c0c33 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 13:11:51 +0000 Subject: [PATCH 04/10] doc comments --- anchor/common/types/src/operator.rs | 6 ++--- anchor/common/types/src/share.rs | 35 +++++++++++++++-------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/anchor/common/types/src/operator.rs b/anchor/common/types/src/operator.rs index 8839fca..037d1d5 100644 --- a/anchor/common/types/src/operator.rs +++ b/anchor/common/types/src/operator.rs @@ -1,10 +1,10 @@ -// Unique idetifier for an Operator +/// Unique idetifier for an Operator pub type OperatorID = u64; -// Operator RSA public key +/// Operator RSA public key pub type OperatorPublicKey = [u8; 459]; -// Client responsible for maintaining the overall health of the network. +/// Client responsible for maintaining the overall health of the network. #[derive(Debug, Clone)] pub struct Operator { // ID to uniquely identify this operator diff --git a/anchor/common/types/src/share.rs b/anchor/common/types/src/share.rs index ae94312..9893769 100644 --- a/anchor/common/types/src/share.rs +++ b/anchor/common/types/src/share.rs @@ -1,50 +1,51 @@ use types::{Address, Domain, Graffiti, PublicKey}; -type ValidatorIndex = usize; // This will come from types use crate::CommitteeID; use std::time::SystemTime; -// Share of a key that a operator owns and accompanying metadata +type ValidatorIndex = usize; + +/// Share of a key that a operator owns and accompanying metadata #[derive(Debug, Clone)] pub struct SSVShare { pub share: Share, pub metadata: Metadata, } -// One of N shares of a split validator key +/// One of N shares of a split validator key #[derive(Debug, Clone)] pub struct Share { - // Index of the validator + /// Index of the validator pub validator_index: ValidatorIndex, - // Public key of the validator + /// Public key of the validator pub validator_pubkey: PublicKey, - // Public key for this portion of the share + /// Public key for this portion of the share pub share_public_key: PublicKey, - // All committee members that contain a sibling share + /// All committee members that contain a sibling share pub committee: Vec, - // Identifies the context/purpose of signature + /// Identifies the context/purpose of signature pub domain_type: Domain, - // Eth1 fee address + /// Eth1 fee address pub fee_recipient: Address, - // Graffiti + /// Graffiti pub graffiti: Graffiti, } -// A operator who holds a portion of the share +/// A operator who holds a portion of the share #[derive(Debug, Clone)] pub struct ShareMember { - // Unique identifier for the operator + /// Unique identifier for the operator pub operator: CommitteeID, - // The public key for this members share + /// The public key for this members share pub share_public_key: PublicKey, } -// General metadata +/// General metadata #[derive(Debug, Clone)] pub struct Metadata { - // The owner of the validator + /// The owner of the validator pub owner: Address, - // Is the committee this share is a part of currently liquidated + /// Is the committee this share is a part of currently liquidated pub liquidated: bool, - // Track the last time the metadata was updated. + /// Track the last time the metadata was updated. pub last_updated: SystemTime, } From 5b02a70629af5fdbce269e4bea3d16d8ee79e8e6 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 13:15:29 +0000 Subject: [PATCH 05/10] spelling --- anchor/common/types/src/operator.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anchor/common/types/src/operator.rs b/anchor/common/types/src/operator.rs index 037d1d5..b5f4c10 100644 --- a/anchor/common/types/src/operator.rs +++ b/anchor/common/types/src/operator.rs @@ -1,4 +1,4 @@ -/// Unique idetifier for an Operator +/// Unique identifier for an Operator pub type OperatorID = u64; /// Operator RSA public key From 1712f7b853fdaf49c79cadc1d8c23b832179338f Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 13:25:11 +0000 Subject: [PATCH 06/10] toml update --- anchor/common/types/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anchor/common/types/Cargo.toml b/anchor/common/types/Cargo.toml index 5d5001f..ac95f78 100644 --- a/anchor/common/types/Cargo.toml +++ b/anchor/common/types/Cargo.toml @@ -1,7 +1,8 @@ [package] name = "types" version = "0.1.0" -edition = "2021" +edition = { workspace = true } +authors = ["Sigma Prime "] [dependencies] types = { workspace = true} From 376cdaa15a2a51455cd780a58dffc5d9b1478615 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 14:03:22 +0000 Subject: [PATCH 07/10] rename to ssv_types to prevent conflict with lighthouse types --- Cargo.lock | 14 +++++++------- Cargo.toml | 2 +- anchor/common/{types => ssv_types}/Cargo.toml | 2 +- .../common/{types => ssv_types}/src/committee.rs | 0 anchor/common/{types => ssv_types}/src/lib.rs | 0 anchor/common/{types => ssv_types}/src/operator.rs | 0 anchor/common/{types => ssv_types}/src/share.rs | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename anchor/common/{types => ssv_types}/Cargo.toml (88%) rename anchor/common/{types => ssv_types}/src/committee.rs (100%) rename anchor/common/{types => ssv_types}/src/lib.rs (100%) rename anchor/common/{types => ssv_types}/src/operator.rs (100%) rename anchor/common/{types => ssv_types}/src/share.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 0943ef2..dd993f9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7278,6 +7278,13 @@ dependencies = [ "der 0.7.9", ] +[[package]] +name = "ssv_types" +version = "0.1.0" +dependencies = [ + "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", +] + [[package]] name = "ssz_types" version = "0.8.0" @@ -8023,13 +8030,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "types" -version = "0.1.0" -dependencies = [ - "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", -] - [[package]] name = "types" version = "0.2.1" diff --git a/Cargo.toml b/Cargo.toml index 22bf7cc..68a0629 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ "anchor/qbft", "anchor/network", "anchor/common/version", - "anchor/common/types" + "anchor/common/ssv_types" ] resolver = "2" diff --git a/anchor/common/types/Cargo.toml b/anchor/common/ssv_types/Cargo.toml similarity index 88% rename from anchor/common/types/Cargo.toml rename to anchor/common/ssv_types/Cargo.toml index ac95f78..dfde9c1 100644 --- a/anchor/common/types/Cargo.toml +++ b/anchor/common/ssv_types/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "types" +name = "ssv_types" version = "0.1.0" edition = { workspace = true } authors = ["Sigma Prime "] diff --git a/anchor/common/types/src/committee.rs b/anchor/common/ssv_types/src/committee.rs similarity index 100% rename from anchor/common/types/src/committee.rs rename to anchor/common/ssv_types/src/committee.rs diff --git a/anchor/common/types/src/lib.rs b/anchor/common/ssv_types/src/lib.rs similarity index 100% rename from anchor/common/types/src/lib.rs rename to anchor/common/ssv_types/src/lib.rs diff --git a/anchor/common/types/src/operator.rs b/anchor/common/ssv_types/src/operator.rs similarity index 100% rename from anchor/common/types/src/operator.rs rename to anchor/common/ssv_types/src/operator.rs diff --git a/anchor/common/types/src/share.rs b/anchor/common/ssv_types/src/share.rs similarity index 100% rename from anchor/common/types/src/share.rs rename to anchor/common/ssv_types/src/share.rs From d53b83cfaf9dc6c6dacddd670eaef48e149c7f5a Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 14:13:56 +0000 Subject: [PATCH 08/10] format --- anchor/common/ssv_types/src/committee.rs | 1 - anchor/common/ssv_types/src/share.rs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/anchor/common/ssv_types/src/committee.rs b/anchor/common/ssv_types/src/committee.rs index 08b77ff..2ac9c1f 100644 --- a/anchor/common/ssv_types/src/committee.rs +++ b/anchor/common/ssv_types/src/committee.rs @@ -21,4 +21,3 @@ pub struct CommitteeMember { // Signature domain pub domain: Domain, } - diff --git a/anchor/common/ssv_types/src/share.rs b/anchor/common/ssv_types/src/share.rs index 9893769..75e5ba7 100644 --- a/anchor/common/ssv_types/src/share.rs +++ b/anchor/common/ssv_types/src/share.rs @@ -1,6 +1,6 @@ -use types::{Address, Domain, Graffiti, PublicKey}; use crate::CommitteeID; use std::time::SystemTime; +use types::{Address, Domain, Graffiti, PublicKey}; type ValidatorIndex = usize; From 80b71c1aa58985dd70584a02ace50b22f7df9b22 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Wed, 27 Nov 2024 19:11:31 +0000 Subject: [PATCH 09/10] dep bump --- Cargo.lock | 1160 ++++++++++++++++++++++++------------- anchor/network/Cargo.toml | 2 +- 2 files changed, 763 insertions(+), 399 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dd993f9..86cc4fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "account_utils" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "eth2_keystore", @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" [[package]] name = "alloy-consensus" @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.5" +version = "0.8.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "260d3ff3bff0bb84599f032a2f2c6828180b0ea0cd41fdaf44f39cef3ba41861" +checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" dependencies = [ "alloy-rlp", "arbitrary", @@ -180,8 +180,9 @@ dependencies = [ "const-hex", "derive_arbitrary", "derive_more 1.0.0", + "foldhash", "getrandom", - "hashbrown 0.14.5", + "hashbrown 0.15.2", "hex-literal", "indexmap", "itoa", @@ -200,9 +201,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +checksum = "da0822426598f95e45dd1ea32a738dac057529a709ee645fcc516ffa4cbde08f" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -211,13 +212,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -255,9 +256,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -270,49 +271,49 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.91" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223" dependencies = [ "derive_arbitrary", ] @@ -480,7 +481,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -492,7 +493,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "synstructure", ] @@ -504,7 +505,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -526,9 +527,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", "cfg-if", @@ -537,7 +538,7 @@ dependencies = [ "futures-lite", "parking", "polling", - "rustix 0.38.37", + "rustix 0.38.41", "slab", "tracing", "windows-sys 0.59.0", @@ -562,7 +563,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -597,7 +598,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -608,9 +609,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", @@ -619,7 +620,7 @@ dependencies = [ "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.1", "hyper-util", "itoa", "matchit", @@ -632,7 +633,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tokio", "tower", "tower-layer", @@ -655,7 +656,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper 1.0.2", "tower-layer", "tower-service", "tracing", @@ -721,7 +722,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "beacon_chain" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "bitvec 1.0.1", @@ -875,7 +876,7 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "arbitrary", @@ -895,7 +896,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "arbitrary", @@ -952,7 +953,7 @@ dependencies = [ [[package]] name = "builder_client" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "eth2", "lighthouse_version 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -981,9 +982,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" dependencies = [ "serde", ] @@ -1026,9 +1027,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.24" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" dependencies = [ "jobserver", "libc", @@ -1105,9 +1106,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" dependencies = [ "clap_builder", "clap_derive", @@ -1115,9 +1116,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" dependencies = [ "anstream", "anstyle", @@ -1135,19 +1136,19 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "clap", @@ -1164,7 +1165,7 @@ dependencies = [ [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "clap", @@ -1188,7 +1189,7 @@ dependencies = [ "fdlimit", "http_api", "http_metrics", - "hyper 1.4.1", + "hyper 1.5.1", "network", "parking_lot 0.12.3", "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -1203,23 +1204,23 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "itertools 0.10.5", ] @@ -1227,7 +1228,7 @@ dependencies = [ [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "itertools 0.10.5", ] @@ -1235,7 +1236,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "quote", "syn 1.0.109", @@ -1244,7 +1245,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "quote", "syn 1.0.109", @@ -1261,9 +1262,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" dependencies = [ "cfg-if", "cpufeatures", @@ -1320,9 +1321,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -1535,7 +1536,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1583,7 +1584,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1605,7 +1606,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1690,7 +1691,7 @@ dependencies = [ [[package]] name = "deposit_contract" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "ethabi 16.0.0", "ethereum_ssz", @@ -1759,13 +1760,13 @@ dependencies = [ [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1776,7 +1777,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -1797,7 +1798,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "unicode-xid", ] @@ -1825,7 +1826,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "clap", "clap_utils 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -1835,7 +1836,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "clap", "clap_utils 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -1916,7 +1917,7 @@ dependencies = [ "arrayvec", "ctr 0.9.2", "delay_map 0.3.0", - "enr", + "enr 0.12.1", "fnv", "futures", "hashlink 0.8.4", @@ -1949,15 +1950,48 @@ dependencies = [ "arrayvec", "ctr 0.9.2", "delay_map 0.4.0", - "enr", + "enr 0.12.1", + "fnv", + "futures", + "hashlink 0.9.1", + "hex", + "hkdf", + "lazy_static", + "lru", + "more-asserts", + "parking_lot 0.12.3", + "rand", + "smallvec", + "socket2 0.5.7", + "tokio", + "tracing", + "uint 0.10.0", + "zeroize", +] + +[[package]] +name = "discv5" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898d136ecb64116ec68aecf14d889bd30f8b1fe0c19e262953f7388dbe77052e" +dependencies = [ + "aes 0.8.4", + "aes-gcm", + "alloy-rlp", + "arrayvec", + "ctr 0.9.2", + "delay_map 0.4.0", + "enr 0.13.0", "fnv", "futures", "hashlink 0.9.1", "hex", "hkdf", "lazy_static", + "libp2p-identity", "lru", "more-asserts", + "multiaddr", "parking_lot 0.12.3", "rand", "smallvec", @@ -1976,7 +2010,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2109,6 +2143,25 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enr" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "851bd664a3d3a3c175cff92b2f0df02df3c541b4895d0ae307611827aae46152" +dependencies = [ + "alloy-rlp", + "base64 0.22.1", + "bytes", + "ed25519-dalek", + "hex", + "k256 0.13.4", + "log", + "rand", + "serde", + "sha3 0.10.8", + "zeroize", +] + [[package]] name = "enum-as-inner" version = "0.6.1" @@ -2118,13 +2171,13 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "environment" version = "0.1.2" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "async-channel", "ctrlc", @@ -2181,7 +2234,7 @@ dependencies = [ [[package]] name = "eth1" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "eth2", "ethereum_ssz", @@ -2206,7 +2259,7 @@ dependencies = [ [[package]] name = "eth2" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "account_utils", "bytes", @@ -2238,7 +2291,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "paste", "types 0.2.1 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -2247,7 +2300,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "paste", "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -2256,7 +2309,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "ethereum_hashing", @@ -2269,7 +2322,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "ethereum_hashing", @@ -2282,7 +2335,7 @@ dependencies = [ [[package]] name = "eth2_key_derivation" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "num-bigint-dig", @@ -2294,7 +2347,7 @@ dependencies = [ [[package]] name = "eth2_keystore" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "aes 0.7.5", "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -2316,7 +2369,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bytes", "discv5 0.7.0", @@ -2337,10 +2390,10 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "bytes", - "discv5 0.7.0", + "discv5 0.9.0", "eth2_config 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "kzg 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "logging 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -2358,7 +2411,7 @@ dependencies = [ [[package]] name = "eth2_wallet" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "eth2_key_derivation", "eth2_keystore", @@ -2381,7 +2434,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "thiserror", + "thiserror 1.0.69", "uint 0.9.5", ] @@ -2398,7 +2451,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.10.8", - "thiserror", + "thiserror 1.0.69", "uint 0.9.5", ] @@ -2504,7 +2557,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2528,7 +2581,7 @@ dependencies = [ "serde", "serde_json", "strum", - "thiserror", + "thiserror 1.0.69", "tiny-keccak", "unicode-xid", ] @@ -2563,7 +2616,7 @@ dependencies = [ [[package]] name = "execution_layer" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -2628,9 +2681,9 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "fastrlp" @@ -2650,7 +2703,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2699,7 +2752,7 @@ dependencies = [ [[package]] name = "filesystem" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "winapi", "windows-acl", @@ -2732,7 +2785,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "safe_arith 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -2741,7 +2794,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -2749,9 +2802,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "libz-sys", @@ -2788,7 +2841,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork_choice" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -2832,9 +2885,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2857,9 +2910,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2867,15 +2920,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2885,15 +2938,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.3.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +checksum = "cef40d21ae2c515b51041df9ed313ed21e572df340ea58a922a0aefe7e8891a1" dependencies = [ "futures-core", "pin-project-lite", @@ -2901,13 +2954,13 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -2917,21 +2970,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.23.15", + "rustls 0.23.19", "rustls-pki-types", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-ticker" @@ -2952,9 +3005,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2982,7 +3035,7 @@ dependencies = [ [[package]] name = "genesis" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "environment", "eth1", @@ -3024,9 +3077,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git-version" @@ -3045,7 +3098,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -3057,7 +3110,7 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gossipsub" version = "0.5.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "async-channel", "asynchronous-codec", @@ -3087,7 +3140,7 @@ dependencies = [ [[package]] name = "gossipsub" version = "0.5.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "async-channel", "asynchronous-codec", @@ -3180,18 +3233,18 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", "allocator-api2", - "serde", ] [[package]] name = "hashbrown" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" dependencies = [ "allocator-api2", "equivalent", "foldhash", + "serde", ] [[package]] @@ -3299,7 +3352,7 @@ dependencies = [ "once_cell", "rand", "socket2 0.5.7", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tokio", "tracing", @@ -3322,7 +3375,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -3508,9 +3561,9 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "97818827ef4f364230e16705d4706e2897df2bb60617d6ca15d598025a3c481f" dependencies = [ "bytes", "futures-channel", @@ -3554,15 +3607,15 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" +checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4" dependencies = [ "bytes", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.1", "pin-project-lite", "tokio", "tower-service", @@ -3579,7 +3632,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -3591,6 +3644,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -3609,12 +3780,23 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] @@ -3629,9 +3811,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" +checksum = "cdf9d64cfcf380606e64f9a0bcf493616b65331199f984151a6fa11a7b3cde38" dependencies = [ "async-io", "core-foundation", @@ -3640,8 +3822,12 @@ dependencies = [ "if-addrs", "ipnet", "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-proto", + "netlink-sys", "rtnetlink", - "system-configuration", + "system-configuration 0.6.1", "tokio", "windows", ] @@ -3680,7 +3866,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.6.12", + "parity-scale-codec 3.7.0", ] [[package]] @@ -3712,13 +3898,13 @@ dependencies = [ [[package]] name = "impl-trait-for-tuples" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" +checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -3729,7 +3915,7 @@ checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "arbitrary", "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.15.2", "serde", ] @@ -3754,7 +3940,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bytes", ] @@ -3762,7 +3948,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "bytes", ] @@ -3842,9 +4028,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jobserver" @@ -3938,7 +4124,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "arbitrary", "c-kzg", @@ -3957,7 +4143,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "arbitrary", "c-kzg", @@ -4007,9 +4193,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.159" +version = "0.2.166" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" [[package]] name = "libflate" @@ -4037,9 +4223,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libp2p" @@ -4072,7 +4258,7 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4120,7 +4306,7 @@ dependencies = [ "rand", "rw-stream-sink", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "unsigned-varint 0.8.0", "void", @@ -4192,16 +4378,16 @@ dependencies = [ "quick-protobuf", "quick-protobuf-codec", "smallvec", - "thiserror", + "thiserror 1.0.69", "tracing", "void", ] [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "257b5621d159b32282eac446bed6670c39c7dc68a200a992d8f056afa0066f6d" dependencies = [ "asn1_der", "bs58", @@ -4214,9 +4400,8 @@ dependencies = [ "rand", "sec1 0.7.3", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "tracing", - "void", "zeroize", ] @@ -4298,7 +4483,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror", + "thiserror 1.0.69", "tracing", "x25519-dalek", "zeroize", @@ -4355,9 +4540,9 @@ dependencies = [ "quinn", "rand", "ring 0.17.8", - "rustls 0.23.15", + "rustls 0.23.19", "socket2 0.5.7", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -4395,7 +4580,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -4427,9 +4612,9 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.17.8", - "rustls 0.23.15", + "rustls 0.23.19", "rustls-webpki 0.101.7", - "thiserror", + "thiserror 1.0.69", "x509-parser", "yasna", ] @@ -4459,10 +4644,10 @@ dependencies = [ "either", "futures", "libp2p-core", - "thiserror", + "thiserror 1.0.69", "tracing", "yamux 0.12.1", - "yamux 0.13.3", + "yamux 0.13.4", ] [[package]] @@ -4548,7 +4733,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4598,15 +4783,15 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "alloy-rlp", "bytes", - "delay_map 0.3.0", + "delay_map 0.4.0", "directory 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "dirs 3.0.2", - "discv5 0.7.0", + "discv5 0.9.0", "either", "error-chain", "ethereum_ssz", @@ -4648,7 +4833,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "git-version", "target_info", @@ -4657,7 +4842,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "git-version", "target_info", @@ -4681,6 +4866,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" + [[package]] name = "lock_api" version = "0.4.12" @@ -4694,7 +4885,7 @@ dependencies = [ [[package]] name = "lockfile" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "fs2", ] @@ -4708,7 +4899,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "chrono", "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -4730,7 +4921,7 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "chrono", "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -4755,7 +4946,7 @@ version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.15.2", ] [[package]] @@ -4770,7 +4961,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "fnv", ] @@ -4778,7 +4969,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "fnv", ] @@ -4843,7 +5034,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -4854,7 +5045,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -4864,18 +5055,18 @@ dependencies = [ [[package]] name = "metastruct" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f00a5ba4a0f3453c31c397b214e1675d95b697c33763aa58add57ea833424384" +checksum = "d74f54f231f9a18d77393ecc5cc7ab96709b2a61ee326c2b2b291009b0cc5a07" dependencies = [ "metastruct_macro", ] [[package]] name = "metastruct_macro" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a991d4536c933306e52f0e8ab303757185ec13a09d1f3e1cbde5a0d8410bf" +checksum = "985e7225f3a4dfbec47a0c6a730a874185fda840d365d7bbd6ba199dd81796d5" dependencies = [ "darling 0.13.4", "itertools 0.10.5", @@ -4888,7 +5079,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "prometheus", ] @@ -4896,7 +5087,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "prometheus", ] @@ -5005,12 +5196,12 @@ dependencies = [ [[package]] name = "multihash" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" +checksum = "cc41f430805af9d1cf4adae4ed2149c759b877b01d909a1f40256188d09345d2" dependencies = [ "core2", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", ] [[package]] @@ -5046,21 +5237,20 @@ dependencies = [ [[package]] name = "netlink-packet-core" -version = "0.4.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345b8ab5bd4e71a2986663e88c56856699d060e78e152e6e9d7966fcd5491297" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" dependencies = [ "anyhow", "byteorder", - "libc", "netlink-packet-utils", ] [[package]] name = "netlink-packet-route" -version = "0.12.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" dependencies = [ "anyhow", "bitflags 1.3.2", @@ -5079,21 +5269,21 @@ dependencies = [ "anyhow", "byteorder", "paste", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "netlink-proto" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" +checksum = "86b33524dc0968bfad349684447bfce6db937a9ac3332a1fe60c0c5a5ce63f21" dependencies = [ "bytes", "futures", "log", "netlink-packet-core", "netlink-sys", - "thiserror", + "thiserror 1.0.69", "tokio", ] @@ -5138,6 +5328,17 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + [[package]] name = "nix" version = "0.29.0" @@ -5252,9 +5453,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -5270,17 +5471,14 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot_broadcast" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "parking_lot 0.12.3", ] @@ -5339,7 +5537,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5350,9 +5548,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.4.0+3.4.0" +version = "300.4.1+3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" dependencies = [ "cc", ] @@ -5373,7 +5571,7 @@ dependencies = [ [[package]] name = "operation_pool" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bitvec 1.0.1", "derivative", @@ -5439,15 +5637,16 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" dependencies = [ "arrayvec", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", - "parity-scale-codec-derive 3.6.12", + "parity-scale-codec-derive 3.7.0", + "rustversion", "serde", ] @@ -5465,14 +5664,14 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.89", ] [[package]] @@ -5594,40 +5793,40 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.13" +version = "2.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" [[package]] name = "pin-utils" @@ -5669,15 +5868,15 @@ checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" [[package]] name = "polling" -version = "3.7.3" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.41", "tracing", "windows-sys 0.59.0", ] @@ -5705,12 +5904,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -5729,7 +5922,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "reqwest", "sensitive_url 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -5738,7 +5931,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "reqwest", "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -5801,9 +5994,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -5835,7 +6028,7 @@ dependencies = [ "memchr", "parking_lot 0.12.3", "protobuf", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5858,7 +6051,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -5889,13 +6082,13 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "proto_array" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "ethereum_ssz", "ethereum_ssz_derive", @@ -5927,7 +6120,7 @@ dependencies = [ "num_cpus", "once_cell", "platforms", - "thiserror", + "thiserror 1.0.69", "unescape", ] @@ -5966,15 +6159,15 @@ dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", - "thiserror", + "thiserror 1.0.69", "unsigned-varint 0.8.0", ] [[package]] name = "quinn" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "futures-io", @@ -5982,36 +6175,40 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.15", + "rustls 0.23.19", "socket2 0.5.7", - "thiserror", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom", "rand", "ring 0.17.8", "rustc-hash 2.0.0", - "rustls 0.23.15", + "rustls 0.23.19", + "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.3", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2 0.5.7", @@ -6159,7 +6356,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -6170,7 +6367,7 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.9", "regex-syntax 0.8.5", ] @@ -6185,9 +6382,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -6237,7 +6434,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -6361,16 +6558,19 @@ dependencies = [ [[package]] name = "rtnetlink" -version = "0.10.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" dependencies = [ "futures", "log", + "netlink-packet-core", "netlink-packet-route", + "netlink-packet-utils", "netlink-proto", - "nix 0.24.3", - "thiserror", + "netlink-sys", + "nix 0.26.4", + "thiserror 1.0.69", "tokio", ] @@ -6388,7 +6588,7 @@ dependencies = [ "fastrlp", "num-bigint", "num-traits", - "parity-scale-codec 3.6.12", + "parity-scale-codec 3.7.0", "primitive-types 0.12.2", "proptest", "rand", @@ -6421,9 +6621,9 @@ dependencies = [ [[package]] name = "rust_eth_kzg" -version = "0.5.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1407734b92b14e4b9a4d2925e2f9d2c7413f3bc16866cbb1261c9c5e5bf0f04f" +checksum = "3291fd0d9c629a56537d74bbc1e7bcaf5be610f2f7b55af85c4fea843c6aeca3" dependencies = [ "crate_crypto_internal_eth_kzg_bls12_381", "crate_crypto_internal_eth_kzg_erasure_codes", @@ -6500,9 +6700,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", @@ -6539,9 +6739,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.15" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "once_cell", "ring 0.17.8", @@ -6574,6 +6774,9 @@ name = "rustls-pki-types" version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" +dependencies = [ + "web-time", +] [[package]] name = "rustls-webpki" @@ -6598,9 +6801,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "rusty-fork" @@ -6634,12 +6837,12 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" [[package]] name = "salsa20" @@ -6652,33 +6855,33 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aa7ffc1c0ef49b0452c6e2986abf2b07743320641ffd5fc63d552458e3b779b" +checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", "derive_more 1.0.0", - "parity-scale-codec 3.6.12", + "parity-scale-codec 3.7.0", "scale-info-derive", ] [[package]] name = "scale-info-derive" -version = "2.11.5" +version = "2.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46385cc24172cf615450267463f937c10072516359b3ff1cb24228a4a08bf951" +checksum = "c6630024bf739e2179b91fb424b28898baf819414262c5d376677dbff1fe7ebf" dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -6769,9 +6972,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2" dependencies = [ "core-foundation-sys", "libc", @@ -6794,9 +6997,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "semver-parser" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2" dependencies = [ "pest", ] @@ -6804,7 +7007,7 @@ dependencies = [ [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "serde", "url", @@ -6813,7 +7016,7 @@ dependencies = [ [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "serde", "url", @@ -6821,9 +7024,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -6840,20 +7043,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", @@ -6879,7 +7082,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7026,7 +7229,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -7042,7 +7245,7 @@ dependencies = [ [[package]] name = "slasher" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bincode", "byteorder", @@ -7068,7 +7271,7 @@ dependencies = [ [[package]] name = "slashing_protection" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "arbitrary", "ethereum_serde_utils", @@ -7187,7 +7390,7 @@ dependencies = [ [[package]] name = "slot_clock" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "parking_lot 0.12.3", @@ -7312,7 +7515,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state_processing" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "arbitrary", "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -7344,7 +7547,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "store" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "db-key", "directory 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", @@ -7421,7 +7624,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7431,7 +7634,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7451,9 +7654,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" dependencies = [ "proc-macro2", "quote", @@ -7468,9 +7671,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" [[package]] name = "synstructure" @@ -7480,7 +7683,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7491,7 +7694,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -7504,6 +7718,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "take_mut" version = "0.2.2" @@ -7525,7 +7749,7 @@ checksum = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe" [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "async-channel", "futures", @@ -7539,7 +7763,7 @@ dependencies = [ [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "async-channel", "futures", @@ -7553,14 +7777,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", "once_cell", - "rustix 0.38.37", + "rustix 0.38.41", "windows-sys 0.59.0", ] @@ -7581,14 +7805,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" dependencies = [ - "rustix 0.38.37", + "rustix 0.38.41", "windows-sys 0.59.0", ] [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "quote", "syn 1.0.109", @@ -7597,7 +7821,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "quote", "syn 1.0.109", @@ -7605,22 +7829,42 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.3", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] @@ -7686,7 +7930,7 @@ dependencies = [ "rand", "rustc-hash 1.1.0", "sha2 0.10.8", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", "zeroize", @@ -7701,6 +7945,16 @@ dependencies = [ "crunchy", ] +[[package]] +name = "tinystr" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +dependencies = [ + "displaydoc", + "zerovec", +] + [[package]] name = "tinyvec" version = "1.8.0" @@ -7718,9 +7972,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", @@ -7751,7 +8005,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -7858,9 +8112,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97" +checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697" dependencies = [ "bitflags 2.6.0", "bytes", @@ -7884,9 +8138,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -7901,27 +8155,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", - "thiserror", + "thiserror 1.0.69", "time", "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -7995,7 +8249,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", ] [[package]] @@ -8010,9 +8264,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" dependencies = [ "serde", "stable_deref_trait", @@ -8033,7 +8287,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8082,7 +8336,7 @@ dependencies = [ [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8178,15 +8432,15 @@ checksum = "7e51b68083f157f853b6379db119d1c1be0e6e4dec98101079dec41f6f5cf6df" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" @@ -8257,7 +8511,7 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "lru_cache 0.1.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "parking_lot 0.12.3", @@ -8266,7 +8520,7 @@ dependencies = [ [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#e31ac508d404700c35d99936028a5fd74749c335" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" dependencies = [ "lru_cache 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "parking_lot 0.12.3", @@ -8274,15 +8528,27 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 0.5.0", + "idna 1.0.3", "percent-encoding", ] +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -8302,7 +8568,7 @@ dependencies = [ [[package]] name = "validator_dir" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "bls 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", "deposit_contract", @@ -8320,7 +8586,7 @@ dependencies = [ [[package]] name = "validator_metrics" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "metrics 0.2.0 (git+https://github.com/agemanning/lighthouse?branch=modularize-vc)", ] @@ -8414,7 +8680,7 @@ dependencies = [ [[package]] name = "warp_utils" version = "0.1.0" -source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#3a6800fa8b220125b3b420d679aad59a82980e07" +source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a58586623f84f0fd4b0a5c1de43edfc8010a78" dependencies = [ "beacon_chain", "bytes", @@ -8459,7 +8725,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-shared", ] @@ -8493,7 +8759,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8506,9 +8772,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "wasm-streams" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -8579,12 +8845,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.51.1" +version = "0.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "efc5cf48f83140dcaab716eeaea345f9e93d0018fb81162753a3f76c3397b538" dependencies = [ - "windows-core", - "windows-targets 0.48.5", + "windows-core 0.53.0", + "windows-targets 0.52.6", ] [[package]] @@ -8601,11 +8867,30 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.53.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dcc5b895a6377f1ab9fa55acedab1fd5ac0db66ad1e6c7f47e28a22e446a5dd" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -8850,6 +9135,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "wyz" version = "0.2.0" @@ -8890,15 +9187,15 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f" [[package]] name = "xmltree" @@ -8926,9 +9223,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "17610762a1207ee816c6fadc29220904753648aba0a9ed61c7b8336e80a559c4" dependencies = [ "futures", "log", @@ -8949,6 +9246,30 @@ dependencies = [ "time", ] +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -8967,7 +9288,28 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", + "synstructure", ] [[package]] @@ -8987,7 +9329,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.89", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.89", ] [[package]] diff --git a/anchor/network/Cargo.toml b/anchor/network/Cargo.toml index 73801a6..3c8bac6 100644 --- a/anchor/network/Cargo.toml +++ b/anchor/network/Cargo.toml @@ -17,4 +17,4 @@ serde = { workspace = true } tracing = { workspace = true } [dev-dependencies] -async-channel = { workspace = true } \ No newline at end of file +async-channel = { workspace = true } From 4a4dfb518f332d768eb5cc38a6bbfc77758ef7e0 Mon Sep 17 00:00:00 2001 From: Zacholme7 Date: Mon, 2 Dec 2024 15:37:44 +0000 Subject: [PATCH 10/10] newtypes & rsa support --- Cargo.lock | 305 +++++++++++++---------- Cargo.toml | 2 + anchor/common/ssv_types/Cargo.toml | 3 + anchor/common/ssv_types/src/committee.rs | 66 ++++- anchor/common/ssv_types/src/lib.rs | 5 +- anchor/common/ssv_types/src/operator.rs | 56 ++++- anchor/common/ssv_types/src/share.rs | 14 +- anchor/common/ssv_types/src/util.rs | 29 +++ 8 files changed, 316 insertions(+), 164 deletions(-) create mode 100644 anchor/common/ssv_types/src/util.rs diff --git a/Cargo.lock b/Cargo.lock index 86cc4fa..d167f8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "allocator-api2" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "alloy-consensus" @@ -169,9 +169,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "0.8.13" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aeeb5825c2fc8c2662167058347cd0cafc3cb15bcb5cdb1758a63c2dca0409e" +checksum = "9db948902dfbae96a73c2fbf1f7abec62af034ab883e4c777c3fd29702bd6e2c" dependencies = [ "alloy-rlp", "arbitrary", @@ -193,7 +193,7 @@ dependencies = [ "proptest-derive", "rand", "ruint", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "serde", "sha3 0.10.8", "tiny-keccak", @@ -218,7 +218,7 @@ checksum = "2b09cae092c27b6f1bde952653a22708691802e57bfef4a2973b80bea21efd3f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -493,7 +493,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -505,7 +505,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -563,7 +563,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -598,7 +598,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -896,7 +896,7 @@ dependencies = [ [[package]] name = "bls" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "arbitrary", @@ -982,9 +982,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" dependencies = [ "serde", ] @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", @@ -1136,7 +1136,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1165,7 +1165,7 @@ dependencies = [ [[package]] name = "clap_utils" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "clap", @@ -1228,7 +1228,7 @@ dependencies = [ [[package]] name = "compare_fields" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "itertools 0.10.5", ] @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "compare_fields_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "quote", "syn 1.0.109", @@ -1262,9 +1262,9 @@ dependencies = [ [[package]] name = "const-hex" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487981fa1af147182687064d0a2c336586d337a606595ced9ffb0c685c250c73" +checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c" dependencies = [ "cfg-if", "cpufeatures", @@ -1536,7 +1536,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1584,7 +1584,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.11.1", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1606,7 +1606,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core 0.20.10", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1766,7 +1766,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1777,7 +1777,7 @@ checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -1798,7 +1798,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "unicode-xid", ] @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "directory" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "clap", "clap_utils 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -1962,7 +1962,7 @@ dependencies = [ "parking_lot 0.12.3", "rand", "smallvec", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tracing", "uint 0.10.0", @@ -1995,7 +1995,7 @@ dependencies = [ "parking_lot 0.12.3", "rand", "smallvec", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tracing", "uint 0.10.0", @@ -2010,7 +2010,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2171,7 +2171,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2213,12 +2213,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2300,7 +2300,7 @@ dependencies = [ [[package]] name = "eth2_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "paste", "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -2322,7 +2322,7 @@ dependencies = [ [[package]] name = "eth2_interop_keypairs" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "bls 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "ethereum_hashing", @@ -2390,7 +2390,7 @@ dependencies = [ [[package]] name = "eth2_network_config" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "bytes", "discv5 0.9.0", @@ -2557,7 +2557,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -2605,9 +2605,9 @@ dependencies = [ [[package]] name = "event-listener-strategy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" dependencies = [ "event-listener 5.3.1", "pin-project-lite", @@ -2794,7 +2794,7 @@ dependencies = [ [[package]] name = "fixed_bytes" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "safe_arith 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -2960,7 +2960,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3098,7 +3098,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3140,7 +3140,7 @@ dependencies = [ [[package]] name = "gossipsub" version = "0.5.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "async-channel", "asynchronous-codec", @@ -3351,7 +3351,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "socket2 0.5.7", + "socket2 0.5.8", "thiserror 1.0.69", "tinyvec", "tokio", @@ -3552,7 +3552,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -3759,7 +3759,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -3866,7 +3866,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ - "parity-scale-codec 3.7.0", + "parity-scale-codec 3.6.12", ] [[package]] @@ -3904,14 +3904,14 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "arbitrary", "equivalent", @@ -3948,7 +3948,7 @@ dependencies = [ [[package]] name = "int_to_bytes" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "bytes", ] @@ -3979,7 +3979,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.7", + "socket2 0.5.8", "widestring 1.1.0", "windows-sys 0.48.0", "winreg", @@ -4043,10 +4043,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -4143,7 +4144,7 @@ dependencies = [ [[package]] name = "kzg" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "arbitrary", "c-kzg", @@ -4193,9 +4194,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.166" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ccc108bbc0b1331bd061864e7cd823c0cab660bbe6970e66e2c0614decde36" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libflate" @@ -4420,7 +4421,7 @@ dependencies = [ "libp2p-swarm", "rand", "smallvec", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tracing", "void", @@ -4541,7 +4542,7 @@ dependencies = [ "rand", "ring 0.17.8", "rustls 0.23.19", - "socket2 0.5.7", + "socket2 0.5.8", "thiserror 1.0.69", "tokio", "tracing", @@ -4580,7 +4581,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -4595,7 +4596,7 @@ dependencies = [ "libc", "libp2p-core", "libp2p-identity", - "socket2 0.5.7", + "socket2 0.5.8", "tokio", "tracing", ] @@ -4783,7 +4784,7 @@ dependencies = [ [[package]] name = "lighthouse_network" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -4793,7 +4794,6 @@ dependencies = [ "dirs 3.0.2", "discv5 0.9.0", "either", - "error-chain", "ethereum_ssz", "ethereum_ssz_derive", "fnv", @@ -4842,7 +4842,7 @@ dependencies = [ [[package]] name = "lighthouse_version" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "git-version", "target_info", @@ -4921,7 +4921,7 @@ dependencies = [ [[package]] name = "logging" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "chrono", "metrics 0.2.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -4969,7 +4969,7 @@ dependencies = [ [[package]] name = "lru_cache" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "fnv", ] @@ -5045,7 +5045,7 @@ dependencies = [ [[package]] name = "merkle_proof" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -5087,7 +5087,7 @@ dependencies = [ [[package]] name = "metrics" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "prometheus", ] @@ -5148,11 +5148,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", "windows-sys 0.52.0", @@ -5537,7 +5536,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5637,16 +5636,15 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.7.0" +version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590" +checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ "arrayvec", "bitvec 1.0.1", "byte-slice-cast", "impl-trait-for-tuples", "parity-scale-codec-derive 3.7.0", - "rustversion", "serde", ] @@ -5671,7 +5669,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5819,7 +5817,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -5834,6 +5832,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der 0.7.9", + "pkcs8 0.10.2", + "spki 0.7.3", +] + [[package]] name = "pkcs8" version = "0.9.0" @@ -5931,7 +5940,7 @@ dependencies = [ [[package]] name = "pretty_reqwest_error" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "reqwest", "sensitive_url 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", @@ -6051,7 +6060,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -6082,7 +6091,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -6174,9 +6183,9 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "rustls 0.23.19", - "socket2 0.5.7", + "socket2 0.5.8", "thiserror 2.0.3", "tokio", "tracing", @@ -6192,7 +6201,7 @@ dependencies = [ "getrandom", "rand", "ring 0.17.8", - "rustc-hash 2.0.0", + "rustc-hash 2.1.0", "rustls 0.23.19", "rustls-pki-types", "slab", @@ -6211,7 +6220,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.7", + "socket2 0.5.8", "tracing", "windows-sys 0.59.0", ] @@ -6556,6 +6565,26 @@ dependencies = [ "archery", ] +[[package]] +name = "rsa" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519" +dependencies = [ + "const-oid", + "digest 0.10.7", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8 0.10.2", + "rand_core", + "signature 2.2.0", + "spki 0.7.3", + "subtle", + "zeroize", +] + [[package]] name = "rtnetlink" version = "0.13.1" @@ -6588,7 +6617,7 @@ dependencies = [ "fastrlp", "num-bigint", "num-traits", - "parity-scale-codec 3.7.0", + "parity-scale-codec 3.6.12", "primitive-types 0.12.2", "proptest", "rand", @@ -6647,9 +6676,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc-hex" @@ -6842,7 +6871,7 @@ source = "git+https://github.com/agemanning/lighthouse?branch=modularize-vc#75a5 [[package]] name = "safe_arith" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" [[package]] name = "salsa20" @@ -6861,7 +6890,7 @@ checksum = "346a3b32eba2640d17a9cb5927056b08f3de90f65b72fe09402c2ad07d684d0b" dependencies = [ "cfg-if", "derive_more 1.0.0", - "parity-scale-codec 3.7.0", + "parity-scale-codec 3.6.12", "scale-info-derive", ] @@ -6874,7 +6903,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7016,7 +7045,7 @@ dependencies = [ [[package]] name = "sensitive_url" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "serde", "url", @@ -7049,7 +7078,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7082,7 +7111,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7441,9 +7470,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -7485,6 +7514,9 @@ dependencies = [ name = "ssv_types" version = "0.1.0" dependencies = [ + "base64 0.22.1", + "derive_more 1.0.0", + "rsa", "types 0.2.1 (git+https://github.com/sigp/lighthouse?branch=unstable)", ] @@ -7634,7 +7666,7 @@ dependencies = [ [[package]] name = "swap_or_not_shuffle" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "ethereum_hashing", @@ -7654,9 +7686,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -7683,7 +7715,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7763,7 +7795,7 @@ dependencies = [ [[package]] name = "task_executor" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "async-channel", "futures", @@ -7801,9 +7833,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ "rustix 0.38.41", "windows-sys 0.59.0", @@ -7821,7 +7853,7 @@ dependencies = [ [[package]] name = "test_random_derive" version = "0.2.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "quote", "syn 1.0.109", @@ -7853,7 +7885,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7864,7 +7896,7 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -7982,7 +8014,7 @@ dependencies = [ "mio", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.7", + "socket2 0.5.8", "tokio-macros", "windows-sys 0.52.0", ] @@ -8005,7 +8037,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8168,7 +8200,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8194,9 +8226,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -8249,7 +8281,7 @@ dependencies = [ "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -8336,7 +8368,7 @@ dependencies = [ [[package]] name = "types" version = "0.2.1" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8520,7 +8552,7 @@ dependencies = [ [[package]] name = "unused_port" version = "0.1.0" -source = "git+https://github.com/sigp/lighthouse?branch=unstable#720f59602100664455ac88556606899d7a4836c3" +source = "git+https://github.com/sigp/lighthouse?branch=unstable#c042dc14d74352512b7632e0ee6ec07f1aa26b3a" dependencies = [ "lru_cache 0.1.0 (git+https://github.com/sigp/lighthouse?branch=unstable)", "parking_lot 0.12.3", @@ -8705,9 +8737,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", "once_cell", @@ -8716,36 +8748,37 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8753,22 +8786,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wasm-streams" @@ -8785,9 +8818,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", @@ -9266,7 +9299,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -9288,7 +9321,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9308,7 +9341,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", "synstructure", ] @@ -9329,7 +9362,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] @@ -9351,7 +9384,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.89", + "syn 2.0.90", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 68a0629..dd01915 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,6 +52,8 @@ tokio = { version = "1.39.2", features = [ ] } tracing = "0.1.40" tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } +rsa = "0.9.7" +base64 = "0.22.1" [profile.maxperf] inherits = "release" diff --git a/anchor/common/ssv_types/Cargo.toml b/anchor/common/ssv_types/Cargo.toml index dfde9c1..c1c35dc 100644 --- a/anchor/common/ssv_types/Cargo.toml +++ b/anchor/common/ssv_types/Cargo.toml @@ -6,3 +6,6 @@ authors = ["Sigma Prime "] [dependencies] types = { workspace = true} +rsa = { workspace = true } +derive_more = { workspace = true } +base64 = { workspace = true } diff --git a/anchor/common/ssv_types/src/committee.rs b/anchor/common/ssv_types/src/committee.rs index 2ac9c1f..89f9594 100644 --- a/anchor/common/ssv_types/src/committee.rs +++ b/anchor/common/ssv_types/src/committee.rs @@ -1,23 +1,65 @@ -use crate::{Operator, OperatorID, OperatorPublicKey}; +use crate::util::parse_rsa; +use crate::{Operator, OperatorId}; +use derive_more::{Deref, From}; +use rsa::RsaPublicKey; +use std::cmp::Eq; +use std::fmt::Debug; +use std::hash::Hash; use types::Domain; /// Unique identifier for a committee. -pub type CommitteeID = u64; +#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Hash, From, Deref)] +pub struct CommitteeId(u64); -/// Member of a SSV Committee. A `CommitteeMember` is just an operator that is part of the committee +/// Member of a SSV Committee. A CommitteeMember is just an operator that is part of the committee /// a validator has chosen to distribute its keyshares to. #[derive(Debug, Clone)] pub struct CommitteeMember { - // Unique identifier for the operator - pub operator_id: OperatorID, - // Unique identifier for the committee this member is a part of - pub committee_id: CommitteeID, - // Base-64 encoded PEM RSA public key of the operator - pub share_public_key: OperatorPublicKey, - // Number of nodes that are faulty/malicious in the committee + /// Unique identifier for the operator + pub operator_id: OperatorId, + /// Unique identifier for the committee this member is a part of + pub committee_id: CommitteeId, + /// Base-64 encoded PEM RSA public key of the operator + pub operator_public_key: RsaPublicKey, + /// Number of nodes that are faulty/malicious in the committee pub faulty: u64, - // All of the operators that are a part of this committee + /// All of the operators that are a part of this committee pub members: Vec, - // Signature domain + /// Signature domain pub domain: Domain, } + +impl CommitteeMember { + /// Creates a new committee member from a PEM-encoded public key string + pub fn new( + pem_data: &str, + operator_id: OperatorId, + committee_id: CommitteeId, + domain: Domain, + ) -> Result { + let rsa_pubkey = parse_rsa(pem_data)?; + Ok(Self::new_with_pubkey( + rsa_pubkey, + operator_id, + committee_id, + domain, + )) + } + + /// Creates a new committee member from an existing RSA public key + pub fn new_with_pubkey( + rsa_pubkey: RsaPublicKey, + operator_id: OperatorId, + committee_id: CommitteeId, + domain: Domain, + ) -> Self { + Self { + operator_id, + committee_id, + operator_public_key: rsa_pubkey, + faulty: 0, + members: Vec::new(), + domain, + } + } +} diff --git a/anchor/common/ssv_types/src/lib.rs b/anchor/common/ssv_types/src/lib.rs index 099c297..397e357 100644 --- a/anchor/common/ssv_types/src/lib.rs +++ b/anchor/common/ssv_types/src/lib.rs @@ -1,6 +1,7 @@ -pub use committee::{CommitteeID, CommitteeMember}; -pub use operator::{Operator, OperatorID, OperatorPublicKey}; +pub use committee::{CommitteeId, CommitteeMember}; +pub use operator::{Operator, OperatorId}; pub use share::SSVShare; mod committee; mod operator; mod share; +mod util; diff --git a/anchor/common/ssv_types/src/operator.rs b/anchor/common/ssv_types/src/operator.rs index b5f4c10..70b9629 100644 --- a/anchor/common/ssv_types/src/operator.rs +++ b/anchor/common/ssv_types/src/operator.rs @@ -1,14 +1,54 @@ -/// Unique identifier for an Operator -pub type OperatorID = u64; +use crate::util::parse_rsa; +use derive_more::{Deref, From}; +use rsa::RsaPublicKey; +use std::cmp::Eq; +use std::fmt::Debug; +use std::hash::Hash; -/// Operator RSA public key -pub type OperatorPublicKey = [u8; 459]; +/// Unique identifier for an Operator. +#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Hash, From, Deref)] +pub struct OperatorId(u64); /// Client responsible for maintaining the overall health of the network. #[derive(Debug, Clone)] pub struct Operator { - // ID to uniquely identify this operator - pub id: OperatorID, - // Base-64 encoded PEM RSA public key - pub public_key: OperatorPublicKey, + /// ID to uniquely identify this operator + pub id: OperatorId, + /// Base-64 encoded PEM RSA public key + pub public_key: RsaPublicKey, +} + +impl Operator { + /// Creates a new operator from its OperatorId and PEM-encoded public key string + pub fn new(pem_data: &str, operator_id: OperatorId) -> Result { + let rsa_pubkey = parse_rsa(pem_data)?; + Ok(Self::new_with_pubkey(rsa_pubkey, operator_id)) + } + + // Creates a new operator from an existing RSA public key and OperatorId + pub fn new_with_pubkey(rsa_pubkey: RsaPublicKey, operator_id: OperatorId) -> Self { + Self { + id: operator_id, + public_key: rsa_pubkey, + } + } +} + +#[cfg(test)] +mod operator_tests { + use super::*; + + #[test] + fn operator_from_pubkey_and_id() { + // Random valid operator public key and id: https://explorer.ssv.network/operators/1141 + let pem_data = "LS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tCk1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBbFFmQVIzMEd4bFpacEwrNDByU0IKTEpSYlkwY2laZDBVMXhtTlp1bFB0NzZKQXJ5d2lia0Y4SFlQV2xkM3dERVdWZXZjRzRGVVBSZ0hDM1MrTHNuMwpVVC9TS280eE9nNFlnZ0xqbVVXQysyU3ZGRFhXYVFvdFRXYW5UU0drSEllNGFnTVNEYlUzOWhSMWdOSTJhY2NNCkVCcjU2eXpWcFMvKytkSk5xU002S1FQM3RnTU5ia2IvbEtlY0piTXM0ZWNRMTNkWUQwY3dFNFQxcEdTYUdhcEkKbFNaZ2lYd0cwSGFNTm5GUkt0OFlkZjNHaTFMRlh3Zlo5NHZFRjJMLzg3RCtidjdkSFVpSGRjRnh0Vm0rVjVvawo3VFptcnpVdXB2NWhKZ3lDVE9zc0xHOW1QSGNORnhEVDJ4NUJKZ2FFOVpJYnMrWVZ5a1k3UTE4VEhRS2lWcDFaCmp3SURBUUFCCi0tLS0tRU5EIFJTQSBQVUJMSUMgS0VZLS0tLS0K"; + let operator_id = 1141; + + let operator = Operator::new(pem_data, operator_id.into()); + assert!(operator.is_ok()); + + if let Ok(op) = operator { + assert_eq!(op.id.0, operator_id); + } + } } diff --git a/anchor/common/ssv_types/src/share.rs b/anchor/common/ssv_types/src/share.rs index 75e5ba7..0c76628 100644 --- a/anchor/common/ssv_types/src/share.rs +++ b/anchor/common/ssv_types/src/share.rs @@ -1,17 +1,19 @@ -use crate::CommitteeID; +use crate::CommitteeId; use std::time::SystemTime; use types::{Address, Domain, Graffiti, PublicKey}; type ValidatorIndex = usize; -/// Share of a key that a operator owns and accompanying metadata +/// Share of a key that a operator owns and its accompanying metadata. #[derive(Debug, Clone)] pub struct SSVShare { + // A single share of a validator private key. pub share: Share, + // Miscellaneous metadata relevant to the share pub metadata: Metadata, } -/// One of N shares of a split validator key +/// One of N shares of a split validator key. #[derive(Debug, Clone)] pub struct Share { /// Index of the validator @@ -30,16 +32,16 @@ pub struct Share { pub graffiti: Graffiti, } -/// A operator who holds a portion of the share +/// A operator who holds a portion of the share. #[derive(Debug, Clone)] pub struct ShareMember { /// Unique identifier for the operator - pub operator: CommitteeID, + pub operator: CommitteeId, /// The public key for this members share pub share_public_key: PublicKey, } -/// General metadata +/// General metadata. #[derive(Debug, Clone)] pub struct Metadata { /// The owner of the validator diff --git a/anchor/common/ssv_types/src/util.rs b/anchor/common/ssv_types/src/util.rs new file mode 100644 index 0000000..4de4381 --- /dev/null +++ b/anchor/common/ssv_types/src/util.rs @@ -0,0 +1,29 @@ +use base64::prelude::*; +use rsa::pkcs8::DecodePublicKey; +use rsa::RsaPublicKey; + +// Parse from a RSA public key string into the associated RSA representation +pub fn parse_rsa(pem_data: &str) -> Result { + // First decode the base64 data + let pem_decoded = BASE64_STANDARD + .decode(pem_data) + .map_err(|e| format!("Unable to decode base64 pem data: {}", e))?; + + // Convert the decoded data to a string + let mut pem_string = String::from_utf8(pem_decoded) + .map_err(|e| format!("Unable to convert decoded pem data into a string: {}", e))?; + + // Fix the header - replace PKCS1 header with PKCS8 header + pem_string = pem_string + .replace( + "-----BEGIN RSA PUBLIC KEY-----", + "-----BEGIN PUBLIC KEY-----", + ) + .replace("-----END RSA PUBLIC KEY-----", "-----END PUBLIC KEY-----"); + + // Parse the PEM string into an RSA public key using PKCS8 format + let rsa_pubkey = RsaPublicKey::from_public_key_pem(&pem_string) + .map_err(|e| format!("Failed to parse RSA public key: {}", e))?; + + Ok(rsa_pubkey) +}