fix: decouple Sui and Narwhal key formats

MystenLabs · Sep 12, 2022 · 61acd5c · 61acd5c
1 parent 07af178
commit 61acd5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
@@ -21,12 +21,12 @@ once_cell = "1.14.0"
 tracing = "0.1.36"
 
 fastcrypto = "0.1.2"
-
 move-binary-format = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-package = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 move-core-types = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e", features = ["address20"] }
 move-vm-runtime = { git = "https://github.com/move-language/move", rev = "e1e647b73dbd3652aabb2020728a4a517c26e28e" }
 narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "config" }
+narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "2b77ef805c9bce0af4d74477dd922d150d31cb16", package = "crypto" }
 
 sui-framework = { path = "../sui-framework" }
 sui-adapter = { path = "../sui-adapter" }

diff --git a/crates/sui-config/src/genesis.rs b/crates/sui-config/src/genesis.rs
@@ -18,6 +18,7 @@ use sui_adapter::in_memory_storage::InMemoryStorage;
 use sui_adapter::temporary_store::{InnerTemporaryStore, TemporaryStore};
 use sui_types::base_types::ObjectID;
 use sui_types::base_types::TransactionDigest;
+use sui_types::crypto::ToFromBytes;
 use sui_types::crypto::{AuthorityPublicKeyBytes, AuthoritySignature};
 use sui_types::gas::SuiGasStatus;
 use sui_types::messages::CallArg;
@@ -70,9 +71,7 @@ impl Genesis {
                 // Strong requirement here for narwhal and sui to be on the same version of fastcrypto
                 // for AuthorityPublicBytes to cast to type alias PublicKey defined in narwhal to
                 // construct narwhal Committee struct.
-                let name = validator
-                    .protocol_key()
-                    .try_into()
+                let name = narwhal_crypto::PublicKey::from_bytes(validator.protocol_key().as_ref())
                     .expect("Can't get narwhal public key");
                 let primary = narwhal_config::PrimaryAddresses {
                     primary_to_primary: validator.narwhal_primary_to_primary.clone(),
@@ -97,9 +96,7 @@ impl Genesis {
             .validator_set
             .iter()
             .map(|validator| {
-                let name = validator
-                    .protocol_key()
-                    .try_into()
+                let name = narwhal_crypto::PublicKey::from_bytes(validator.protocol_key().as_ref())
                     .expect("Can't get narwhal public key");
                 let workers = [(
                     0, // worker_id
@@ -598,9 +595,9 @@ const GENESIS_BUILDER_COMMITTEE_DIR: &str = "committee";
 mod test {
     use super::Builder;
     use crate::{genesis_config::GenesisConfig, utils, ValidatorInfo};
-    use fastcrypto::traits::KeyPair;
     use sui_types::crypto::{
         generate_proof_of_possession, get_key_pair_from_rng, AccountKeyPair, AuthorityKeyPair,
+        KeypairTraits,
     };
 
     #[test]