Created SecretKey struct + refactoring

jstz_cli/src/config.rs

@@ -9,7 +9,7 @@ use std::{
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};
 
-use crate::accounts::account::Account;
+use crate::account::account::Account;
 
 fn home() -> PathBuf {
     dirs::home_dir()
@@ -24,31 +24,9 @@ pub struct AccountConfig {
 }
 
 impl AccountConfig {
-    /*
-    pub fn new() -> Self {
-        AccountList {
-            accounts: HashMap::new(),
-        }
-    }
-    */
-
     pub fn upsert(&mut self, account: Account) {
-        self.accounts.insert(account.get_alias().clone(), account);
-    }
-
-    /*
-    pub fn remove(&mut self, alias: &String) -> Option<Account> {
-        self.accounts.remove(alias)
-    }
-
-    pub fn get(&self, alias: &String) -> Option<&Account> {
-        self.accounts.get(alias)
-    }
-
-    pub fn get_all(&self) -> &HashMap<String, Account> {
-        &self.accounts
+        self.accounts.insert(account.alias.clone(), account);
     }
-    */
 }
 
 #[derive(Serialize, Deserialize, Debug, Default, Clone)]

jstz_cli/src/main.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::Parser;
 
-mod accounts;
+mod account;
 mod bridge;
 mod config;
 mod deploy;
@@ -23,7 +23,7 @@ enum Command {
     Bridge(bridge::Command),
     /// Commands related to the account management
     #[command(subcommand)]
-    Account(accounts::Command),
+    Account(account::Command),
     /// Deploys a smart function
     Deploy {
         /// Address used when deploying the contract
@@ -63,7 +63,7 @@ fn exec(command: Command, cfg: &mut Config) -> Result<()> {
     match command {
         Command::Sandbox(sandbox_command) => sandbox::exec(cfg, sandbox_command),
         Command::Bridge(bridge_command) => bridge::exec(bridge_command, cfg),
-        Command::Account(account_command) => accounts::exec(account_command, cfg),
+        Command::Account(account_command) => account::exec(account_command, cfg),
         Command::Deploy {
             self_address,
             function_code,

jstz_crypto/Cargo.toml

@@ -9,3 +9,4 @@ repository.workspace = true
 tezos_crypto_rs = { version = "0.5.0", default-features = false }
 derive_more = "0.99.17"
 serde = "1.0.185"
+anyhow = "1.0.75"

jstz_crypto/src/lib.rs

@@ -4,4 +4,6 @@ pub use error::{Error, Result};
 pub mod hash;
 pub mod public_key;
 pub mod public_key_hash;
+pub mod secret_key;
 pub mod signature;
+pub mod utils;

jstz_crypto/src/public_key.rs

@@ -3,7 +3,7 @@ use tezos_crypto_rs::hash::PublicKeyBls;
 
 use crate::error::Result;
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 pub enum PublicKey {
     Bls(PublicKeyBls),
 }

jstz_crypto/src/secret_key.rs

@@ -0,0 +1,28 @@
+use serde::{Deserialize, Serialize};
+use tezos_crypto_rs::hash::SecretKeyBls;
+
+use crate::error::Result;
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
+pub enum SecretKey {
+    Bls(SecretKeyBls),
+}
+
+impl SecretKey {
+    pub fn to_base58(&self) -> String {
+        let SecretKey::Bls(pk) = self;
+        pk.to_base58_check()
+    }
+
+    pub fn from_base58(data: &str) -> Result<Self> {
+        let bls = SecretKeyBls::from_base58_check(data)?;
+
+        Ok(SecretKey::Bls(bls))
+    }
+}
+
+impl ToString for SecretKey {
+    fn to_string(&self) -> String {
+        self.to_base58()
+    }
+}

jstz_crypto/src/utils.rs

@@ -0,0 +1,12 @@
+use anyhow::Result;
+use tezos_crypto_rs::bls::keypair_from_ikm;
+
+use crate::{hash::Blake2b, public_key::PublicKey, secret_key::SecretKey};
+
+pub fn keypair_from_passphrase(passphrase: &str) -> Result<(SecretKey, PublicKey)> {
+    let ikm = Blake2b::from(passphrase.as_bytes());
+
+    let (sk, pk) = keypair_from_ikm(*ikm.as_array()).unwrap();
+
+    Ok((SecretKey::Bls(sk), PublicKey::Bls(pk)))
+}