Skip to content

Fix invalid witness program length #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tnull merged 1 commit into from
Oct 28, 2024
Merged

Fix invalid witness program length #387

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/wallet/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,12 @@ where
let script_pubkey = u.txout.script_pubkey;
match script_pubkey.witness_version() {
Some(version @ WitnessVersion::V0) => {
let witness_program = WitnessProgram::new(version, script_pubkey.as_bytes())
.map_err(|e| {
log_error!(self.logger, "Failed to retrieve script payload: {}", e);
})?;
let witness_program =
WitnessProgram::new(version, &script_pubkey.as_bytes()[2..]).map_err(
|e| {
log_error!(self.logger, "Failed to retrieve script payload: {}", e);
},
)?;

let wpkh = WPubkeyHash::from_slice(&witness_program.program().as_bytes())
.map_err(|e| {
Expand All @@ -400,10 +402,12 @@ where
utxos.push(utxo);
},
Some(version @ WitnessVersion::V1) => {
let witness_program = WitnessProgram::new(version, script_pubkey.as_bytes())
.map_err(|e| {
log_error!(self.logger, "Failed to retrieve script payload: {}", e);
})?;
let witness_program =
WitnessProgram::new(version, &script_pubkey.as_bytes()[2..]).map_err(
|e| {
log_error!(self.logger, "Failed to retrieve script payload: {}", e);
},
)?;

XOnlyPublicKey::from_slice(&witness_program.program().as_bytes()).map_err(
|e| {
Expand Down
Loading