Skip to content

Drop panic if rust-bitcoin adds a new Network #2746

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
merged 2 commits into from
Nov 27, 2023
Merged

Drop panic if rust-bitcoin adds a new Network #2746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28068c
Drop panic if `rust-bitcoin` adds a new `Network`
TheBlueMatt Nov 26, 2023
a41954d
Remove now-redundant checks in BOLT12 `Invoice` fallback addresses
TheBlueMatt Nov 26, 2023
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
5 changes: 4 additions & 1 deletion lightning-invoice/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,10 @@ impl From<Network> for Currency {
Network::Testnet => Currency::BitcoinTestnet,
Network::Regtest => Currency::Regtest,
Network::Signet => Currency::Signet,
_ => unreachable!(),
_ => {
debug_assert!(false, "Need to handle new rust-bitcoin network type");
Currency::Regtest
},
}
}
}
Expand Down
11 changes: 1 addition & 10 deletions lightning/src/offers/invoice.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,20 +926,11 @@ impl InvoiceContents {
};

let program = &address.program;
if program.len() < 2 || program.len() > 40 {
return None;
}

let witness_program = match WitnessProgram::new(version, program.clone()) {
Ok(witness_program) => witness_program,
Err(_) => return None,
};
let address = Address::new(network, Payload::WitnessProgram(witness_program));
if !address.is_spend_standard() && version == WitnessVersion::V0 {
return None;
}

Some(address)
Some(Address::new(network, Payload::WitnessProgram(witness_program)))
};

self.fields().fallbacks
Expand Down