construct payload directly

Author: futurepaul

lightning-invoice/src/de.rs

@@ -555,7 +555,6 @@ 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,
@@ -567,15 +566,13 @@ impl FromBase32 for Fallback {
 					Ok(pkh) => pkh,
 					Err(bitcoin_hashes::Error::InvalidLength(_, _)) => return Err(ParseError::InvalidPubKeyHashLength),
 				};
-
 				Ok(Fallback::PubKeyHash(pkh))
 			}
 			18 => {
 				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)

lightning-invoice/src/lib.rs

@@ -48,8 +48,8 @@ use bech32::u5;
 use bitcoin::Address;
 use bitcoin::Network;
 use bitcoin::PubkeyHash;
-use bitcoin::Script;
 use bitcoin::ScriptHash;
+use bitcoin::util::address::Payload;
 use bitcoin::util::address::WitnessVersion;
 use bitcoin_hashes::Hash;
 use bitcoin_hashes::sha256;
@@ -1273,20 +1273,20 @@ impl Invoice {
 				Currency::Simnet => Network::Regtest,
 				Currency::Signet => Network::Signet,
 			};
-		
-			let script = match fallback {
+
+			let payload = match fallback {
 				Fallback::SegWitProgram { version, program } => {
-					Script::new_witness_program(*version, program.as_slice())
+					Payload::WitnessProgram { version: *version, program: program.to_vec() }
 				}
 				Fallback::PubKeyHash(pkh) => {
-					Script::new_p2pkh(pkh)
+					Payload::PubkeyHash(*pkh)
 				}
 				Fallback::ScriptHash(sh) => {
-					Script::new_p2sh(sh)
+					Payload::ScriptHash(*sh)
 				}
 			};
-		
-			Address::from_script(&script, network).unwrap()
+
+			Address { payload, network }
 		}).collect()
 	}
 
@@ -1599,6 +1599,7 @@ impl<'de> Deserialize<'de> for Invoice {
 
 #[cfg(test)]
 mod test {
+	use bitcoin::Script;
 	use bitcoin_hashes::hex::FromHex;
 	use bitcoin_hashes::sha256;
 
@@ -1991,7 +1992,6 @@ mod test {
 		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(),