From: Devrandom <c1.devrandom@niftybox.net>
Date: Mon, 7 Jun 2021 14:29:39 +0000 (+0200)
Subject: Add proper signet support for invoices
X-Git-Tag: v0.0.98~4^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=rust-lightning;a=commitdiff_plain;h=bac5f4930f78c0aa95f5652bb16dd2cbdca66eca

Add proper signet support for invoices
---

diff --git a/lightning-invoice/src/de.rs b/lightning-invoice/src/de.rs
index 3610bc4b..47557665 100644
--- a/lightning-invoice/src/de.rs
+++ b/lightning-invoice/src/de.rs
@@ -185,6 +185,7 @@ impl FromStr for super::Currency {
 			"tb" => Ok(Currency::BitcoinTestnet),
 			"bcrt" => Ok(Currency::Regtest),
 			"sb" => Ok(Currency::Simnet),
+			"tbs" => Ok(Currency::Signet),
 			_ => Err(ParseError::UnknownCurrency)
 		}
 	}
@@ -774,6 +775,7 @@ mod test {
 		assert_eq!("tb".parse::<Currency>(), Ok(Currency::BitcoinTestnet));
 		assert_eq!("bcrt".parse::<Currency>(), Ok(Currency::Regtest));
 		assert_eq!("sb".parse::<Currency>(), Ok(Currency::Simnet));
+		assert_eq!("tbs".parse::<Currency>(), Ok(Currency::Signet));
 		assert_eq!("something_else".parse::<Currency>(), Err(ParseError::UnknownCurrency))
 	}
 
diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
index 29c093de..064b3626 100644
--- a/lightning-invoice/src/lib.rs
+++ b/lightning-invoice/src/lib.rs
@@ -328,8 +328,11 @@ pub enum Currency {
 	/// Bitcoin regtest
 	Regtest,
 
-	/// Bitcoin simnet/signet
+	/// Bitcoin simnet
 	Simnet,
+
+	/// Bitcoin signet
+	Signet,
 }
 
 /// Tagged field which may have an unknown tag
diff --git a/lightning-invoice/src/ser.rs b/lightning-invoice/src/ser.rs
index 88119267..885ea268 100644
--- a/lightning-invoice/src/ser.rs
+++ b/lightning-invoice/src/ser.rs
@@ -153,6 +153,7 @@ impl Display for Currency {
 			Currency::BitcoinTestnet => "tb",
 			Currency::Regtest => "bcrt",
 			Currency::Simnet => "sb",
+			Currency::Signet => "tbs",
 		};
 		write!(f, "{}", currency_code)
 	}
@@ -473,6 +474,7 @@ mod test {
 		assert_eq!("tb", Currency::BitcoinTestnet.to_string());
 		assert_eq!("bcrt", Currency::Regtest.to_string());
 		assert_eq!("sb", Currency::Simnet.to_string());
+		assert_eq!("tbs", Currency::Signet.to_string());
 	}
 
 	#[test]