add support for testnet4

Author: zoedberg

README.md

@@ -116,11 +116,13 @@ When unlocking regtest nodes use the following local services:
 
 ### Testnet
 
-When running the node on the testnet network the docker services are not needed
+#### Testnet3
+
+When running the node on the testnet3 network the docker services are not needed
 because the node will use some public services.
 
-Here's an example of how to start three testnet nodes, each one using the
-external testnet services:
+Here's an example of how to start three testnet3 nodes, each one using the
+external testnet3 services:
 
 ```sh
 # 1st shell
@@ -139,14 +141,21 @@ rgb-lightning-node dataldk2/ --daemon-listening-port 3003 \
     --disable-authentication
 ```
 
-When unlocking testnet nodes you can use the following services:
+When unlocking testnet3 nodes you can use the following services:
 - bitcoind_rpc_username: user
 - bitcoind_rpc_username: password
 - bitcoind_rpc_host: electrum.iriswallet.com
 - bitcoind_rpc_port: 18332
 - indexer_url: ssl://electrum.iriswallet.com:50013
 - proxy_endpoint: rpcs://proxy.iriswallet.com/0.2/json-rpc
 
+#### Testnet4
+
+To run testnet4 use the same options as testnet3 except for:
+- CLI arg: `--network testnet4`
+- bitcoind_rpc_port: 18443
+- indexer_url: ssl://electrum.iriswallet.com:50053
+
 ## Use
 
 Once daemons are running, they can be operated via REST JSON APIs.

openapi.yaml

@@ -1208,6 +1208,7 @@ components:
       enum:
         - Mainnet
         - Testnet
+        - Testnet4
         - Signet
         - Regtest
     BlockTime:

src/ldk.rs

@@ -94,7 +94,8 @@ use crate::swap::SwapData;
 use crate::utils::{
     check_port_is_available, connect_peer_if_necessary, do_connect_peer, get_current_timestamp,
     hex_str, AppState, StaticState, UnlockedAppState, ELECTRUM_URL_MAINNET, ELECTRUM_URL_REGTEST,
-    ELECTRUM_URL_SIGNET, ELECTRUM_URL_TESTNET, PROXY_ENDPOINT_LOCAL, PROXY_ENDPOINT_PUBLIC,
+    ELECTRUM_URL_SIGNET, ELECTRUM_URL_TESTNET, ELECTRUM_URL_TESTNET4, PROXY_ENDPOINT_LOCAL,
+    PROXY_ENDPOINT_PUBLIC,
 };
 
 pub(crate) const FEE_RATE: u64 = 7;
@@ -518,10 +519,11 @@ async fn handle_ldk_events(
                 output_script.as_bytes(),
                 match static_state.network {
                     BitcoinNetwork::Mainnet => bitcoin_bech32::constants::Network::Bitcoin,
-                    BitcoinNetwork::Testnet => bitcoin_bech32::constants::Network::Testnet,
+                    BitcoinNetwork::Testnet | BitcoinNetwork::Testnet4 => {
+                        bitcoin_bech32::constants::Network::Testnet
+                    }
                     BitcoinNetwork::Regtest => bitcoin_bech32::constants::Network::Regtest,
                     BitcoinNetwork::Signet => bitcoin_bech32::constants::Network::Signet,
-                    _ => todo!(),
                 },
             )
             .expect("Lightning funding tx should always be to a SegWit output");
