New ABFT version

Author: timorleph

Cargo.lock

@@ -45,10 +45,10 @@ homepage = "https://alephzero.org"
 repository = "https://github.com/Cardinal-Cryptography/aleph-node"
 
 [workspace.dependencies]
-aleph-bft-crypto = { version = "0.9" }
-aleph-bft-mock = { version = "0.15" }
-aleph-bft-rmc = { version = "0.14" }
-aleph-bft-types = { version = "0.14" }
+aleph-bft-crypto = { version = "0.10" }
+aleph-bft-mock = { version = "0.17" }
+aleph-bft-rmc = { version = "0.15" }
+aleph-bft-types = { version = "0.15" }
 async-trait = { version = "0.1" }
 array-bytes = { version = "6" }
 bytes = { version = "1.8" }

Cargo.toml

@@ -11,14 +11,14 @@ repository.workspace = true
 # fixed version to 'freeze' some types used in abft, mainly `SignatureSet` used in justification and signature aggregation
 aleph-bft-crypto = { workspace = true }
 
-current-aleph-bft = { package = "aleph-bft", version = "0.42" }
-current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.14" }
-legacy-aleph-bft = { package = "aleph-bft", version = "0.36" }
-legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.13" }
+current-aleph-bft = { package = "aleph-bft", version = "0.44" }
+current-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.15" }
+legacy-aleph-bft = { package = "aleph-bft", version = "0.42" }
+legacy-aleph-bft-rmc = { package = "aleph-bft-rmc", version = "0.14" }
 
 network-clique = { workspace = true }
 primitives = { workspace = true }
-legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "r-14.0.0" }
+legacy-aleph-aggregator = { package = "aggregator", git = "https://github.com/Cardinal-Cryptography/aleph-node.git", tag = "r-15.2.0" }
 current-aleph-aggregator = { path = "../aggregator", package = "aggregator" }
 rate-limiter = { package = "rate-limiter", path = "../rate-limiter" }
 fake-runtime-api = { workspace = true, features = ["std"] }

finality-aleph/Cargo.toml

@@ -48,14 +48,18 @@ impl Keychain {
     }
 }
 
-// Currently the traits for legacy and current match, so only one implementation needed.
 impl legacy_aleph_bft::Index for Keychain {
     fn index(&self) -> legacy_aleph_bft::NodeIndex {
         Keychain::index(self).into()
     }
 }
 
-// Currently the traits for legacy and current match, so only one implementation needed.
+impl current_aleph_bft::Index for Keychain {
+    fn index(&self) -> current_aleph_bft::NodeIndex {
+        Keychain::index(self).into()
+    }
+}
+
 impl legacy_aleph_bft::Keychain for Keychain {
     type Signature = Signature;
 
@@ -72,7 +76,22 @@ impl legacy_aleph_bft::Keychain for Keychain {
     }
 }
 
-// Currently the traits for legacy and current match, so only one implementation needed.
+impl current_aleph_bft::Keychain for Keychain {
+    type Signature = Signature;
+
+    fn node_count(&self) -> current_aleph_bft::NodeCount {
+        Keychain::node_count(self).into()
+    }
+
+    fn sign(&self, msg: &[u8]) -> Signature {
+        Keychain::sign(self, msg)
+    }
+
+    fn verify(&self, msg: &[u8], sgn: &Signature, index: current_aleph_bft::NodeIndex) -> bool {
+        Keychain::verify(self, msg, sgn, index)
+    }
+}
+
 impl legacy_aleph_bft::MultiKeychain for Keychain {
     // Using `SignatureSet` is slow, but Substrate has not yet implemented aggregation.
     // We probably should do this for them at some point.
@@ -96,3 +115,27 @@ impl legacy_aleph_bft::MultiKeychain for Keychain {
         Keychain::is_complete(self, msg, partial)
     }
 }
+
+impl current_aleph_bft::MultiKeychain for Keychain {
+    // Using `SignatureSet` is slow, but Substrate has not yet implemented aggregation.
+    // We probably should do this for them at some point.
+    type PartialMultisignature = SignatureSet<Signature>;
+
+    fn bootstrap_multi(
+        &self,
+        signature: &Signature,
+        index: current_aleph_bft::NodeIndex,
+    ) -> Self::PartialMultisignature {
+        current_aleph_bft::PartialMultisignature::add_signature(
+            SignatureSet(aleph_bft_crypto::SignatureSet::with_size(
+                aleph_bft_crypto::Keychain::node_count(self),
+            )),
+            signature,
+            index,
+        )
+    }
+
+    fn is_complete(&self, msg: &[u8], partial: &Self::PartialMultisignature) -> bool {
+        Keychain::is_complete(self, msg, partial)
+    }
+}