invoice: Use PaymentHash in raw invoice types#4363

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
TheBlueMatt merged 1 commit into from
Feb 3, 2026
Merged

invoice: Use PaymentHash in raw invoice types #4363

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
141 changes: 93 additions & 48 deletions lightning-invoice/src/de.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
}
}

impl FromBase32 for PaymentHash {
type Err = Bolt11ParseError;

fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
if field_data.len() != 52 {
return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
}
let data_bytes = <[u8; 32]>::from_base32(field_data)?;
Ok(PaymentHash(data_bytes))
}
}

impl FromBase32 for Bolt11InvoiceFeatures {
type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

match tag.to_u8() {
constants::TAG_PAYMENT_HASH => {
Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
},
constants::TAG_DESCRIPTION => {
Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
use crate::TaggedField::*;
use crate::{
Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
RawHrp, SiPrefix, SignedRawBolt11Invoice,
};
use bitcoin::hex::FromHex;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
use lightning_types::features::Bolt11InvoiceFeatures;

// Feature bits 9, 15, and 99 are set.
let expected_features =
Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
let invoice =
SignedRawBolt11Invoice {
raw_invoice: RawBolt11Invoice {
hrp: RawHrp {
currency: Currency::Bitcoin,
raw_amount: Some(25),
si_prefix: Some(SiPrefix::Milli),
},
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
PaymentHash(Sha256(sha256::Hash::from_str(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
let invoice = SignedRawBolt11Invoice {
raw_invoice: RawBolt11Invoice {
hrp: RawHrp {
currency: Currency::Bitcoin,
raw_amount: Some(25),
si_prefix: Some(SiPrefix::Milli),
},
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
crate::TaggedField::PaymentHash(crate::PaymentHash(
<[u8; 32]>::try_from(
Vec::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102",
)
.unwrap(),
)
.unwrap(),
))
.into(),
Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
PaymentSecret(crate::PaymentSecret([17; 32])).into(),
Features(expected_features).into()],
},
},
hash: [
0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
],
signature: Bolt11InvoiceSignature(
RecoverableSignature::from_compact(
&[
0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
0xe0, 0x1a, 0xf3, 0xc1,
],
RecoveryId::from_i32(1).unwrap(),
)
.unwrap(),
),
};
},
hash: [
0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
0x44, 0x54, 0x55, 0xb9,
],
signature: Bolt11InvoiceSignature(
RecoverableSignature::from_compact(
&[
0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
0xe0, 0x1a, 0xf3, 0xc1,
],
RecoveryId::from_i32(1).unwrap(),
)
.unwrap(),
),
};
assert_eq!(invoice_str, invoice.to_string());
assert_eq!(invoice_str.parse(), Ok(invoice));
}
Expand All@@ -1125,8 +1144,9 @@ mod test {
use crate::TaggedField::*;
use crate::{
Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
RawHrp, Sha256, SignedRawBolt11Invoice,
RawHrp, SignedRawBolt11Invoice,
};
use bitcoin::hex::FromHex;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec ! [
PaymentHash(Sha256(sha256::Hash::from_str(
"0001020304050607080900010203040506070809000102030405060708090102"
).unwrap())).into(),
crate::TaggedField::PaymentHash(crate::PaymentHash(
<[u8; 32]>::try_from(
Vec::from_hex(
"0001020304050607080900010203040506070809000102030405060708090102",
)
.unwrap(),
)
.unwrap(),
))
.into(),
Description(
crate::Description::new(
"Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
use crate::TaggedField::*;
use crate::{
Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
SignedRawBolt11Invoice,
};
use bitcoin::hex::FromHex;
use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
use bitcoin::secp256k1::PublicKey;
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
}

// Invoice fields
let payment_hash = sha256::Hash::from_str(
"0001020304050607080900010203040506070809000102030405060708090102",
)
.unwrap();
let payment_hash = crate::PaymentHash(
<[u8; 32]>::try_from(
Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
.unwrap(),
)
.unwrap(),
);
let description = "A".repeat(639);
let fallback_addr = crate::Fallback::SegWitProgram {
version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
data: RawDataPart {
timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
tagged_fields: vec![
PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
Description(crate::Description::new(description).unwrap()).into(),
PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
assert!(parse_is_code_length_err(&too_long));
assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
}

#[test]
fn test_payment_hash_from_base32_invalid_len() {
use crate::PaymentHash;

// PaymentHash must be 52 base32 characters (32 bytes).
// Test with 51 characters (too short).
let input = vec![Fe32::try_from(0).unwrap(); 51];
assert!(PaymentHash::from_base32(&input).is_err());

// Test with 53 characters (too long).
let input = vec![Fe32::try_from(0).unwrap(); 53];
assert!(PaymentHash::from_base32(&input).is_err());
}
}
Loading
Loading
, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading

, '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
invoice: Use PaymentHash in raw invoice types#4363

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

TheBlueMatt
merged 1 commit into

from

Feb 3, 2026
 Merged


invoice: Use PaymentHash in raw invoice types
#4363
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


141 changes: 93 additions & 48 deletions
lightning-invoice/src/de.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use crate::Bolt11Bech32;
use bitcoin::hashes::sha256;
use bitcoin::hashes::Hash;
use bitcoin::{PubkeyHash, ScriptHash, WitnessVersion};
use lightning_types::payment::PaymentSecret;
use lightning_types::payment::{PaymentHash, PaymentSecret};
use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};

use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
Expand DownExpand Up@@ -89,6 +89,18 @@ impl FromBase32 for PaymentSecret {
	}
}

impl FromBase32 for PaymentHash {
	type Err = Bolt11ParseError;

	fn from_base32(field_data: &[Fe32]) -> Result<Self, Self::Err> {
 if field_data.len() != 52 {
 return Err(Bolt11ParseError::InvalidSliceLength(field_data.len(), 52, "PaymentHash"));
 }
 let data_bytes = <[u8; 32]>::from_base32(field_data)?;
 Ok(PaymentHash(data_bytes))
	}
}

impl FromBase32 for Bolt11InvoiceFeatures {
	type Err = Bolt11ParseError;

Expand DownExpand Up@@ -540,7 +552,7 @@ impl FromBase32 for TaggedField {

 match tag.to_u8() {
 constants::TAG_PAYMENT_HASH => {
 Ok(TaggedField::PaymentHash(Sha256::from_base32(field_data)?))
 Ok(TaggedField::PaymentHash(PaymentHash::from_base32(field_data)?))
 },
 constants::TAG_DESCRIPTION => {
 Ok(TaggedField::Description(Description::from_base32(field_data)?))
Expand DownExpand Up@@ -1068,54 +1080,61 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SiPrefix, SignedRawBolt11Invoice,
 RawHrp, SiPrefix, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use lightning_types::features::Bolt11InvoiceFeatures;

 // Feature bits 9, 15, and 99 are set.
 let expected_features =
 Bolt11InvoiceFeatures::from_le_bytes(vec![0, 130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8]);
 let invoice_str = "lnbc25m1pvjluezpp5qqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqqqsyqcyq5rqwzqfqypqdq5vdhkven9v5sxyetpdeessp5zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zyg3zygs9q5sqqqqqqqqqqqqqqqpqsq67gye39hfg3zd8rgc80k32tvy9xk2xunwm5lzexnvpx6fd77en8qaq424dxgt56cag2dpt359k3ssyhetktkpqh24jqnjyw6uqd08sgptq44qu";
 let invoice =
 SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 let invoice = SignedRawBolt11Invoice {
 raw_invoice: RawBolt11Invoice {
 hrp: RawHrp {
 currency: Currency::Bitcoin,
 raw_amount: Some(25),
 si_prefix: Some(SiPrefix::Milli),
 },
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(crate::Description::new("coffee beans".to_owned()).unwrap()).into(),
 PaymentSecret(crate::PaymentSecret([17; 32])).into(),
 Features(expected_features).into()],
 },
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32,
 0xec, 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f,
 0xf8, 0x7e, 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 },
 hash: [
 0xb1, 0x96, 0x46, 0xc3, 0xbc, 0x56, 0x76, 0x1d, 0x20, 0x65, 0x6e, 0x0e, 0x32, 0xec,
 0xd2, 0x69, 0x27, 0xb7, 0x62, 0x6e, 0x2a, 0x8b, 0xe6, 0x97, 0x71, 0x9f, 0xf8, 0x7e,
 0x44, 0x54, 0x55, 0xb9,
 ],
 signature: Bolt11InvoiceSignature(
 RecoverableSignature::from_compact(
 &[
 0xd7, 0x90, 0x4c, 0xc4, 0xb7, 0x4a, 0x22, 0x26, 0x9c, 0x68, 0xc1, 0xdf,
 0x68, 0xa9, 0x6c, 0x21, 0x4d, 0x65, 0x1b, 0x93, 0x76, 0xe9, 0xf1, 0x64,
 0xd3, 0x60, 0x4d, 0xa4, 0xb7, 0xde, 0xcc, 0xce, 0x0e, 0x82, 0xaa, 0xab,
 0x4c, 0x85, 0xd3, 0x58, 0xea, 0x14, 0xd0, 0xae, 0x34, 0x2d, 0xa3, 0x08,
 0x12, 0xf9, 0x5d, 0x97, 0x60, 0x82, 0xea, 0xac, 0x81, 0x39, 0x11, 0xda,
 0xe0, 0x1a, 0xf3, 0xc1,
 ],
 RecoveryId::from_i32(1).unwrap(),
 )
 .unwrap(),
 ),
 };
 assert_eq!(invoice_str, invoice.to_string());
 assert_eq!(invoice_str.parse(), Ok(invoice));
	}
Expand All@@ -1125,8 +1144,9 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11InvoiceSignature, Currency, PositiveTimestamp, RawBolt11Invoice, RawDataPart,
 RawHrp, Sha256, SignedRawBolt11Invoice,
 RawHrp, SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};

 assert_eq!(
Expand All@@ -1143,9 +1163,16 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec ! [
 PaymentHash(Sha256(sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102"
 ).unwrap())).into(),
 crate::TaggedField::PaymentHash(crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap(),
 )
 .unwrap(),
 ))
 .into(),
 Description(
 crate::Description::new(
 "Please consider supporting this project".to_owned()
Expand DownExpand Up@@ -1289,9 +1316,10 @@ mod test {
 use crate::TaggedField::*;
 use crate::{
 Bolt11Invoice, Bolt11InvoiceFeatures, Bolt11InvoiceSignature, Currency,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField, Sha256,
 PositiveTimestamp, RawBolt11Invoice, RawDataPart, RawHrp, RawTaggedField,
 SignedRawBolt11Invoice,
 };
 use bitcoin::hex::FromHex;
 use bitcoin::secp256k1::ecdsa::{RecoverableSignature, RecoveryId};
 use bitcoin::secp256k1::PublicKey;
 use lightning_types::routing::{RouteHint, RouteHintHop, RoutingFees};
Expand All@@ -1310,10 +1338,13 @@ mod test {
 }

 // Invoice fields
 let payment_hash = sha256::Hash::from_str(
 "0001020304050607080900010203040506070809000102030405060708090102",
 )
 .unwrap();
 let payment_hash = crate::PaymentHash(
 <[u8; 32]>::try_from(
 Vec::from_hex("0001020304050607080900010203040506070809000102030405060708090102")
 .unwrap(),
 )
 .unwrap(),
 );
 let description = "A".repeat(639);
 let fallback_addr = crate::Fallback::SegWitProgram {
 version: bitcoin::WitnessVersion::V0,
Expand DownExpand Up@@ -1346,7 +1377,7 @@ mod test {
 data: RawDataPart {
 timestamp: PositiveTimestamp::from_unix_timestamp(1496314658).unwrap(),
 tagged_fields: vec![
 PaymentHash(Sha256(payment_hash)).into(),
crate::TaggedField::PaymentHash(payment_hash).into(),
 Description(crate::Description::new(description).unwrap()).into(),
 PayeePubKey(crate::PayeePubKey(payee_pk)).into(),
 ExpiryTime(crate::ExpiryTime(std::time::Duration::from_secs(u64::MAX))).into(),
Expand DownExpand Up@@ -1414,4 +1445,18 @@ mod test {
 assert!(parse_is_code_length_err(&too_long));
 assert!(!parse_is_code_length_err(&too_long[..too_long.len() - 1]));
	}

	#[test]
	fn test_payment_hash_from_base32_invalid_len() {
 use crate::PaymentHash;

 // PaymentHash must be 52 base32 characters (32 bytes).
 // Test with 51 characters (too short).
 let input = vec![Fe32::try_from(0).unwrap(); 51];
 assert!(PaymentHash::from_base32(&input).is_err());

 // Test with 53 characters (too long).
 let input = vec![Fe32::try_from(0).unwrap(); 53];
 assert!(PaymentHash::from_base32(&input).is_err());
	}
}
Loading
Loading