diff --git a/integration_tests/tests/token.rs b/integration_tests/tests/token.rs index 6a129693..19a2a4a8 100644 --- a/integration_tests/tests/token.rs +++ b/integration_tests/tests/token.rs @@ -1100,7 +1100,7 @@ async fn token_claiming_path_with_private_accounts() -> Result<()> { else { anyhow::bail!("Expected RegisterAccount return value"); }; - + // Create supply account (private) let result = wallet::cli::execute_subcommand( 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?; - + // This command breaks (Marvin) + println!("TEST5"); info!("Waiting for next block creation"); 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 {}); wallet::cli::execute_subcommand(ctx.wallet_mut(), command).await?; + println!("TEST6"); // Verify commitment exists let recipient_commitment = ctx .wallet() diff --git a/python/keycard_wallet.py b/python/keycard_wallet.py index 1a85af06..73c27fa9 100644 --- a/python/keycard_wallet.py +++ b/python/keycard_wallet.py @@ -73,7 +73,7 @@ class KeycardWallet: # Load the LEE seed onto the card result = self.card.load_key( - key_type = constants.LoadKeyType.BIP39_SEED, + key_type = constants.LoadKeyType.LEE_SEED, lee_seed = seed ) diff --git a/wallet/src/cli/programs/token.rs b/wallet/src/cli/programs/token.rs index dae92e47..1c853789 100644 --- a/wallet/src/cli/programs/token.rs +++ b/wallet/src/cli/programs/token.rs @@ -132,7 +132,7 @@ pub enum TokenProgramAgnosticSubcommand { #[arg(long, conflicts_with = "definition")] definition_label: Option, /// 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, /// Holder account label (alternative to --holder). #[arg(long, conflicts_with = "holder")] diff --git a/wallet_with_keycard.sh b/wallet_with_keycard.sh index 8fc6e424..0a19972e 100644 --- a/wallet_with_keycard.sh +++ b/wallet_with_keycard.sh @@ -11,7 +11,7 @@ python3 -m pip install pyaes cd python # 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 python3 -m venv venv source venv/bin/activate