Merge branch 'main' into keyao/test_kill_nodes

EspressoSystems · Aug 15, 2023 · 356c5c4 · 356c5c4
2 parents 45c35c9 + 6ec8ce7
commit 356c5c4
Show file tree

Hide file tree

Showing 62 changed files with 1,899 additions and 4,678 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -43,4 +43,11 @@ ignore = [
     # https://rustsec.org/advisories/RUSTSEC-2022-0008
     "RUSTSEC-2022-0008",
 
+    # ed25519-dalek 1.0.1
+    # Dependency of libp2p
+    # Referenced in this issue: https://github.com/libp2p/rust-libp2p/issues/4327
+    # https://rustsec.org/advisories/RUSTSEC-2022-0093
+    "RUSTSEC-2022-0093"
+
+
 ]
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -144,9 +144,9 @@ ark-ed-on-bls12-381 = "0.4.0"
 ark-serialize = { version = "0.3.0", features = ["derive"] }
 ark-std = { version = "0.4.0" }
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.3.0", default-features = false, features = [ "logging-utils" ] }
-async-lock = "2.7"
+async-lock = "2.8"
 async-std = { version = "1.12", optional = true }
-async-trait = "0.1.71"
+async-trait = "0.1.73"
 bimap = "0.6.3"
 bincode = "1.3.3"
 blake3 = { version = "1.4.1", optional = true, features = ["traits-preview"] }
@@ -173,7 +173,7 @@ jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", branch =
 libp2p-swarm-derive = { version = "=0.33.0" }
 libp2p-networking = { path = "./libp2p-networking", version = "0.1.0", default-features = false }
 libp2p-identity = "0.2.0"
-libp2p = { version = "0.52.0", default-features = false, features = [
+libp2p = { version = "0.52.2", default-features = false, features = [
         "macros",
         "autonat",
         "deflate",

diff --git a/consensus/Cargo.toml b/consensus/Cargo.toml
@@ -28,9 +28,9 @@ channel-async-std = [
 
 [dependencies]
 async-compatibility-layer = { git = "https://github.com/EspressoSystems/async-compatibility-layer.git", tag = "1.3.0", default-features = false, features = [ "logging-utils" ] }
-async-lock = "2.7"
+async-lock = "2.8"
 async-std = { version = "1.12", optional = true }
-async-trait = "0.1.71"
+async-trait = "0.1.73"
 # TODO ed: Delete this dependency after https://github.com/EspressoSystems/HotShot/issues/614 is finished
 bincode = "1.3.3"
 commit = { git = "https://github.com/EspressoSystems/commit", tag = "0.2.2" }

diff --git a/consensus/src/da_member.rs b/consensus/src/da_member.rs
@@ -13,15 +13,13 @@ use hotshot_types::{
     certificate::QuorumCertificate,
     data::SequencingLeaf,
     message::{
-        ConsensusMessageType, Message, ProcessedCommitteeConsensusMessage,
-        ProcessedGeneralConsensusMessage, ProcessedSequencingMessage, SequencingMessage,
+        ConsensusMessageType, ProcessedCommitteeConsensusMessage, ProcessedGeneralConsensusMessage,
+        ProcessedSequencingMessage, SequencingMessage,
     },
     traits::{
-        consensus_type::sequencing_consensus::SequencingConsensus,
         election::{CommitteeExchangeType, ConsensusExchange},
         node_implementation::{
             CommitteeEx, CommitteeProposalType, CommitteeVote, NodeImplementation, NodeType,
-            SequencingExchangesType,
         },
         signature_key::SignatureKey,
     },
@@ -34,15 +32,13 @@ use tracing::{error, info, instrument, warn};
 #[derive(Debug, Clone)]
 pub struct DAMember<
     A: SequencingConsensusApi<TYPES, SequencingLeaf<TYPES>, I>,
-    TYPES: NodeType<ConsensusType = SequencingConsensus>,
+    TYPES: NodeType,
     I: NodeImplementation<
         TYPES,
         Leaf = SequencingLeaf<TYPES>,
         ConsensusMessage = SequencingMessage<TYPES, I>,
     >,
-> where
-    I::Exchanges: SequencingExchangesType<TYPES, Message<TYPES, I>>,
-{
+> {
     /// ID of node.
     pub id: u64,
     /// Reference to consensus. DA committee member will require a write lock on this.
@@ -67,15 +63,13 @@ pub struct DAMember<
 
 impl<
         A: SequencingConsensusApi<TYPES, SequencingLeaf<TYPES>, I>,
-        TYPES: NodeType<ConsensusType = SequencingConsensus>,
+        TYPES: NodeType,
         I: NodeImplementation<
             TYPES,
             Leaf = SequencingLeaf<TYPES>,
             ConsensusMessage = SequencingMessage<TYPES, I>,
         >,
     > DAMember<A, TYPES, I>
-where
-    I::Exchanges: SequencingExchangesType<TYPES, Message<TYPES, I>>,
 {
     /// DA committee member task that spins until a valid DA proposal can be signed or timeout is
     /// hit.