fix testnet4

This commit is contained in:
2026-03-17 21:06:37 -04:00
parent f4358848df
commit 7bd002bf87

View File

@@ -32,7 +32,7 @@ use bal_server::db::{
use bal_server::xpub::new_address_from_xpub; use bal_server::xpub::new_address_from_xpub;
const VERSION: &str = env!("CARGO_PKG_VERSION"); const VERSION: &str = env!("CARGO_PKG_VERSION");
const NETWORKS: [&str; 4] = ["bitcoin", "testnet", "signet", "regtest"]; const NETWORKS: [&str; 5] = ["bitcoin", "testnet", "testnet4", "signet", "regtest"];
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
struct NetConfig { struct NetConfig {
address: String, address: String,
@@ -61,6 +61,7 @@ struct MyConfig {
regtest: NetConfig, regtest: NetConfig,
signet: NetConfig, signet: NetConfig,
testnet: NetConfig, testnet: NetConfig,
testnet4: NetConfig,
mainnet: NetConfig, mainnet: NetConfig,
info: String, info: String,
bind_address: String, bind_address: String,
@@ -98,6 +99,7 @@ impl Default for MyConfig {
regtest: NetConfig::default_network("regtest".to_string(), Network::Regtest), regtest: NetConfig::default_network("regtest".to_string(), Network::Regtest),
signet: NetConfig::default_network("signet".to_string(), Network::Signet), signet: NetConfig::default_network("signet".to_string(), Network::Signet),
testnet: NetConfig::default_network("testnet".to_string(), Network::Testnet), testnet: NetConfig::default_network("testnet".to_string(), Network::Testnet),
testnet4: NetConfig::default_network("testnet4".to_string(), Network::Testnet4),
mainnet: NetConfig::default_network("bitcoin".to_string(), Network::Bitcoin), mainnet: NetConfig::default_network("bitcoin".to_string(), Network::Bitcoin),
bind_address: "127.0.0.1".to_string(), bind_address: "127.0.0.1".to_string(),
bind_port: 9137, bind_port: 9137,
@@ -116,6 +118,7 @@ impl MyConfig {
match param { match param {
"regtest" => &self.regtest, "regtest" => &self.regtest,
"testnet" => &self.testnet, "testnet" => &self.testnet,
"testnet4" => &self.testnet4,
"signet" => &self.signet, "signet" => &self.signet,
_ => &self.mainnet, _ => &self.mainnet,
} }
@@ -625,6 +628,7 @@ fn parse_env(cfg: &Arc<Mutex<MyConfig>>) {
cfg_lock = parse_env_netconfig(cfg_lock, "regtest"); cfg_lock = parse_env_netconfig(cfg_lock, "regtest");
cfg_lock = parse_env_netconfig(cfg_lock, "signet"); cfg_lock = parse_env_netconfig(cfg_lock, "signet");
cfg_lock = parse_env_netconfig(cfg_lock, "testnet"); cfg_lock = parse_env_netconfig(cfg_lock, "testnet");
cfg_lock = parse_env_netconfig(cfg_lock, "testnet4");
drop(parse_env_netconfig(cfg_lock, "bitcoin")); drop(parse_env_netconfig(cfg_lock, "bitcoin"));
} }
fn parse_env_netconfig<'a>( fn parse_env_netconfig<'a>(
@@ -635,6 +639,7 @@ fn parse_env_netconfig<'a>(
"regtest" => &mut cfg_lock.regtest, "regtest" => &mut cfg_lock.regtest,
"signet" => &mut cfg_lock.signet, "signet" => &mut cfg_lock.signet,
"testnet" => &mut cfg_lock.testnet, "testnet" => &mut cfg_lock.testnet,
"testnet4" => &mut cfg_lock.testnet4,
&_ => &mut cfg_lock.mainnet, &_ => &mut cfg_lock.mainnet,
}; };
if let Ok(value) = env::var(format!("BAL_SERVER_{}_ADDRESS", chain.to_uppercase())) { if let Ok(value) = env::var(format!("BAL_SERVER_{}_ADDRESS", chain.to_uppercase())) {