Update fastcrypto in sui (including changing the serde of EdDSA & BLS…

… sigantures) (MystenLabs#8311) Includes a few non breaking changes & the new binary serializations of EdDSA and BLS signatures. BLS/EdDSA **signatures** that were stored using the old serialization might not be deserialized successfully after this change. See MystenLabs/fastcrypto#401 for why we use `insecure_default()`.
quyetlq · Feb 15, 2023 · ed8d95a · ed8d95a
1 parent ba7a7b5
commit ed8d95a
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -126,9 +126,9 @@ move-prover-boogie-backend = { git = "https://github.com/move-language/move", re
 move-stackless-bytecode = { git = "https://github.com/move-language/move", rev = "b6bff7ebf8b6ab5ede3558ad8e1b192737268b03" }
 move-symbol-pool = { git = "https://github.com/move-language/move", rev = "b6bff7ebf8b6ab5ede3558ad8e1b192737268b03" }
 
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d" }
-fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", package = "fastcrypto-zkp" }
-fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", package = "fastcrypto-tbls" }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96" }
+fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", package = "fastcrypto-zkp" }
+fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", package = "fastcrypto-tbls" }
 
 # anemo dependencies
 anemo = { git = "https://github.com/mystenlabs/anemo.git", rev = "d4017b6cefad7ebc5e84b5c6b8eeff4668f719ff" }

diff --git a/crates/sui-core/tests/staged/sui.yaml b/crates/sui-core/tests/staged/sui.yaml
@@ -29,12 +29,6 @@ Argument:
           - U16
 AuthorityPublicKeyBytes:
   NEWTYPESTRUCT: BYTES
-BLS12381Signature:
-  STRUCT:
-    - sig:
-        TUPLEARRAY:
-          CONTENT: U8
-          SIZE: 48
 CallArg:
   ENUM:
     0:

diff --git a/crates/sui-types/src/unit_tests/base_types_tests.rs b/crates/sui-types/src/unit_tests/base_types_tests.rs
@@ -315,10 +315,7 @@ fn test_authority_signature_serde_human_readable() {
     let (_, key): (_, AuthorityKeyPair) = get_key_pair();
     let sig = AuthoritySignature::new(&Foo("some data".to_string()), 0, &key);
     let serialized = serde_json::to_string(&sig).unwrap();
-    assert_eq!(
-        format!(r#"{{"sig":"{}"}}"#, sig.encode_base64()),
-        serialized
-    );
+    assert_eq!(format!("\"{}\"", sig.encode_base64()), serialized);
     let deserialized: AuthoritySignature = serde_json::from_str(&serialized).unwrap();
     assert_eq!(deserialized.as_ref(), sig.as_ref());
 }

diff --git a/crates/workspace-hack/Cargo.toml b/crates/workspace-hack/Cargo.toml
@@ -201,9 +201,9 @@ expect-test = { version = "1", default-features = false }
 eyre = { version = "0.6" }
 fail-9fbad63c4bcf4a8f = { package = "fail", version = "0.4", default-features = false }
 fail-d8f496e17d97b5cb = { package = "fail", version = "0.5", default-features = false }
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", features = ["copy_key"] }
-fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", default-features = false }
-fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", default-features = false }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", features = ["copy_key"] }
+fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", default-features = false }
+fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", default-features = false }
 fastrand = { version = "1", default-features = false }
 fd-lock = { version = "3", default-features = false }
 fdlimit = { version = "0.2", default-features = false }
@@ -876,10 +876,10 @@ expect-test = { version = "1", default-features = false }
 eyre = { version = "0.6" }
 fail-9fbad63c4bcf4a8f = { package = "fail", version = "0.4", default-features = false }
 fail-d8f496e17d97b5cb = { package = "fail", version = "0.5", default-features = false }
-fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", features = ["copy_key"] }
-fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", default-features = false }
-fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", default-features = false }
-fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "9a41ba511899c0d7efd9e047af2e968cdc54f77d", default-features = false }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", features = ["copy_key"] }
+fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", default-features = false }
+fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", default-features = false }
+fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "54c0db503f35560ed25b2d084fface8acdd8ee96", default-features = false }
 fastrand = { version = "1", default-features = false }
 fd-lock = { version = "3", default-features = false }
 fdlimit = { version = "0.2", default-features = false }

diff --git a/narwhal/node/tests/staged/narwhal.yaml b/narwhal/node/tests/staged/narwhal.yaml
@@ -1,16 +1,4 @@
 ---
-BLS12381AggregateSignature:
-  STRUCT:
-    - sig:
-        TUPLEARRAY:
-          CONTENT: U8
-          SIZE: 48
-BLS12381Signature:
-  STRUCT:
-    - sig:
-        TUPLEARRAY:
-          CONTENT: U8
-          SIZE: 48
 Batch:
   STRUCT:
     - transactions:
@@ -28,7 +16,9 @@ Certificate:
     - header:
         TYPENAME: Header
     - aggregated_signature:
-        TYPENAME: BLS12381AggregateSignature
+        TUPLEARRAY:
+          CONTENT: U8
+          SIZE: 48
     - signed_authorities: BYTES
     - metadata:
         TYPENAME: Metadata
@@ -57,7 +47,9 @@ Header:
         SEQ:
           TYPENAME: CertificateDigest
     - signature:
