WIP: signet bump

romanz · Nov 5, 2020 · fac0da4 · fac0da4 · romanz · Nov 5, 2020
1 parent 63210c8
commit fac0da4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/electrs_index/Cargo.toml b/electrs_index/Cargo.toml
@@ -9,8 +9,8 @@ default = ["rocksdb/snappy", "rocksdb/lz4", "rocksdb/zstd", "rocksdb/zlib", "roc
 
 [dependencies]
 anyhow = "1.0"
-bitcoin = { version = "0.25", features = ["use-serde"] }
-bitcoincore-rpc = "0.12"
+bitcoin = { git = "https://github.com/rust-bitcoin/rust-bitcoin", rev = "93df7cbd3e02961835d250cf606e65b6826b78fe", features = ["use-serde"] }
+bitcoincore-rpc = { git = "https://github.com/romanz/rust-bitcoincore-rpc", rev = "e6848320ecf8be76a2a980919acc58e64a8b66eb" }
 chrono = "0.4"
 clap = "2.33"
 env_logger = "0.7"

diff --git a/electrs_index/src/config.rs b/electrs_index/src/config.rs
@@ -24,7 +24,7 @@ impl Config {
             .arg(
                 Arg::with_name("network")
                     .long("network")
-                    .help("mainnet/testnet/regtest")
+                    .help("mainnet/testnet/regtest/signet")
                     .required(true)
                     .takes_value(true),
             )
@@ -54,27 +54,31 @@ impl Config {
             "mainnet" => Network::Bitcoin,
             "testnet" => Network::Testnet,
             "regtest" => Network::Regtest,
-            _ => panic!("unknown network"),
+            "signet" => Network::Signet,
+            _ => panic!("unknown network: {}", network_str),
         };
 
         let electrum_port = match network {
             Network::Bitcoin => 50001,
             Network::Testnet => 60001,
             Network::Regtest => 60401,
+            Network::Signet => 60601,
         };
         let electrum_rpc_addr: SocketAddr = ([127, 0, 0, 1], electrum_port).into();
 
         let daemon_port = match network {
             Network::Bitcoin => 8332,
             Network::Testnet => 18332,
             Network::Regtest => 18443,
+            Network::Signet => 38332,
         };
         let daemon_rpc_addr: SocketAddr = ([127, 0, 0, 1], daemon_port).into();
 
         let monitoring_port = match network {
             Network::Bitcoin => 4224,
             Network::Testnet => 14224,
             Network::Regtest => 24224,
+            Network::Signet => 34224,
         };
         let monitoring_addr: SocketAddr = ([127, 0, 0, 1], monitoring_port).into();
 
@@ -83,6 +87,7 @@ impl Config {
             Network::Bitcoin => daemon_dir,
             Network::Testnet => daemon_dir.join("testnet3"),
             Network::Regtest => daemon_dir.join("regtest"),
+            Network::Signet => daemon_dir.join("signet"),
         };
 
         let low_memory = matches.is_present("low-memory");