Merge pull request #43 from TheBlueMatt/2021-12-0.0.104
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
committerGitHub <noreply@github.com>
Tue, 11 Jan 2022 18:44:36 +0000 (18:44 +0000)
LDK 0.0.104

README.md
src/cli.rs
src/main.rs

index 2da36cb3874e64151e68d6ff1847003c843e0fa3..d409800581ea0155a5a937dc4e6ddb1c5063276f 100644 (file)
--- 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.
 
index 8ee046577ff443455f057f1cc582f90d734145e2..a167027f5a85d3de4a70040a6a30db575900d64e 100644 (file)
@@ -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,
index 3959386fd15c5559a413111c8089c3c7edeb05a5..0e18bc03c52af47596608488bbad4cfe807263a4 100644 (file)
@@ -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")