-        TYPENAME: BLS12381Signature
+        TUPLEARRAY:
+          CONTENT: U8
+          SIZE: 48
 HeaderDigest:
   NEWTYPESTRUCT:
     TUPLEARRAY:

diff --git a/narwhal/primary/tests/integration_tests_proposer_api.rs b/narwhal/primary/tests/integration_tests_proposer_api.rs
@@ -8,7 +8,7 @@ use consensus::{dag::Dag, metrics::ConsensusMetrics};
 use crypto::PublicKey;
 use fastcrypto::{
     hash::Hash,
-    traits::{KeyPair as _, ToFromBytes},
+    traits::{InsecureDefault, KeyPair as _, ToFromBytes},
 };
 use narwhal_primary as primary;
 use narwhal_primary::NUM_SHUTDOWN_RECEIVERS;
@@ -57,7 +57,7 @@ async fn test_rounds_errors() {
                     .to_string(),
         },
         TestCase {
-            public_key: Bytes::from(PublicKey::default().as_bytes().to_vec()),
+            public_key: Bytes::from(PublicKey::insecure_default().as_bytes().to_vec()),
             test_case_name: "Valid public key, but authority not found in committee".to_string(),
             expected_error: "Invalid public key: unknown authority".to_string(),
         },

diff --git a/narwhal/storage/src/certificate_store.rs b/narwhal/storage/src/certificate_store.rs
@@ -1,6 +1,6 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
-use crypto::PublicKey;
+use crypto::{traits::InsecureDefault, PublicKey};
 use dashmap::DashMap;
 use fastcrypto::hash::Hash;
 use std::{
@@ -9,6 +9,7 @@ use std::{
     iter,
     sync::Arc,
 };
+
 use store::{
     rocks::{DBMap, TypedStoreError::RocksDBError},
     Map,
@@ -287,7 +288,7 @@ impl CertificateStore {
         // TODO: Add a more efficient seek method to typed store.
         let mut iter = self.certificate_id_by_round.iter();
         if round > 0 {
-            iter = iter.skip_to(&(round - 1, PublicKey::default()))?;
+            iter = iter.skip_to(&(round - 1, PublicKey::insecure_default()))?;
         }
 
         let mut digests = Vec::new();
@@ -326,7 +327,7 @@ impl CertificateStore {
         // TODO: Add a more efficient seek method to typed store.
         let mut iter = self.certificate_id_by_round.iter();
         if round > 0 {
-            iter = iter.skip_to(&(round - 1, PublicKey::default()))?;
+            iter = iter.skip_to(&(round - 1, PublicKey::insecure_default()))?;
         }
 
         let mut result = BTreeMap::<Round, Vec<PublicKey>>::new();
@@ -440,7 +441,7 @@ impl CertificateStore {
 #[cfg(test)]
 mod test {
     use crate::certificate_store::CertificateStore;
-    use crypto::PublicKey;
+    use crypto::{traits::InsecureDefault, PublicKey};
     use fastcrypto::hash::Hash;
     use futures::future::join_all;
     use std::{
@@ -605,7 +606,9 @@ mod test {
         // WHEN
         let result = store.last_two_rounds_certs().unwrap();
         let last_round_number = store.last_round_number(&origin).unwrap().unwrap();
-        let last_round_number_not_exist = store.last_round_number(&PublicKey::default()).unwrap();
+        let last_round_number_not_exist = store
+            .last_round_number(&PublicKey::insecure_default())
+            .unwrap();
 
         // THEN
         assert_eq!(result.len(), 8);
@@ -626,7 +629,9 @@ mod test {
 
         // WHEN
         let result = store.last_two_rounds_certs().unwrap();
-        let last_round_number = store.last_round_number(&PublicKey::default()).unwrap();
+        let last_round_number = store
+            .last_round_number(&PublicKey::insecure_default())
+            .unwrap();
 
         // THEN
         assert!(result.is_empty());

diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs
@@ -14,7 +14,7 @@ use derive_builder::Builder;
 use fastcrypto::{
     hash::{Digest, Hash, HashFunction},
     signature_service::SignatureService,
-    traits::{AggregateAuthenticator, EncodeDecodeBase64, Signer, VerifyingKey},
+    traits::{AggregateAuthenticator, EncodeDecodeBase64, InsecureDefault, Signer, VerifyingKey},
 };
 use indexmap::IndexMap;
 use mysten_util_mem::MallocSizeOf;
@@ -151,7 +151,7 @@ impl Hash<{ crypto::DIGEST_LENGTH }> for Batch {
     }
 }
 
-#[derive(Builder, Clone, Default, Deserialize, MallocSizeOf, Serialize)]
+#[derive(Builder, Clone, Deserialize, MallocSizeOf, Serialize)]
 #[builder(pattern = "owned", build_fn(skip))]
 pub struct Header {
     pub author: PublicKey,
@@ -278,6 +278,21 @@ impl Header {
     }
 }
 
+impl Default for Header {
+    fn default() -> Self {
+        Self {
+            author: PublicKey::insecure_default(),
+            round: Round::default(),
+            epoch: Epoch::default(),
+            created_at: TimestampMs::default(),
+            payload: IndexMap::default(),
+            parents: BTreeSet::default(),
+            digest: OnceCell::default(),
+            signature: Signature::default(),
+        }
+    }
+}
+
 #[derive(
     Clone,
     Copy,