From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 11 Jan 2022 18:44:36 +0000 (+0000)
Subject: Merge pull request #43 from TheBlueMatt/2021-12-0.0.104
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=86a474d8acb1d8495307a38517dfc53b805d3b9b;hp=d3973deefbb6866a99699a2de3f80c66254e99cc;p=ldk-sample

Merge pull request #43 from TheBlueMatt/2021-12-0.0.104

LDK 0.0.104
---

diff --git a/README.md b/README.md
index 2da36cb..d409800 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ cargo run <bitcoind-rpc-username>:<bitcoind-rpc-password>@<bitcoind-rpc-host>:<b
 ```
 `bitcoind`'s RPC username and password likely can be found through `cat ~/.bitcoin/.cookie`.
 
-`bitcoin-network`: defaults to `testnet`. Options: `testnet`, `regtest`.
+`bitcoin-network`: defaults to `testnet`. Options: `testnet`, `regtest`, and `signet`.
 
 `ldk-peer-listening-port`: defaults to 9735.
 
diff --git a/src/cli.rs b/src/cli.rs
index 8ee0465..a167027 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -85,8 +85,9 @@ pub(crate) fn parse_startup_args() -> Result<LdkUserInfo, ()> {
 	let network: Network = match env::args().skip(arg_idx).next().as_ref().map(String::as_str) {
 		Some("testnet") => Network::Testnet,
 		Some("regtest") => Network::Regtest,
+		Some("signet") => Network::Signet,
 		Some(net) => {
-			panic!("Unsupported network provided. Options are: `regtest`, `testnet`. Got {}", net);
+			panic!("Unsupported network provided. Options are: `regtest`, `testnet`, and `signet`. Got {}", net);
 		}
 		None => Network::Testnet,
 	};
@@ -640,7 +641,7 @@ fn get_invoice(
 		Network::Bitcoin => Currency::Bitcoin,
 		Network::Testnet => Currency::BitcoinTestnet,
 		Network::Regtest => Currency::Regtest,
-		Network::Signet => panic!("Signet unsupported"),
+		Network::Signet => Currency::Signet,
 	};
 	let invoice = match utils::create_invoice_from_channelmanager(
 		&channel_manager,
diff --git a/src/main.rs b/src/main.rs
index 3959386..0e18bc0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -128,7 +128,7 @@ async fn handle_ldk_events(
 					Network::Bitcoin => bitcoin_bech32::constants::Network::Bitcoin,
 					Network::Testnet => bitcoin_bech32::constants::Network::Testnet,
 					Network::Regtest => bitcoin_bech32::constants::Network::Regtest,
-					Network::Signet => panic!("Signet unsupported"),
+					Network::Signet => bitcoin_bech32::constants::Network::Signet,
 				},
 			)
 			.expect("Lightning funding tx should always be to a SegWit output")