@@ -1472,9 +1474,9 @@ pub(crate) async fn start_ldk(
         != match bitcoin_network {
             BitcoinNetwork::Mainnet => "main",
             BitcoinNetwork::Testnet => "test",
+            BitcoinNetwork::Testnet4 => "testnet4",
             BitcoinNetwork::Regtest => "regtest",
             BitcoinNetwork::Signet => "signet",
-            _ => todo!(),
         }
     {
         return Err(APIError::NetworkMismatch(bitcoind_chain, bitcoin_network));
@@ -1494,8 +1496,8 @@ pub(crate) async fn start_ldk(
             BitcoinNetwork::Regtest => ELECTRUM_URL_REGTEST,
             BitcoinNetwork::Signet => ELECTRUM_URL_SIGNET,
             BitcoinNetwork::Testnet => ELECTRUM_URL_TESTNET,
+            BitcoinNetwork::Testnet4 => ELECTRUM_URL_TESTNET4,
             BitcoinNetwork::Mainnet => ELECTRUM_URL_MAINNET,
-            _ => todo!(),
         }
     };
     let proxy_endpoint = if let Some(proxy_endpoint) = &unlock_request.proxy_endpoint {
@@ -1505,11 +1507,11 @@ pub(crate) async fn start_ldk(
     } else {
         tracing::info!("Using the default proxy");
         match bitcoin_network {
-            BitcoinNetwork::Signet | BitcoinNetwork::Testnet | BitcoinNetwork::Mainnet => {
-                PROXY_ENDPOINT_PUBLIC
-            }
+            BitcoinNetwork::Signet
+            | BitcoinNetwork::Testnet
+            | BitcoinNetwork::Testnet4
+            | BitcoinNetwork::Mainnet => PROXY_ENDPOINT_PUBLIC,
             BitcoinNetwork::Regtest => PROXY_ENDPOINT_LOCAL,
-            _ => todo!(),
         }
     };
     let storage_dir_path = app_state.static_state.storage_dir_path.clone();

src/routes.rs

@@ -324,6 +324,7 @@ pub(crate) struct BackupRequest {
 pub(crate) enum BitcoinNetwork {
     Mainnet,
     Testnet,
+    Testnet4,
     Signet,
     Regtest,
 }
@@ -333,6 +334,7 @@ impl From<Network> for BitcoinNetwork {
         match x {
             Network::Bitcoin => Self::Mainnet,
             Network::Testnet => Self::Testnet,
+            Network::Testnet4 => Self::Testnet4,
             Network::Regtest => Self::Regtest,
             Network::Signet => Self::Signet,
             _ => unimplemented!("unsupported network"),
@@ -345,9 +347,9 @@ impl From<RgbLibNetwork> for BitcoinNetwork {
         match x {
             RgbLibNetwork::Mainnet => Self::Mainnet,
             RgbLibNetwork::Testnet => Self::Testnet,
+            RgbLibNetwork::Testnet4 => Self::Testnet4,
             RgbLibNetwork::Regtest => Self::Regtest,
             RgbLibNetwork::Signet => Self::Signet,
-            _ => todo!(),
         }
     }
 }
@@ -2523,10 +2525,9 @@ pub(crate) async fn ln_invoice(
 
         let currency = match state.static_state.network {
             RgbLibNetwork::Mainnet => Currency::Bitcoin,
-            RgbLibNetwork::Testnet => Currency::BitcoinTestnet,
+            RgbLibNetwork::Testnet | RgbLibNetwork::Testnet4 => Currency::BitcoinTestnet,
             RgbLibNetwork::Regtest => Currency::Regtest,
             RgbLibNetwork::Signet => Currency::Signet,
-            _ => todo!(),
         };
         let invoice = match create_invoice_from_channelmanager(
             &unlocked_state.channel_manager,

src/utils.rs

@@ -49,6 +49,7 @@ pub(crate) const LOGS_DIR: &str = "logs";
 pub(crate) const ELECTRUM_URL_REGTEST: &str = "127.0.0.1:50001";
 pub(crate) const ELECTRUM_URL_SIGNET: &str = "ssl://electrum.iriswallet.com:50033";
 pub(crate) const ELECTRUM_URL_TESTNET: &str = "ssl://electrum.iriswallet.com:50013";
+pub(crate) const ELECTRUM_URL_TESTNET4: &str = "ssl://electrum.iriswallet.com:50053";
 pub(crate) const ELECTRUM_URL_MAINNET: &str = "ssl://electrum.iriswallet.com:50003";
 pub(crate) const PROXY_ENDPOINT_LOCAL: &str = "rpc://127.0.0.1:3000/json-rpc";
 pub(crate) const PROXY_ENDPOINT_PUBLIC: &str = "rpcs://proxy.iriswallet.com/0.2/json-rpc";