crypto: switch from narwhal crypto crate to fastcrypto lib (MystenLab…

…s#4120)

crates/sui-adapter/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 [dependencies]
 anyhow = { version = "1.0.58", features = ["backtrace"] }
 bcs = "0.1.3"
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }

crates/sui-benchmark/Cargo.toml

@@ -41,7 +41,7 @@ sui-node = { path = "../sui-node" }
 sui-json-rpc-types = { path = "../sui-json-rpc-types" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "node" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "node" }
 workspace-hack = { path = "../workspace-hack"}
 test-utils = { path = "../test-utils" }
 

crates/sui-config/Cargo.toml

@@ -17,12 +17,12 @@ serde_yaml = "0.8.26"
 rand = "0.8.5"
 dirs = "4.0.0"
 multiaddr = "0.14.0"
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 tracing = "0.1.36"
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "config" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "crypto" }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "ded6f91c9c19594a3eaeaa9a487d42a39965569e" }
 
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "config" }
 move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-package = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }

crates/sui-config/src/genesis.rs

@@ -537,7 +537,7 @@ const GENESIS_BUILDER_COMMITTEE_DIR: &str = "committee";
 mod test {
     use super::Builder;
     use crate::{genesis_config::GenesisConfig, utils, ValidatorInfo};
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
     use sui_types::crypto::{get_key_pair_from_rng, AuthorityKeyPair};
 
     #[test]

crates/sui-config/tests/snapshot_tests.rs

@@ -19,9 +19,9 @@
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::path::PathBuf;
 
+use fastcrypto::traits::KeyPair;
 use insta::assert_yaml_snapshot;
 use multiaddr::Multiaddr;
-use narwhal_crypto::traits::KeyPair;
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 use sui_config::{genesis::Builder, genesis_config::GenesisConfig};

crates/sui-core/Cargo.toml

@@ -29,7 +29,7 @@ prometheus = "0.13.1"
 arc-swap = "1.5.1"
 tokio-retry = "0.3"
 scopeguard = "1.1"
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 tap = "1.0"
 
 sui-adapter = { path = "../sui-adapter" }
@@ -50,12 +50,13 @@ typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090
 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
 mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab" }
 
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "config" }
-narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "consensus" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "crypto", features=["copy_key"]}
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "executor" }
-narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "types" }
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "node" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "config" }
+narwhal-consensus = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "consensus" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "executor" }
+narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "types" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "node" }
+
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "ded6f91c9c19594a3eaeaa9a487d42a39965569e" }
 workspace-hack = { path = "../workspace-hack"}
 thiserror = "1.0.32"
 eyre = "0.6.8"

crates/sui-core/src/authority.rs

