Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/utils/descriptors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ pub fn generate_descriptors(
key: &str,
network: NetworkKind,
) -> Result<DescriptorResult, Error> {
if key.trim_start().starts_with('[') {
return Err(Error::Generic(
"Descriptor key expressions are not accepted by this command. Provide a raw xpub/xprv, or use the expression in a full descriptor with `wallet config --ext-descriptor`.".to_string(),
));
}

let is_private = key.starts_with("xprv") || key.starts_with("tprv");

if is_private {
Expand Down
43 changes: 43 additions & 0 deletions tests/integration/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,49 @@ mod test_key {
.stdout(predicate::str::contains("\"xpub\":"));
}

#[test]
fn test_descriptor_rejects_descriptor_key_expression_with_guidance() {
let temp_dir = TempDir::new().unwrap();
let cli = BdkCli::new("testnet", Some(temp_dir.path().to_path_buf()));

let generate_output = cli
.key_cmd(&["generate"])
.output()
.expect("Failed to execute generate command");
assert!(generate_output.status.success(), "Generate command failed");

let generate_json: Value =
serde_json::from_slice(&generate_output.stdout).expect("Invalid JSON");
let xprv = generate_json["xprv"].as_str().expect("Missing XPRV");

let derive_output = cli
.key_cmd(&[
"derive",
"--xprv",
xprv,
"--derivation_path",
"m/84'/1'/0'/0",
])
.output()
.expect("Failed to execute derive command");
assert!(derive_output.status.success(), "Derive command failed");

let derive_json: Value =
serde_json::from_slice(&derive_output.stdout).expect("Invalid JSON");
let descriptor_key = derive_json["xprv"]
.as_str()
.expect("Missing derived descriptor key");

cli.cmd("descriptor", &["--type", "wpkh", descriptor_key])
.assert()
.failure()
.stderr(predicate::str::contains(
"Descriptor key expressions are not accepted by this command",
))
.stderr(predicate::str::contains("Provide a raw xpub/xprv"))
.stderr(predicate::str::contains("wallet config --ext-descriptor"));
}

#[test]
fn test_cli_key_restore() {
let temp_dir = TempDir::new().unwrap();
Expand Down