fix(sncast): adapt native accounts to required addresses

Author: integraledelebesgue

crates/sncast/src/helpers/devnet/provider.rs

@@ -120,7 +120,7 @@ pub struct PredeployedAccount {
 impl From<&PredeployedAccount> for AccountRecord {
     fn from(predeployed_account: &PredeployedAccount) -> Self {
         Self {
-            address: Some(predeployed_account.address),
+            address: predeployed_account.address,
             public_key: predeployed_account.public_key,
             class_hash: None,
             salt: None,

crates/sncast/src/lib.rs

@@ -117,24 +117,31 @@ pub struct AccountData {
     pub signer_type: SignerType,
 }
 
-impl From<AccountData> for accounts::AccountRecord {
-    fn from(account: AccountData) -> Self {
+impl TryFrom<AccountData> for accounts::AccountRecord {
+    type Error = accounts::AccountsError;
+
+    fn try_from(account: AccountData) -> Result<Self, Self::Error> {
         let signer = match account.signer_type {
             SignerType::Local { private_key } => {
                 SignerSpec::PrivateKey(PrivateKeySpec::new(private_key))
             }
             SignerType::Ledger { ledger_path } => SignerSpec::Ledger(LedgerSpec::new(ledger_path)),
         };
-        Self {
+        Ok(Self {
             public_key: account.public_key,
-            address: account.address,
+            address: account
+                .address
+                .ok_or(accounts::AccountsError::MissingField {
+                    field: "address",
+                    operation: "connected account use",
+                })?,
             salt: account.salt,
             deployed: account.deployed,
             class_hash: account.class_hash,
             legacy: account.legacy,
             account_type: account.account_type,
             signer,
-        }
+        })
     }
 }
 
@@ -382,7 +389,7 @@ pub async fn get_account_from_repository<'a>(
     let chain_id = get_chain_id(provider).await?;
     let (account_data, signer) = if let Some(keystore) = keystore {
         let account_data: accounts::AccountRecord =
-            get_account_data_from_keystore(account, keystore)?.into();
+            get_account_data_from_keystore(account, keystore)?.try_into()?;
         let private_key = account_data
             .signer
             .private_key()
@@ -442,9 +449,7 @@ pub(crate) async fn build_account(
     provider: &JsonRpcClient<HttpTransport>,
     signer: RuntimeSigner,
 ) -> Result<RuntimeAccount<'_>> {
-    let address = account_data
-        .address
-        .context("Failed to get account address")?;
+    let address = account_data.address;
 
     verify_account_address(address, chain_id, provider).await?;
 
@@ -595,7 +600,7 @@ pub fn get_account_data_from_repository(
     };
     Ok(AccountData {
         public_key: account.public_key,
-        address: account.address,
+        address: Some(account.address),
         salt: account.salt,
         deployed: account.deployed,
         class_hash: account.class_hash,

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

@@ -114,7 +114,7 @@ pub async fn create(
     let (account_record, estimated_fee) =
         generate_account(provider, signer_source, ui, generation_params).await?;
 
-    let address = account_record.address.context("Invalid address")?;
+    let address = account_record.address;
 
     let estimated_fee_strk = BigDecimal::new(estimated_fee.into(), 18.into());
     let mut message = format!(

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

@@ -3,7 +3,7 @@ use camino::Utf8PathBuf;
 use clap::Args;
 use conversions::IntoConv;
 use serde_json::Map;
-use sncast::accounts::{AccountRecord, AccountRepository};
+use sncast::accounts::{AccountRecord, AccountRepository, AccountsError};
 use sncast::helpers::braavos::BraavosAccountFactory;
 use sncast::helpers::constants::BRAAVOS_BASE_ACCOUNT_CLASS_HASH;
 use sncast::helpers::dry_run::DryRunArgs;
@@ -129,8 +129,20 @@ async fn deploy_from_keystore(
         bail!("Public key and private key from keystore do not match");
     }
 
-    let account_record: AccountRecord = account_data.clone().into();
-    let (account_type, class_hash, salt) = extract_deployment_fields(&account_record)?;
+    let account_type = account_data
+        .account_type
+        .ok_or(AccountsError::MissingField {
+            field: "type",
+            operation: "account deployment",
+        })?;
+    let class_hash = account_data.class_hash.ok_or(AccountsError::MissingField {
+        field: "class_hash",
+        operation: "account deployment",
+    })?;
+    let salt = account_data.salt.ok_or(AccountsError::MissingField {
+        field: "salt",
+        operation: "account deployment",
+    })?;
 
     let signer = LocalWallet::from_signing_key(private_key);
     let (address, result) = create_factory_and_deploy(

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

@@ -65,7 +65,7 @@ impl AccountDataRepresentationMessage {
             },
             public_key: account.public_key.into_hex_string(),
             network: None,
-            address: account.address.map(IntoHexStr::into_hex_string),
+            address: Some(account.address.into_hex_string()),
             salt: account.salt.map(IntoHexStr::into_hex_string),
             deployed: account.deployed,
             class_hash: account.class_hash.map(IntoHexStr::into_hex_string),

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

@@ -112,7 +112,7 @@ pub fn prepare_account_record(
 ) -> AccountRecord {
     AccountRecord {
         public_key,
-        address: Some(address),
+        address,
         salt,
         deployed: Some(deployed),
         class_hash,

crates/sncast/src/starknet_commands/get/balance.rs

@@ -1,5 +1,5 @@
 use crate::starknet_commands::utils::felt_or_id::{ContractAddress, TokenAddress};
-use anyhow::{Context, Error, Result, bail};
+use anyhow::{Error, Result, bail};
 use clap::Args;
 use primitive_types::U256;
 use sncast::helpers::command::process_command_result;
@@ -110,9 +110,7 @@ async fn get_account_address(
     let repository = sncast::accounts::AccountRepository::new(config.accounts_file.clone());
     let account_data = get_account_record_from_repository(&config.account, chain_id, &repository)?;
 
-    account_data
-        .address
-        .context("Failed to get account address")
+    Ok(account_data.address)
 }
 
 #[expect(clippy::result_large_err)]

crates/sncast/tests/e2e/account/deploy.rs

@@ -12,6 +12,7 @@ use conversions::string::IntoHexStr;
 use indoc::indoc;
 use shared::test_utils::output_assert::{AsOutput, assert_stderr_contains, assert_stdout_contains};
 use sncast::AccountType;
+use sncast::helpers::account::load_accounts;
 use sncast::helpers::constants::{
     BRAAVOS_CLASS_HASH, KEYSTORE_PASSWORD_ENV_VAR, OZ_CLASS_HASH, READY_CLASS_HASH,
 };