Revamp account import (#2565)

<!-- Reference any GitHub issues resolved by this PR -->

Closes #2218

## Introduced changes

<!-- A brief description of the changes -->

- Update `account add` to `account import`
- Remove `--public-key` flag
- Add address computation and validation based on provided salt, class
hash, private key and account type
- Allow to pass private key in interactive mode when neither
`--private-key` nor `--private-key-file` is passed
- Add "Importing Accounts" guide section

## Checklist

<!-- Make sure all of these are complete -->

- [x] Linked relevant issue
- [x] Updated relevant documentation
- [x] Added relevant tests
- [x] Performed self-review of the code
- [x] Added changes to `CHANGELOG.md`

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Short option for `--accounts-file` flag has been removed.
 - Short option for `--contract-address` is now `-d` instead of `-a`.
+- `account add` is renamed to `account import`.
+- `account import` can be now used without specifying `--private-key` or `--private-key-file` flags. Instead private key will be read interactively from the user.
 
 #### Fixed
 - `account delete` command: It is no longer necessary to provide the `--url` argument each time. Either the `--url` or `--network` argument must be provided, but not both, as they are mutually exclusive.

crates/sncast/src/main.rs

@@ -349,17 +349,17 @@ async fn run_async_command(
  }
 
  Commands::Account(account) => match account.command {
- account::Commands::Add(add) => {
- let provider = add.rpc.get_provider(&config).await?;
- let result = starknet_commands::account::add::add(
- &add.name.clone(),
+ account::Commands::Import(import) => {
+ let provider = import.rpc.get_provider(&config).await?;
+ let result = starknet_commands::account::import::import(
+ &import.name.clone(),
  &config.accounts_file,
  &provider,
- &add,
+ &import,
  )
  .await;
 
- print_command_result("account add", &result, numbers_format, output_format)?;
+ print_command_result("account import", &result, numbers_format, output_format)?;
  Ok(())
  }
 

crates/sncast/src/response/structs.rs

@@ -64,11 +64,11 @@ pub struct AccountCreateResponse {
 impl CommandResponse for AccountCreateResponse {}
 
 #[derive(Serialize)]
-pub struct AccountAddResponse {
+pub struct AccountImportResponse {
  pub add_profile: String,
 }
 
-impl CommandResponse for AccountAddResponse {}
+impl CommandResponse for AccountImportResponse {}
 
 #[derive(Serialize)]
 pub struct AccountDeleteResponse {

crates/sncast/src/starknet_commands/account/deploy.rs

@@ -134,26 +134,7 @@ async fn deploy_from_keystore(
  .class_hash
  .context("Failed to get class hash from keystore")?;
 
- let address = match account_type {
- AccountType::Argent => get_contract_address(
- salt,
- class_hash,
- &[private_key.verifying_key().scalar(), Felt::ZERO],
- Felt::ZERO,
- ),
- AccountType::OpenZeppelin => get_contract_address(
- salt,
- class_hash,
- &[private_key.verifying_key().scalar()],
- chain_id,
- ),
- AccountType::Braavos => get_contract_address(
- salt,
- BRAAVOS_BASE_ACCOUNT_CLASS_HASH,
- &[private_key.verifying_key().scalar()],
- chain_id,
- ),
- };
+ let address = compute_account_address(salt, &private_key, class_hash, account_type, chain_id);
 
  let result = if provider
  .get_class_hash_at(BlockId::Tag(Pending), address)
@@ -370,3 +351,32 @@ fn update_keystore_account(account: &str, address: Felt) -> Result<()> {
 
  Ok(())
 }
+
+pub(crate) fn compute_account_address(
+ salt: Felt,
+ private_key: &SigningKey,
+ class_hash: Felt,
+ account_type: AccountType,
+ chain_id: Felt,
+) -> Felt {
+ match account_type {
+ AccountType::Argent => get_contract_address(
+ salt,
+ class_hash,
+ &[private_key.verifying_key().scalar(), Felt::ZERO],
+ Felt::ZERO,
+ ),
+ AccountType::OpenZeppelin => get_contract_address(
+ salt,
+ class_hash,
+ &[private_key.verifying_key().scalar()],
+ chain_id,
+ ),
+ AccountType::Braavos => get_contract_address(
+ salt,
+ BRAAVOS_BASE_ACCOUNT_CLASS_HASH,
+ &[private_key.verifying_key().scalar()],
+ chain_id,
+ ),
+ }
+}