fix integration test issue and updated keycard firmware

This commit is contained in:
jonesmarvin8 2026-04-28 14:10:54 -04:00
parent f44562eb8f
commit d5dea3e115
4 changed files with 7 additions and 5 deletions

View File

@ -1100,7 +1100,7 @@ async fn token_claiming_path_with_private_accounts() -> Result<()> {
else { else {
anyhow::bail!("Expected RegisterAccount return value"); anyhow::bail!("Expected RegisterAccount return value");
}; };
// Create supply account (private) // Create supply account (private)
let result = wallet::cli::execute_subcommand( let result = wallet::cli::execute_subcommand(
ctx.wallet_mut(), ctx.wallet_mut(),
@ -1174,7 +1174,8 @@ async fn token_claiming_path_with_private_accounts() -> Result<()> {
}; };
wallet::cli::execute_subcommand(ctx.wallet_mut(), Command::Token(subcommand)).await?; wallet::cli::execute_subcommand(ctx.wallet_mut(), Command::Token(subcommand)).await?;
// This command breaks (Marvin)
println!("TEST5");
info!("Waiting for next block creation"); info!("Waiting for next block creation");
tokio::time::sleep(Duration::from_secs(TIME_TO_WAIT_FOR_BLOCK_SECONDS)).await; tokio::time::sleep(Duration::from_secs(TIME_TO_WAIT_FOR_BLOCK_SECONDS)).await;
@ -1182,6 +1183,7 @@ async fn token_claiming_path_with_private_accounts() -> Result<()> {
let command = Command::Account(AccountSubcommand::SyncPrivate {}); let command = Command::Account(AccountSubcommand::SyncPrivate {});
wallet::cli::execute_subcommand(ctx.wallet_mut(), command).await?; wallet::cli::execute_subcommand(ctx.wallet_mut(), command).await?;
println!("TEST6");
// Verify commitment exists // Verify commitment exists
let recipient_commitment = ctx let recipient_commitment = ctx
.wallet() .wallet()

View File

@ -73,7 +73,7 @@ class KeycardWallet:
# Load the LEE seed onto the card # Load the LEE seed onto the card
result = self.card.load_key( result = self.card.load_key(
key_type = constants.LoadKeyType.BIP39_SEED, key_type = constants.LoadKeyType.LEE_SEED,
lee_seed = seed lee_seed = seed
) )

View File

@ -132,7 +132,7 @@ pub enum TokenProgramAgnosticSubcommand {
#[arg(long, conflicts_with = "definition")] #[arg(long, conflicts_with = "definition")]
definition_label: Option<String>, definition_label: Option<String>,
/// holder - valid 32 byte base58 string with privacy prefix. /// holder - valid 32 byte base58 string with privacy prefix.
#[arg(long, conflicts_with = "holder_label")] #[arg(long, conflicts_with = "holder_label", required_unless_present_any = ["holder_label", "pin"])]
holder: Option<String>, holder: Option<String>,
/// Holder account label (alternative to --holder). /// Holder account label (alternative to --holder).
#[arg(long, conflicts_with = "holder")] #[arg(long, conflicts_with = "holder")]

View File

@ -11,7 +11,7 @@ python3 -m pip install pyaes
cd python cd python
# Need to use local version till fix applet # Need to use local version till fix applet
#git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git git clone --branch lee-schnorr --single-branch https://github.com/bitgamma/keycard-py.git
cd keycard-py cd keycard-py
python3 -m venv venv python3 -m venv venv
source venv/bin/activate source venv/bin/activate