Add progress on integration

Author: paulhauner

Cargo.lock

@@ -136,7 +136,7 @@ fn upgrade_keypair<P: AsRef<Path>>(
         .to_json_writer(&mut file)
         .map_err(|e| format!("Cannot write keystore to {:?}: {:?}", keystore_path, e))?;
 
-    let password_path = secrets_dir.join(format!("{}", keypair.pk.as_hex_string()));
+    let password_path = secrets_dir.join(format!("{}", keypair.pk.to_hex_string()));
 
     if password_path.exists() {
         return Err(format!("{:?} already exists", password_path));

account_manager/src/upgrade_legacy_keypairs.rs

@@ -11,10 +11,10 @@ lazy_static = "1.4.0"
 num-bigint = "0.2.6"
 eth2_hashing = "0.1.0"
 hex = "0.4.2"
-milagro_bls = { git = "https://github.com/sigp/milagro_bls", tag = "v1.1.0" }
 serde_yaml = "0.8.11"
 serde = "1.0.110"
 serde_derive = "1.0.110"
+bls = { path = "../../crypto/bls" }
 
 [dev-dependencies]
 base64 = "0.12.1"

common/eth2_interop_keypairs/Cargo.toml

@@ -19,8 +19,8 @@
 #[macro_use]
 extern crate lazy_static;
 
+use bls::{Keypair, PublicKey, SecretKey};
 use eth2_hashing::hash;
-use milagro_bls::{Keypair, PublicKey, SecretKey};
 use num_bigint::BigUint;
 use serde_derive::{Deserialize, Serialize};
 use std::convert::TryInto;
@@ -58,17 +58,14 @@ pub fn be_private_key(validator_index: usize) -> [u8; PRIVATE_KEY_BYTES] {
 
 /// Return a public and private keypair for a given `validator_index`.
 pub fn keypair(validator_index: usize) -> Keypair {
-    let sk = SecretKey::from_bytes(&be_private_key(validator_index)).unwrap_or_else(|_| {
+    let sk = SecretKey::deserialize(&be_private_key(validator_index)).unwrap_or_else(|_| {
         panic!(
             "Should build valid private key for validator index {}",
             validator_index
         )
     });
 
-    Keypair {
-        pk: PublicKey::from_secret_key(&sk),
-        sk,
-    }
+    Keypair::from_components(sk.public_key(), sk)
 }
 
 #[derive(Serialize, Deserialize)]
@@ -93,18 +90,18 @@ impl TryInto<Keypair> for YamlKeypair {
         let sk = {
             let mut bytes = vec![0; PRIVATE_KEY_BYTES - privkey.len()];
             bytes.extend_from_slice(&privkey);
-            SecretKey::from_bytes(&bytes)
+            SecretKey::deserialize(&bytes)
                 .map_err(|e| format!("Failed to decode bytes into secret key: {:?}", e))?
         };
 
         let pk = {
             let mut bytes = vec![0; PUBLIC_KEY_BYTES - pubkey.len()];
             bytes.extend_from_slice(&pubkey);
-            PublicKey::from_bytes(&bytes)
+            PublicKey::deserialize(&bytes)
                 .map_err(|e| format!("Failed to decode bytes into public key: {:?}", e))?
         };
 
-        Ok(Keypair { pk, sk })
+        Ok(Keypair::from_components(pk, sk))
     }
 }
 

common/eth2_interop_keypairs/src/lib.rs

@@ -170,7 +170,7 @@ impl<'a> Builder<'a> {
                     pubkey: voting_keypair.pk.clone().into(),
                     withdrawal_credentials,
                     amount,
-                    signature: Signature::empty_signature().into(),
+                    signature: Signature::empty().into(),
                 };
 
                 deposit_data.signature = deposit_data.create_signature(&voting_keypair.sk, &spec);
@@ -220,7 +220,7 @@ impl<'a> Builder<'a> {
                 // Write the withdrawal password to file.
                 write_password_to_file(
                     self.password_dir
-                        .join(withdrawal_keypair.pk.as_hex_string()),
+                        .join(withdrawal_keypair.pk.to_hex_string()),
                     withdrawal_password.as_bytes(),
                 )?;
 

common/validator_dir/src/builder.rs

@@ -107,14 +107,14 @@ impl Manager {
                             info!(
                                 log,
                                 "Decrypted validator keystore";
-                                "voting_pubkey" => kp.pk.as_hex_string()
+                                "voting_pubkey" => kp.pk.to_hex_string()
                             );
                             if lockfile_existed {
                                 warn!(
                                     log,
                                     "Lockfile already existed";
                                     "msg" => "ensure no other validator client is running on this host",
-                                    "voting_pubkey" => kp.pk.as_hex_string()
+                                    "voting_pubkey" => kp.pk.to_hex_string()
                                 );
                             }
                         }
@@ -147,7 +147,7 @@ impl Manager {
                             info!(
                                 log,
                                 "Decrypted validator keystore";
-                                "voting_pubkey" => kp.pk.as_hex_string()
+                                "voting_pubkey" => kp.pk.to_hex_string()
                             )
                         }
                         (kp, v)