add Fallback getter that returns Address#2023

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
jkczyz merged 1 commit into from
Apr 7, 2023
Merged

add Fallback getter that returns Address#2023

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions lightning-invoice/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down
37 changes: 20 additions & 17 deletions lightning-invoice/src/de.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
if bytes.len() < 2 || bytes.len() > 40 {
return Err(ParseError::InvalidSegWitProgramLength);
}

let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
Ok(Fallback::SegWitProgram {
version: version,
program: bytes
})
},
17 => {
if bytes.len() != 20 {
return Err(ParseError::InvalidPubKeyHashLength);
}
//TODO: refactor once const generics are available
let mut pkh = [0u8; 20];
pkh.copy_from_slice(&bytes);
let pkh = match PubkeyHash::from_slice(&bytes) {
Ok(pkh) => pkh,
Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
};
Ok(Fallback::PubKeyHash(pkh))
}
18 => {
if bytes.len() != 20 {
return Err(ParseError::InvalidScriptHashLength);
}
let mut sh = [0u8; 20];
sh.copy_from_slice(&bytes);
let sh = match ScriptHash::from_slice(&bytes) {
Ok(sh) => sh,
Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
};
Ok(Fallback::ScriptHash(sh))
}
_ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
fn test_parse_fallback() {
use crate::Fallback;
use bech32::FromBase32;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;

let cases = vec![
(
from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
Ok(Fallback::PubKeyHash([
Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
]))
]).unwrap()))
),
(
from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
Ok(Fallback::ScriptHash([
Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
]))
]).unwrap()))
),
(
from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
Ok(Fallback::SegWitProgram {
version: u5::try_from_u8(0).unwrap(),
version: WitnessVersion::V0,
program: Vec::from(&[
0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down
46 changes: 38 additions & 8 deletions lightning-invoice/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
SegWitProgram {
version: u5,
version: WitnessVersion,
program: Vec<u8>,
},
PubKeyHash([u8; 20]),
ScriptHash([u8; 20]),
PubKeyHash(PubkeyHash),
ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
self.signed_invoice.fallbacks()
}

/// Returns a list of all fallback addresses as [`Address`]es
pub fn fallback_addresses(&self) -> Vec<Address> {
self.fallbacks().iter().map(|fallback| {
let network = match self.currency() {
Currency::Bitcoin => Network::Bitcoin,
Currency::BitcoinTestnet => Network::Testnet,
Currency::Regtest => Network::Regtest,
Currency::Simnet => Network::Regtest,
Currency::Signet => Network::Signet,
};

let payload = match fallback {
Fallback::SegWitProgram { version, program } => {
Payload::WitnessProgram { version: *version, program: program.to_vec() }
}
Fallback::PubKeyHash(pkh) => {
Payload::PubkeyHash(*pkh)
}
Fallback::ScriptHash(sh) => {
Payload::ScriptHash(*sh)
}
};

Address { payload, network }
}).collect()
}

/// Returns a list of all routes included in the invoice
pub fn private_routes(&self) -> Vec<&PrivateRoute> {
self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
use bitcoin::Script;
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
.payee_pub_key(public_key.clone())
.expiry_time(Duration::from_secs(54321))
.min_final_cltv_expiry_delta(144)
.fallback(Fallback::PubKeyHash([0;20]))
.fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
.private_route(route_1.clone())
.private_route(route_2.clone())
.description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
assert_eq!(invoice.payee_pub_key(), Some(&public_key));
assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
assert_eq!(invoice.fallback_addresses(), vec![address]);
assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
assert_eq!(
invoice.description(),
Expand Down
2 changes: 1 addition & 1 deletion lightning-invoice/src/ser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
match *self {
Fallback::SegWitProgram {version: v, program: ref p} => {
writer.write_u5(v)?;
writer.write_u5(Into::<u5>::into(v))?;
p.write_base32(writer)
},
Fallback::PubKeyHash(ref hash) => {
Expand Down
13 changes: 7 additions & 6 deletions lightning-invoice/tests/ser_de.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
.payment_hash(sha256::Hash::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())
.fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
.fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
.build_raw()
.unwrap()
.sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
.payment_hash(sha256::Hash::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())
.fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
.fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
.private_route(RouteHint(vec![RouteHintHop {
src_node_id: PublicKey::from_slice(&hex::decode(
"029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
.payment_hash(sha256::Hash::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())
.fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
.fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
.build_raw()
.unwrap()
.sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
.payment_hash(sha256::Hash::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())
.fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
.fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
})
.build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
.payment_hash(sha256::Hash::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())
.fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
.fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
})
.build_raw()
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
add Fallback getter that returns Address#2023

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

jkczyz
merged 1 commit into

from

Apr 7, 2023
 Merged


add Fallback getter that returns Address#2023
Show file tree
Hide file tree
 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


1 change: 1 addition & 0 deletions
lightning-invoice/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ num-traits = { version = "0.2.8", default-features = false }
bitcoin_hashes = { version = "0.11", default-features = false }
hashbrown = { version = "0.8", optional = true }
serde = { version = "1.0.118", optional = true }
bitcoin = { version = "0.29.0", default-features = false }

[dev-dependencies]
lightning = { version = "0.0.113", path = "../lightning", default-features = false, features = ["_test_utils"] }
Expand Down

37 changes: 20 additions & 17 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
#[cfg(feature = "std")]
use std::error;
use core::convert::TryFrom;
use core::fmt;
use core::fmt::{Display, Formatter};
use core::num::ParseIntError;
Expand All@@ -9,6 +10,8 @@ use core::str::FromStr;
use bech32;
use bech32::{u5, FromBase32};

use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin::util::address::WitnessVersion;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use crate::prelude::*;
Expand DownExpand Up@@ -552,27 +555,24 @@ impl FromBase32 for Fallback {
 if bytes.len() < 2 || bytes.len() > 40 {
 return Err(ParseError::InvalidSegWitProgramLength);
 }

 let version = WitnessVersion::try_from(version).expect("0 through 16 are valid SegWit versions");
 Ok(Fallback::SegWitProgram {
 version: version,
 program: bytes
 })
 },
 17 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidPubKeyHashLength);
 }
 //TODO: refactor once const generics are available
 let mut pkh = [0u8; 20];
 pkh.copy_from_slice(&bytes);
 let pkh = match PubkeyHash::from_slice(&bytes) {
 Ok(pkh) => pkh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 };
 Ok(Fallback::PubKeyHash(pkh))
 }
 18 => {
 if bytes.len() != 20 {
 return Err(ParseError::InvalidScriptHashLength);
 }
 let mut sh = [0u8; 20];
 sh.copy_from_slice(&bytes);
 let sh = match ScriptHash::from_slice(&bytes) {
 Ok(sh) => sh,
 Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidScriptHashLength),
 };
 Ok(Fallback::ScriptHash(sh))
 }
 _ => Err(ParseError::Skip)
Expand DownExpand Up@@ -854,26 +854,29 @@ mod test {
	fn test_parse_fallback() {
 use crate::Fallback;
 use bech32::FromBase32;
 use bitcoin::{PubkeyHash, ScriptHash};
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;

 let cases = vec![
 (
 from_bech32("3x9et2e20v6pu37c5d9vax37wxq72un98".as_bytes()),
 Ok(Fallback::PubKeyHash([
 Ok(Fallback::PubKeyHash(PubkeyHash::from_slice(&[
 0x31, 0x72, 0xb5, 0x65, 0x4f, 0x66, 0x83, 0xc8, 0xfb, 0x14, 0x69, 0x59, 0xd3,
 0x47, 0xce, 0x30, 0x3c, 0xae, 0x4c, 0xa7
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("j3a24vwu6r8ejrss3axul8rxldph2q7z9".as_bytes()),
 Ok(Fallback::ScriptHash([
 Ok(Fallback::ScriptHash(ScriptHash::from_slice(&[
 0x8f, 0x55, 0x56, 0x3b, 0x9a, 0x19, 0xf3, 0x21, 0xc2, 0x11, 0xe9, 0xb9, 0xf3,
 0x8c, 0xdf, 0x68, 0x6e, 0xa0, 0x78, 0x45
 ]))
 ]).unwrap()))
 ),
 (
 from_bech32("qw508d6qejxtdg4y5r3zarvary0c5xw7k".as_bytes()),
 Ok(Fallback::SegWitProgram {
 version: u5::try_from_u8(0).unwrap(),
 version: WitnessVersion::V0,
 program: Vec::from(&[
 0x75u8, 0x1e, 0x76, 0xe8, 0x19, 0x91, 0x96, 0xd4, 0x54, 0x94, 0x1c, 0x45,
 0xd1, 0xb3, 0xa3, 0x23, 0xf1, 0x43, 0x3b, 0xd6
Expand Down

46 changes: 38 additions & 8 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,8 +45,9 @@ extern crate serde;
use std::time::SystemTime;

use bech32::u5;
use bitcoin_hashes::Hash;
use bitcoin_hashes::sha256;
use bitcoin::{Address, Network, PubkeyHash, ScriptHash};
use bitcoin::util::address::{Payload, WitnessVersion};
use bitcoin_hashes::{Hash, sha256};
use lightning::ln::PaymentSecret;
use lightning::ln::features::InvoiceFeatures;
#[cfg(any(doc, test))]
Expand DownExpand Up@@ -442,17 +443,16 @@ pub struct ExpiryTime(Duration);
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub struct MinFinalCltvExpiryDelta(pub u64);

// TODO: better types instead onf byte arrays
/// Fallback address in case no LN payment is possible
#[allow(missing_docs)]
#[derive(Clone, Debug, Hash, Eq, PartialEq)]
pub enum Fallback {
	SegWitProgram {
 version: u5,
 version: WitnessVersion,
 program: Vec<u8>,
	},
	PubKeyHash([u8; 20]),
	ScriptHash([u8; 20]),
	PubKeyHash(PubkeyHash),
	ScriptHash(ScriptHash),
}

/// Recoverable signature
Expand DownExpand Up@@ -1258,6 +1258,33 @@ impl Invoice {
 self.signed_invoice.fallbacks()
	}

	/// Returns a list of all fallback addresses as [`Address`]es
	pub fn fallback_addresses(&self) -> Vec<Address> {
 self.fallbacks().iter().map(|fallback| {
 let network = match self.currency() {
 Currency::Bitcoin => Network::Bitcoin,
 Currency::BitcoinTestnet => Network::Testnet,
 Currency::Regtest => Network::Regtest,
 Currency::Simnet => Network::Regtest,
 Currency::Signet => Network::Signet,
 };

 let payload = match fallback {
 Fallback::SegWitProgram { version, program } => {
 Payload::WitnessProgram { version: *version, program: program.to_vec() }
 }
 Fallback::PubKeyHash(pkh) => {
 Payload::PubkeyHash(*pkh)
 }
 Fallback::ScriptHash(sh) => {
 Payload::ScriptHash(*sh)
 }
 };

 Address { payload, network }
 }).collect()
	}

	/// Returns a list of all routes included in the invoice
	pub fn private_routes(&self) -> Vec<&PrivateRoute> {
 self.signed_invoice.private_routes()
Expand DownExpand Up@@ -1567,6 +1594,7 @@ impl<'de> Deserialize<'de> for Invoice {

#[cfg(test)]
mod test {
	use bitcoin::Script;
	use bitcoin_hashes::hex::FromHex;
	use bitcoin_hashes::sha256;

Expand DownExpand Up@@ -1930,7 +1958,7 @@ mod test {
 .payee_pub_key(public_key.clone())
 .expiry_time(Duration::from_secs(54321))
 .min_final_cltv_expiry_delta(144)
 .fallback(Fallback::PubKeyHash([0;20]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap()))
 .private_route(route_1.clone())
 .private_route(route_2.clone())
 .description_hash(sha256::Hash::from_slice(&[3;32][..]).unwrap())
Expand All@@ -1956,7 +1984,9 @@ mod test {
 assert_eq!(invoice.payee_pub_key(), Some(&public_key));
 assert_eq!(invoice.expiry_time(), Duration::from_secs(54321));
 assert_eq!(invoice.min_final_cltv_expiry_delta(), 144);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash([0;20])]);
 assert_eq!(invoice.fallbacks(), vec![&Fallback::PubKeyHash(PubkeyHash::from_slice(&[0;20]).unwrap())]);
 let address = Address::from_script(&Script::new_p2pkh(&PubkeyHash::from_slice(&[0;20]).unwrap()), Network::Testnet).unwrap();
 assert_eq!(invoice.fallback_addresses(), vec![address]);
 assert_eq!(invoice.private_routes(), vec![&PrivateRoute(route_1), &PrivateRoute(route_2)]);
 assert_eq!(
 invoice.description(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning-invoice/src/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -329,7 +329,7 @@ impl ToBase32 for Fallback {
	fn write_base32<W: WriteBase32>(&self, writer: &mut W) -> Result<(), <W as WriteBase32>::Err> {
 match *self {
 Fallback::SegWitProgram {version: v, program: ref p} => {
 writer.write_u5(v)?;
 writer.write_u5(Into::<u5>::into(v))?;
 p.write_base32(writer)
 },
 Fallback::PubKeyHash(ref hash) => {
Expand Down

13 changes: 7 additions & 6 deletions
lightning-invoice/tests/ser_de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,9 +5,10 @@ extern crate lightning_invoice;
extern crate secp256k1;
extern crate hex;

use bitcoin::util::address::WitnessVersion;
use bitcoin::{PubkeyHash, ScriptHash};
use bitcoin_hashes::hex::FromHex;
use bitcoin_hashes::{sha256, Hash};
use bech32::u5;
use lightning::ln::PaymentSecret;
use lightning::routing::gossip::RoutingFees;
use lightning::routing::router::{RouteHint, RouteHintHop};
Expand DownExpand Up@@ -115,7 +116,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[49, 114, 181, 101, 79, 102, 131, 200, 251, 20, 105, 89, 211, 71, 206, 48, 60, 174, 76, 167]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -137,7 +138,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::PubKeyHash([4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]))
 .fallback(Fallback::PubKeyHash(PubkeyHash::from_slice(&[4, 182, 31, 125, 193, 234, 13, 201, 148, 36, 70, 76, 196, 6, 77, 197, 100, 217, 30, 137]).unwrap()))
 .private_route(RouteHint(vec![RouteHintHop {
 src_node_id: PublicKey::from_slice(&hex::decode(
 "029e03a901b85534ff1e92c43c74431f7ce72046060fcf7a95c37e148f78c77255"
Expand DownExpand Up@@ -176,7 +177,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::ScriptHash([143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]))
 .fallback(Fallback::ScriptHash(ScriptHash::from_slice(&[143, 85, 86, 59, 154, 25, 243, 33, 194, 17, 233, 185, 243, 140, 223, 104, 110, 160, 120, 69]).unwrap()))
 .build_raw()
 .unwrap()
 .sign(|_| {
Expand All@@ -198,7 +199,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![117, 30, 118, 232, 25, 145, 150, 212, 84, 148, 28, 69, 209, 179, 163, 35, 241, 67, 59, 214]
 })
 .build_raw()
Expand All@@ -222,7 +223,7 @@ fn get_test_tuples() -> Vec<(String, SignedRawInvoice, bool, bool)> {
 .payment_hash(sha256::Hash::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())
 .fallback(Fallback::SegWitProgram { version: u5::try_from_u8(0).unwrap(),
 .fallback(Fallback::SegWitProgram { version: WitnessVersion::V0,
 program: vec![24, 99, 20, 60, 20, 197, 22, 104, 4, 189, 25, 32, 51, 86, 218, 19, 108, 152, 86, 120, 205, 77, 39, 161, 184, 198, 50, 150, 4, 144, 50, 98]
 })
 .build_raw()
Expand Down