@@ -14,10 +14,10 @@ use crate::{
 use arc_swap::ArcSwap;
 use async_trait::async_trait;
 use chrono::prelude::*;
+use fastcrypto::traits::KeyPair;
 use move_bytecode_utils::module_cache::SyncModuleCache;
 use move_core_types::{language_storage::ModuleId, resolver::ModuleResolver};
 use move_vm_runtime::{move_vm::MoveVM, native_functions::NativeFunctionTable};
-use narwhal_crypto::traits::KeyPair;
 use narwhal_executor::ExecutionStateError;
 use narwhal_executor::{ExecutionIndices, ExecutionState};
 use parking_lot::Mutex;

crates/sui-core/src/authority_active/gossip/configurable_batch_action_client.rs

@@ -199,7 +199,7 @@ pub async fn init_configurable_authorities(
     Vec<Arc<AuthorityState>>,
     Vec<ExecutionDigests>,
 ) {
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
     use sui_types::crypto::AccountKeyPair;
 
     use crate::safe_client::SafeClientMetrics;

crates/sui-core/src/authority_client.rs

@@ -5,10 +5,10 @@
 use crate::authority::AuthorityState;
 use anyhow::anyhow;
 use async_trait::async_trait;
+use fastcrypto::traits::ToFromBytes;
 use futures::{stream::BoxStream, TryStreamExt};
 use multiaddr::Multiaddr;
 use mysten_network::config::Config;
-use narwhal_crypto::traits::ToFromBytes;
 use prometheus::{register_histogram_with_registry, Histogram};
 use std::collections::BTreeMap;
 use std::sync::Arc;

crates/sui-core/src/authority_server.rs

@@ -12,9 +12,9 @@ use crate::{
 use anyhow::anyhow;
 use anyhow::Result;
 use async_trait::async_trait;
+use fastcrypto::traits::KeyPair;
 use futures::{stream::BoxStream, TryStreamExt};
 use multiaddr::Multiaddr;
-use narwhal_crypto::traits::KeyPair;
 use prometheus::Registry;
 use std::{io, sync::Arc, time::Duration};
 use sui_config::NodeConfig;

crates/sui-core/src/checkpoints/causal_order_effects.rs

@@ -233,7 +233,7 @@ mod tests {
 
     use crate::checkpoints::causal_order_effects::EffectsStore;
     use crate::checkpoints::CheckpointStore;
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
     use rand::{prelude::StdRng, SeedableRng};
     use sui_types::{
         base_types::{ExecutionDigests, ObjectDigest, ObjectID, SequenceNumber, TransactionDigest},

crates/sui-core/src/epoch/reconfiguration.rs

@@ -5,8 +5,8 @@ use crate::authority_active::ActiveAuthority;
 use crate::authority_aggregator::{AuthorityAggregator, ReduceOutput};
 use crate::authority_client::{AuthorityAPI, NetworkAuthorityClientMetrics};
 use async_trait::async_trait;
+use fastcrypto::traits::ToFromBytes;
 use multiaddr::Multiaddr;
-use narwhal_crypto::traits::ToFromBytes;
 use std::collections::BTreeMap;
 use std::sync::Arc;
 use std::time::Duration;

crates/sui-core/src/node_sync/node_follower.rs

@@ -758,7 +758,7 @@ where
 mod tests {
     // Note: this code is tested end-to-end in full_node_tests.rs
 
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
     use sui_types::{
         base_types::{AuthorityName, TransactionEffectsDigest},
         crypto::{get_key_pair, AuthorityKeyPair},

crates/sui-core/src/unit_tests/batch_tests.rs

@@ -1,7 +1,7 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use narwhal_crypto::traits::KeyPair;
+use fastcrypto::traits::KeyPair;
 use rand::{prelude::StdRng, SeedableRng};
 use sui_types::committee::Committee;
 use sui_types::crypto::get_key_pair;

crates/sui-cost/Cargo.toml

@@ -7,7 +7,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }

crates/sui-framework-build/Cargo.toml

@@ -9,7 +9,7 @@ publish = false
 
 [dependencies]
 
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 
 sui-types = { path = "../sui-types" }
 sui-verifier = { path = "../../crates/sui-verifier" }

crates/sui-framework/Cargo.toml

@@ -13,7 +13,7 @@ bcs = "0.1.3"
 linked-hash-map = "0.5.6"
 smallvec = "1.9.0"
 num_enum = "0.5.7"
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 sha3 = "0.10.1"
 
 sui-types = { path = "../sui-types" }
@@ -31,7 +31,7 @@ move-stdlib = { git = "https://github.com/move-language/move", rev = "7907152852
 move-unit-test = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "crypto" }
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "ded6f91c9c19594a3eaeaa9a487d42a39965569e" }
 workspace-hack = { path = "../workspace-hack"}
 
 [build-dependencies]

crates/sui-framework/src/natives/crypto.rs

@@ -1,5 +1,11 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
+use fastcrypto::{
+    bls12381::{BLS12381PublicKey, BLS12381Signature},
+    secp256k1::Secp256k1Signature,
+    traits::ToFromBytes,
+    Verifier,
+};
 use move_binary_format::errors::PartialVMResult;
 use move_vm_runtime::native_functions::NativeContext;
 use move_vm_types::{
@@ -9,7 +15,6 @@ use move_vm_types::{
     pop_arg,
     values::Value,
 };
-use narwhal_crypto::{traits::ToFromBytes, Verifier};
 use smallvec::smallvec;
 use std::collections::VecDeque;
 
@@ -29,7 +34,7 @@ pub fn ecrecover(
     let signature = pop_arg!(args, Vec<u8>);
     // TODO: implement native gas cost estimation https://github.com/MystenLabs/sui/issues/3593
     let cost = native_gas(context.cost_table(), NativeCostIndex::EMPTY, 0);
-    match <narwhal_crypto::secp256k1::Secp256k1Signature as ToFromBytes>::from_bytes(&signature) {
+    match <Secp256k1Signature as ToFromBytes>::from_bytes(&signature) {
         Ok(signature) => match signature.recover(&hashed_msg) {
             Ok(pubkey) => Ok(NativeResult::ok(
                 cost,
@@ -80,16 +85,12 @@ pub fn bls12381_verify_g1_sig(
     // TODO: implement native gas cost estimation https://github.com/MystenLabs/sui/issues/3868
     let cost = native_gas(context.cost_table(), NativeCostIndex::EMIT_EVENT, 0);
 
-    let signature = match <narwhal_crypto::bls12381::BLS12381Signature as ToFromBytes>::from_bytes(
-        &signature_bytes,
-    ) {
+    let signature = match <BLS12381Signature as ToFromBytes>::from_bytes(&signature_bytes) {
         Ok(signature) => signature,
         Err(_) => return Ok(NativeResult::ok(cost, smallvec![Value::bool(false)])),
     };
 
-    let public_key = match <narwhal_crypto::bls12381::BLS12381PublicKey as ToFromBytes>::from_bytes(
-        &public_key_bytes,
-    ) {
+    let public_key = match <BLS12381PublicKey as ToFromBytes>::from_bytes(&public_key_bytes) {
         Ok(public_key) => public_key,
         Err(_) => return Ok(NativeResult::ok(cost, smallvec![Value::bool(false)])),
     };

crates/sui-tool/Cargo.toml

@@ -19,7 +19,7 @@ rocksdb = "0.19.0"
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "executor" }
 serde_with = { version = "1.14.0", features = ["hex"] }
 sui-storage = { path = "../sui-storage" }
 strum_macros = "^0.24"

crates/sui-transactional-test-runner/Cargo.toml

@@ -11,7 +11,7 @@ publish = false
 anyhow = "1.0.58"
 bimap = "0.6.2"
 clap = { version = "3.1.8", features = ["derive"] }
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 rand = "0.8.5"
 
 move-binary-format = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }

crates/sui-types/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2021"
 anyhow = { version = "1.0.58", features = ["backtrace"] }
 bcs = "0.1.3"
 itertools = "0.10.3"
-once_cell = "1.11.0"
+once_cell = "1.13.1"
 rand = "0.8.5"
 serde = { version = "1.0.141", features = ["derive"] }
 curve25519-dalek = { version = "3", default-features = false, features = ["serde"] }
@@ -48,8 +48,9 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "7907
 move-ir-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-vm-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "executor" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "crypto" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "executor" }
+
+fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "ded6f91c9c19594a3eaeaa9a487d42a39965569e", features = ["copy_key"] }
 
 workspace-hack = { path = "../workspace-hack"}
 

crates/sui-types/src/committee.rs

@@ -284,7 +284,7 @@ impl Display for Committee {
 mod test {
     use super::*;
     use crate::crypto::{get_key_pair, AuthorityKeyPair};
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
 
     #[test]
     fn test_shuffle_by_weight() {

crates/sui-types/src/crypto.rs

@@ -7,19 +7,19 @@ use std::str::FromStr;
 use anyhow::Error;
 use base64ct::Encoding;
 use digest::Digest;
-use narwhal_crypto::ed25519::{
+use fastcrypto::ed25519::{
     Ed25519AggregateSignature, Ed25519KeyPair, Ed25519PrivateKey, Ed25519PublicKey,
     Ed25519Signature,
 };
-use narwhal_crypto::secp256k1::{
+use fastcrypto::secp256k1::{
     Secp256k1KeyPair, Secp256k1PrivateKey, Secp256k1PublicKey, Secp256k1Signature,
 };
-pub use narwhal_crypto::traits::KeyPair as KeypairTraits;
-pub use narwhal_crypto::traits::{
+pub use fastcrypto::traits::KeyPair as KeypairTraits;
+pub use fastcrypto::traits::{
     AggregateAuthenticator, Authenticator, EncodeDecodeBase64, SigningKey, ToFromBytes,
     VerifyingKey,
 };
-use narwhal_crypto::Verifier;
+use fastcrypto::Verifier;
 use rand::rngs::OsRng;
 use roaring::RoaringBitmap;
 use schemars::JsonSchema;

crates/sui-types/src/messages_checkpoint.rs

@@ -611,7 +611,7 @@ impl CheckpointFragment {
 
 #[cfg(test)]
 mod tests {
-    use narwhal_crypto::traits::KeyPair;
+    use fastcrypto::traits::KeyPair;
     use rand::prelude::StdRng;
     use rand::SeedableRng;
     use std::collections::BTreeSet;

crates/sui-types/src/signature_seed.rs

@@ -3,7 +3,7 @@
 
 //! A secret seed value, useful for deterministic private key and SuiAddress generation.
 
-use narwhal_crypto::{hkdf::hkdf_generate_from_ikm, traits::KeyPair as KeypairTraits};
+use fastcrypto::{hkdf::hkdf_generate_from_ikm, traits::KeyPair as KeypairTraits};
 use rand::{CryptoRng, RngCore};
 use sha3::Sha3_256;
 use zeroize::{Zeroize, ZeroizeOnDrop};

crates/sui-types/src/unit_tests/messages_tests.rs

@@ -5,8 +5,8 @@
 use std::collections::hash_map::DefaultHasher;
 use std::collections::BTreeMap;
 
-use narwhal_crypto::traits::AggregateAuthenticator;
-use narwhal_crypto::traits::KeyPair;
+use fastcrypto::traits::AggregateAuthenticator;
+use fastcrypto::traits::KeyPair;
 use roaring::RoaringBitmap;
 
 use crate::crypto::bcs_signable_test::{get_obligation_input, Foo};

crates/sui-types/src/unit_tests/signature_seed_tests.rs

@@ -1,7 +1,7 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use narwhal_crypto::secp256k1::Secp256k1KeyPair;
+use fastcrypto::secp256k1::Secp256k1KeyPair;
 
 use crate::crypto::AccountKeyPair;
 use crate::crypto::SuiSignature;

crates/sui-types/src/unit_tests/utils.rs

@@ -1,7 +1,7 @@
 // Copyright (c) 2022, Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use narwhal_crypto::traits::KeyPair as KeypairTraits;
+use fastcrypto::traits::KeyPair as KeypairTraits;
 
 use crate::{
     committee::Committee,

crates/sui/Cargo.toml

@@ -39,7 +39,7 @@ rocksdb = "0.19.0"
 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"}
 typed-store-macros = { git = "https://github.com/MystenLabs/mysten-infra", rev = "8d090689be14078f2ca41c356e7bbc0af21f73ab"} 
 tempfile = "3.3.0"
-narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "e54611ee0387735b1963eecfc4fdc120ee8ac509", package = "executor" }
+narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "ad05db4c5d6f851402efc7d2b285e9b59d513e64", package = "executor" }
 
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }
 move-prover = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }

crates/test-utils/Cargo.toml

@@ -28,7 +28,7 @@ sui-node = { path = "../sui-node" }
 sui-swarm = { path = "../sui-swarm" }
 sui-types = { path = "../sui-types" }
 sui-sdk = { path = "../sui-sdk" }
-once_cell = "1.13.0"
+once_cell = "1.13.1"
 
 move-package = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "79071528524f08b12e9abb84c1094d8e976aa17a", features = ["address20"] }