Disable braavos integration

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 #### Changed
 
 - Updated argent class hash used in account creation to v0.4.0
+- Using Braavos accounts with `sncast` is currently disabled
 
 #### Removed
 

crates/sncast/src/helpers/braavos.rs

@@ -1,3 +1,4 @@
+use anyhow::{Error, bail};
 use async_trait::async_trait;
 use starknet::{
     accounts::{AccountFactory, PreparedAccountDeploymentV3, RawAccountDeploymentV3},
@@ -8,6 +9,8 @@ use starknet::{
 use starknet_crypto::poseidon_hash_many;
 use starknet_types_core::felt::Felt;
 
+use crate::AccountType;
+
 // Adapted from strakli as there is currently no implementation of braavos account factory in starknet-rs
 pub struct BraavosAccountFactory<S, P> {
     class_hash: Felt,
@@ -140,3 +143,10 @@ where
             .is_interactive(SignerInteractivityContext::Other)
     }
 }
+
+pub fn assert_non_braavos_account_type(account_type: AccountType) -> Result<(), Error> {
+    if let AccountType::Braavos = account_type {
+        bail!("Using Braavos accounts with `sncast` is currently disabled")
+    }
+    Ok(())
+}

crates/sncast/src/lib.rs

@@ -4,6 +4,7 @@ use anyhow::{Context, Error, Result, anyhow, bail};
 use camino::Utf8PathBuf;
 use clap::ValueEnum;
 use conversions::serde::serialize::CairoSerialize;
+use helpers::braavos::assert_non_braavos_account_type;
 use helpers::constants::{KEYSTORE_PASSWORD_ENV_VAR, UDC_ADDRESS};
 use rand::RngCore;
 use rand::rngs::OsRng;
@@ -278,6 +279,11 @@ pub async fn get_account<'a>(
         get_account_data_from_accounts_file(account, chain_id, accounts_file)?
     };
 
+    // TODO(#3118): Remove this check once braavos integration is restored
+    if let Some(account_type) = account_data.account_type {
+        assert_non_braavos_account_type(account_type)?;
+    }
+
     let account = build_account(account_data, chain_id, provider).await?;
 
     Ok(account)

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

@@ -6,7 +6,7 @@ use camino::Utf8PathBuf;
 use clap::Args;
 use conversions::IntoConv;
 use serde_json::json;
