Skip to content

Commit

Permalink
feat: use secret key from env if no wallets are present
Browse files Browse the repository at this point in the history
  • Loading branch information
ermineJose committed Dec 9, 2024
1 parent f53c275 commit d9ba950
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions ant-cli/src/wallet/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ pub enum Error {
PrivateKeyFileNotFound,
#[error("No wallets found. Create one using `wallet create`")]
NoWalletsFound,
#[error("No wallets found and No secret Keys found in ENV, create one using `wallet create`")]
NoWalletsFoundAndNoSecretKeysInEnv,
#[error("Invalid wallet selection input")]
InvalidSelection,
}
6 changes: 5 additions & 1 deletion ant-cli/src/wallet/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
// KIND, either express or implied. Please review the Licences for the specific language governing
// permissions and limitations relating to use of the SAFE Network Software.

use crate::keys::get_secret_key_from_env;
use crate::wallet::encryption::{decrypt_private_key, encrypt_private_key};
use crate::wallet::error::Error;
use crate::wallet::input::{get_password_input, get_wallet_selection_input};
Expand Down Expand Up @@ -133,7 +134,10 @@ pub(crate) fn select_wallet_address() -> Result<String, Error> {
let wallet_files = get_wallet_files(&wallets_folder)?;

let wallet_address = match wallet_files.len() {
0 => Err(Error::NoWalletsFound),
0 => {
let secret_key = get_secret_key_from_env().map_err(|_| Error::NoWalletsFoundAndNoSecretKeysInEnv)?;
Ok(secret_key)
},
1 => Ok(filter_wallet_file_extension(&wallet_files[0])),
_ => get_wallet_selection(wallet_files),
}?;
Expand Down

0 comments on commit d9ba950

Please sign in to comment.