-use sncast::helpers::braavos::BraavosAccountFactory;
+use sncast::helpers::braavos::{BraavosAccountFactory, assert_non_braavos_account_type};
 use sncast::helpers::configuration::CastConfig;
 use sncast::helpers::constants::{
     ARGENT_CLASS_HASH, BRAAVOS_BASE_ACCOUNT_CLASS_HASH, BRAAVOS_CLASS_HASH,
@@ -67,6 +67,9 @@ pub async fn create(
     chain_id: Felt,
     create: &Create,
 ) -> Result<AccountCreateResponse> {
+    // TODO(#3118): Remove this check once braavos integration is restored
+    assert_non_braavos_account_type(create.account_type)?;
+
     let add_profile = create.add_profile.clone();
     let salt = extract_or_generate_salt(create.salt);
     let class_hash = create.class_hash.unwrap_or(match create.account_type {

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

@@ -10,6 +10,7 @@ use clap::Args;
 use conversions::string::{TryFromDecStr, TryFromHexStr};
 use sncast::check_if_legacy_contract;
 use sncast::helpers::account::generate_account_name;
+use sncast::helpers::braavos::assert_non_braavos_account_type;
 use sncast::helpers::configuration::CastConfig;
 use sncast::helpers::rpc::RpcArgs;
 use sncast::response::structs::AccountImportResponse;
@@ -69,6 +70,9 @@ pub async fn import(
     provider: &JsonRpcClient<HttpTransport>,
     import: &Import,
 ) -> Result<AccountImportResponse> {
+    // TODO(#3118): Remove this check once braavos integration is restored
+    assert_non_braavos_account_type(import.account_type)?;
+
     let private_key = if let Some(passed_private_key) = &import.private_key {
         passed_private_key
     } else if let Some(passed_private_key_file_path) = &import.private_key_file_path {

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

@@ -19,7 +19,8 @@ use test_case::test_case;
 
 #[test_case("oz"; "oz_account_type")]
 #[test_case("argent"; "argent_account_type")]
-#[test_case("braavos"; "braavos_account_type")]
+// TODO(#3118): Re-enable this test once braavos integration is restored
+// #[test_case("braavos"; "braavos_account_type")]
 #[tokio::test]
 pub async fn test_happy_case(account_type: &str) {
     let temp_dir = tempdir().expect("Unable to create a temporary directory");
@@ -331,7 +332,8 @@ pub async fn test_account_already_exists() {
 
 #[test_case("oz"; "oz_account_type")]
 #[test_case("argent"; "argent_account_type")]
-#[test_case("braavos"; "braavos_account_type")]
+// TODO(#3118)
+// #[test_case("braavos"; "braavos_account_type")]
 #[tokio::test]
 pub async fn test_happy_case_keystore(account_type: &str) {
     let temp_dir = tempdir().expect("Unable to create a temporary directory");
@@ -819,3 +821,34 @@ fn get_keystore_account_pattern(account_type: AccountType, class_hash: Option<&s
 
     to_string_pretty(&account_json).unwrap()
 }
+
+#[test]
+fn test_braavos_disabled() {
+    let temp_dir = tempdir().expect("Unable to create a temporary directory");
+    let accounts_file = "accounts.json";
+
+    let args = vec![
+        "--accounts-file",
+        accounts_file,
+        "account",
+        "create",
+        "--url",
+        URL,
+        "--name",
+        "my_account",
+        "--salt",
+        "0x1",
+        "--type",
+        "braavos",
+    ];
+
+    let snapbox = runner(&args).current_dir(temp_dir.path());
+    let output = snapbox.assert().success();
+
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        error: Using Braavos accounts with `sncast` is currently disabled
+        "},
+    );
+}

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

@@ -12,9 +12,7 @@ use indoc::indoc;
 use serde_json::Value;
 use shared::test_utils::output_assert::{AsOutput, assert_stderr_contains};
 use sncast::AccountType;
-use sncast::helpers::constants::{
-    ARGENT_CLASS_HASH, BRAAVOS_CLASS_HASH, KEYSTORE_PASSWORD_ENV_VAR, OZ_CLASS_HASH,
-};
+use sncast::helpers::constants::{ARGENT_CLASS_HASH, KEYSTORE_PASSWORD_ENV_VAR, OZ_CLASS_HASH};
 use starknet::core::types::TransactionReceipt::DeployAccount;
 use std::fs;
 use tempfile::{TempDir, tempdir};
@@ -23,7 +21,8 @@ use test_case::test_case;
 #[test_case(DEVNET_OZ_CLASS_HASH_CAIRO_0, "oz"; "cairo_0_class_hash")]
 #[test_case(&OZ_CLASS_HASH.into_hex_string(), "oz"; "cairo_1_class_hash")]
 #[test_case(&ARGENT_CLASS_HASH.into_hex_string(), "argent"; "argent_class_hash")]
-#[test_case(&BRAAVOS_CLASS_HASH.into_hex_string(), "braavos"; "braavos_class_hash")]
+// TODO(#3118)
+// #[test_case(&BRAAVOS_CLASS_HASH.into_hex_string(), "braavos"; "braavos_class_hash")]
 #[tokio::test]
 pub async fn test_happy_case(class_hash: &str, account_type: &str) {
     let tempdir = create_account(false, class_hash, account_type).await;

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

@@ -15,7 +15,8 @@ use test_case::test_case;
 
 #[test_case("oz", "open_zeppelin"; "oz_account_type")]
 #[test_case("argent", "argent"; "argent_account_type")]
-#[test_case("braavos", "braavos"; "braavos_account_type")]
+// TODO(#3118)
+// #[test_case("braavos", "braavos"; "braavos_account_type")]
 #[tokio::test]
 pub async fn test_happy_case(input_account_type: &str, saved_type: &str) {
     let tempdir = tempdir().expect("Unable to create a temporary directory");
@@ -819,3 +820,33 @@ pub async fn test_happy_case_default_name_generation() {
 
     assert_eq!(contents_json, all_accounts_content);
 }
+
+#[tokio::test]
+pub async fn test_braavos_disabled() {
+    let tempdir = tempdir().expect("Unable to create a temporary directory");
+    let accounts_file = "accounts.json";
+
+    let args = vec![
+        "--accounts-file",
+        accounts_file,
+        "account",
+        "import",
+        "--url",
+        URL,
+        "--name",
+        "my_account_import",
+        "--address",
+        "0x123",
+        "--private-key",
+        "0x456",
+        "--type",
+        "braavos",
+    ];
+
+    let snapbox = runner(&args).current_dir(tempdir.path());
+
+    snapbox.assert().stderr_matches(indoc! {r"
+        command: account import
+        error: Using Braavos accounts with `sncast` is currently disabled
+    "});
+}

crates/sncast/tests/e2e/declare.rs

@@ -11,11 +11,12 @@ use indoc::indoc;
 use shared::test_utils::output_assert::{assert_stderr_contains, assert_stdout_contains};
 use sncast::AccountType;
 use sncast::helpers::constants::ARGENT_CLASS_HASH;
-use sncast::helpers::constants::{BRAAVOS_CLASS_HASH, OZ_CLASS_HASH};
+use sncast::helpers::constants::OZ_CLASS_HASH;
 use sncast::helpers::fee::FeeArgs;
 use starknet::core::types::TransactionReceipt::Declare;
 use starknet_types_core::felt::Felt;
 use std::fs;
+use tempfile::tempdir;
 use test_case::test_case;
 
 #[tokio::test]
@@ -62,7 +63,8 @@ async fn test_happy_case_human_readable() {
 )]
 #[test_case(OZ_CLASS_HASH, AccountType::OpenZeppelin; "cairo_1_class_hash")]
 #[test_case(ARGENT_CLASS_HASH, AccountType::Argent; "argent_class_hash")]
-#[test_case(BRAAVOS_CLASS_HASH, AccountType::Braavos; "braavos_class_hash")]
+// TODO(#3118)
+// #[test_case(BRAAVOS_CLASS_HASH, AccountType::Braavos; "braavos_class_hash")]
 #[tokio::test]
 async fn test_happy_case(class_hash: Felt, account_type: AccountType) {
     let contract_path = duplicate_contract_directory_with_salt(
@@ -616,3 +618,39 @@ async fn test_no_scarb_profile() {
         "},
     );
 }
+
+// TODO(#3118: Remove this test, once integration with braavos is restored
+#[tokio::test]
+async fn test_braavos_disabled() {
+    let contract_path = duplicate_contract_directory_with_salt(
+        CONTRACTS_DIR.to_string() + "/map",
+        "put",
+        "human_readable",
+    );
+    let tempdir = tempdir().expect("Failed to create a temporary directory");
+    let accounts_json_path = get_accounts_path("tests/data/accounts/accounts.json");
+    join_tempdirs(&contract_path, &tempdir);
+
+    let args = vec![
+        "--accounts-file",
+        &accounts_json_path,
+        "--account",
+        "braavos",
+        "declare",
+        "--url",
+        URL,
+        "--contract-name",
+        "Map",
+    ];
+    let args = apply_test_resource_bounds_flags(args);
+
+    let snapbox = runner(&args).current_dir(tempdir.path());
+    let output = snapbox.assert().failure();
+
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        Error: Using Braavos accounts with `sncast` is currently disabled
+        "},
+    );
+}

crates/sncast/tests/e2e/deploy.rs

@@ -4,8 +4,8 @@ use crate::helpers::constants::{
 };
 use crate::helpers::fee::apply_test_resource_bounds_flags;
 use crate::helpers::fixtures::{
-    create_and_deploy_account, create_and_deploy_oz_account, get_transaction_hash,
-    get_transaction_receipt,
+    create_and_deploy_account, create_and_deploy_oz_account, get_accounts_path,
+    get_transaction_hash, get_transaction_receipt,
 };
 use crate::helpers::runner::runner;
 use indoc::indoc;
@@ -17,6 +17,7 @@ use sncast::helpers::fee::FeeArgs;
 use starknet::core::types::TransactionReceipt::Deploy;
 use starknet_types_core::felt::Felt;
 use std::path::PathBuf;
+use tempfile::tempdir;
 use test_case::test_case;
 
 #[tokio::test]
@@ -374,3 +375,32 @@ async fn test_happy_case_shell() {
         .arg(CONSTRUCTOR_WITH_PARAMS_CONTRACT_CLASS_HASH_SEPOLIA);
     snapbox.assert().success();
 }
+
+// TODO(#3118: Remove this test, once integration with braavos is restored
+#[tokio::test]
+async fn test_braavos_disabled() {
+    let tempdir = tempdir().expect("Failed to create a temporary directory");
+    let accounts_json_path = get_accounts_path("tests/data/accounts/accounts.json");
+
+    let args = vec![
+        "--accounts-file",
+        &accounts_json_path,
+        "--account",
+        "braavos",
+        "deploy",
+        "--url",
+        URL,
+        "--class-hash",
+        MAP_CONTRACT_CLASS_HASH_SEPOLIA,
+    ];
+
+    let snapbox = runner(&args).current_dir(tempdir.path());
+    let output = snapbox.assert().failure();
+
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        Error: Using Braavos accounts with `sncast` is currently disabled
+        "},
+    );
+}

crates/sncast/tests/e2e/invoke.rs

@@ -4,8 +4,8 @@ use crate::helpers::constants::{
 };
 use crate::helpers::fee::apply_test_resource_bounds_flags;
 use crate::helpers::fixtures::{
-    create_and_deploy_account, create_and_deploy_oz_account, get_transaction_hash,
-    get_transaction_receipt,
+    create_and_deploy_account, create_and_deploy_oz_account, get_accounts_path,
+    get_transaction_hash, get_transaction_receipt,
 };
 use crate::helpers::runner::runner;
 use indoc::indoc;
@@ -17,6 +17,7 @@ use sncast::helpers::fee::FeeArgs;
 use starknet::core::types::TransactionReceipt::Invoke;
 use starknet_types_core::felt::Felt;
 use std::path::PathBuf;
+use tempfile::tempdir;
 use test_case::test_case;
 
 #[tokio::test]
@@ -362,3 +363,36 @@ async fn test_happy_case_shell() {
         .arg(DATA_TRANSFORMER_CONTRACT_ADDRESS_SEPOLIA);
     snapbox.assert().success();
 }
+
+// TODO(#3118): Remove this test, once integration with braavos is restored
+#[tokio::test]
+async fn test_braavos_disabled() {
+    let tempdir = tempdir().expect("Failed to create a temporary directory");
+    let accounts_json_path = get_accounts_path("tests/data/accounts/accounts.json");
+
+    let args = vec![
+        "--accounts-file",
+        &accounts_json_path,
+        "--account",
+        "braavos",
+        "invoke",
+        "--url",
+        URL,
+        "--contract-address",
+        MAP_CONTRACT_ADDRESS_SEPOLIA,
+        "--function",
+        "put",
+        "--calldata",
+        "0x1 0x2",
+    ];
+
+    let snapbox = runner(&args).current_dir(tempdir.path());
+    let output = snapbox.assert().failure();
+
+    assert_stderr_contains(
+        output,
+        indoc! {r"
+        Error: Using Braavos accounts with `sncast` is currently disabled
+        "},
+    );
+}