start better config

Author: Einliterflasche

swap-orchestrator/src/containers.rs

@@ -12,10 +12,10 @@ use crate::{
 
 // Important: don't add slashes or anything here
 // Todo: find better way to do that
-const MONEROD_DATA: &str = "monerod-data";
-const BITCOIN_DATA: &str = "bitcoin-data";
-const ELECTRS_DATA: &str = "electrs-data";
-const ASB_DATA: &str = "asb-data";
+pub const MONEROD_DATA: &str = "monerod-data";
+pub const BITCOIN_DATA: &str = "bitcoin-data";
+pub const ELECTRS_DATA: &str = "electrs-data";
+pub const ASB_DATA: &str = "asb-data";
 
 /// Add all the services/volumes to the compose config
 #[allow(unused_variables)]
@@ -91,19 +91,28 @@ pub fn monerod(
     (monerod_data, monerod_service, monerod_rpc_port)
 }
 
+pub struct BitcoindConfig {
+    enabled: bool,
+    container_name: String,
+    volume_name: String,
+    network: bitcoin::Network,
+    p2p_port: u16,
+    rpc_port: u16,
+}
+
 /// Adds the volume/service to the compose config and returns them + the rpc bind port and p2p bind port
 pub fn bitcoind(
     compose: &mut ComposeConfig,
-    network: bitcoin::Network,
-    enabled: bool,
+    config: BitcoindConfig,
 ) -> (Arc<Volume>, Arc<Service>, u16, u16) {
-    let (rpc_port, p2p_port, chain): (u16, u16, &str) = match network {
-        bitcoin::Network::Bitcoin => (8332, 8333, "main"),
-        bitcoin::Network::Testnet => (18332, 18333, "test"),
+    let chain = match config.network {
+        bitcoin::Network::Bitcoin => "main",
+        bitcoin::Network::Testnet => "test",
         _ => panic!("unsupported bitcoin network"),
     };
+    let (rpc_port, p2p_port) = (config.rpc_port, config.p2p_port);
 
-    let bitcoind_data = compose.add_volume(BITCOIN_DATA);
+    let bitcoind_data = compose.add_volume(config.volume_name);
 
     let bitcoind_command = command!(
         "bitcoind",
@@ -119,38 +128,45 @@ pub fn bitcoind(
     );
 
     let bitcoind = Service::new(
-        "bitcoind",
+        config.container_name,
         ImageSource::from_registry(images::BITCOIND_IMAGE),
     )
     .with_mount(Mount::volume(&bitcoind_data))
     .with_exposed_port(rpc_port)
     .with_exposed_port(p2p_port)
     .with_command(bitcoind_command)
-    .with_enabled(enabled);
+    .with_enabled(config.enabled);
 
     let bitcoind = compose.add_service(bitcoind);
 
     (bitcoind_data, bitcoind, rpc_port, p2p_port)
 }
 
+pub struct ElectrsConfig {
+    enabled: bool,
+    container_name: String,
+    volume_name: String,
+    network: bitcoin::Network,
+    port: u16,
+}
+
 pub fn electrs(
     compose: &mut ComposeConfig,
-    network: bitcoin::Network,
-    enabled: bool,
     bitcoind_rpc_port: u16,
     bitcoind_p2p_port: u16,
     bitcoind: Arc<Service>,
     bitcoind_data: Arc<Volume>,
+    config: ElectrsConfig,
 ) -> (Arc<Volume>, Arc<Service>, u16) {
-    let (port, chain): (u16, &str) = match network {
+    let (port, chain): (u16, &str) = match config.network {
         bitcoin::Network::Bitcoin => (50001, "bitcoin"),
         bitcoin::Network::Testnet => (50001, "testnet"),
         _ => panic!("unsupported bitcoin network"),
     };
 
     let bitcoind_name = bitcoind.name();
 
-    let electrs_data = compose.add_volume(ELECTRS_DATA);
+    let electrs_data = compose.add_volume(config.volume_name);
     let command = command!(
         "electrs",
         flag!("--network={chain}"),
@@ -164,12 +180,15 @@ pub fn electrs(
         flag!("--electrum-rpc-addr=0.0.0.0:{port}"),
         flag!("--log-filters=INFO"),
     );
-    let service = Service::new("electrs", ImageSource::from_registry(images::ELECTRS_IMAGE))
-        .with_dependency(bitcoind.clone())
-        .with_exposed_port(port)
-        .with_command(command)
-        .with_mount(Mount::volume(&electrs_data))
-        .with_enabled(enabled);
+    let service = Service::new(
+        config.container_name,
+        ImageSource::from_registry(images::ELECTRS_IMAGE),
+    )
+    .with_dependency(bitcoind.clone())
+    .with_exposed_port(port)
+    .with_command(command)
+    .with_mount(Mount::volume(&electrs_data))
+    .with_enabled(config.enabled);
 
     let service = compose.add_service(service);
 

swap-orchestrator/src/main.rs

@@ -92,7 +92,8 @@ fn main() {
 /// The complete config, whether to create a full bitcoin/electrum node and whether to create a full monero node
 fn setup_wizard(
     existing_config: Option<Result<Config>>,
-    defaults: Defaults,
+    bitcoin_network: bitcoin::Network,
+    monero_network: monero::Network,
 ) -> Result<(Config, bool, bool)> {
     // If we already have a valid config, just use it and deduce the monero/bitcoin settings
     if let Some(Ok(config)) = existing_config {
@@ -129,9 +130,11 @@ fn setup_wizard(
             .item("Abort and leave my `config.toml` alone")
             .interact()?;
 
-        if choice != 0 {
+
+        if choice == 1 {
+            // user chose to abort
             println!("Stopping wizard. Goodbye!");
-            bail!("User doesn't want to procede.")
+            return Err(anyhow!("User doesn't want to procede."))
         }
 
         std::fs::rename(CONFIG_PATH, &proposed_filename)?;
@@ -152,8 +155,14 @@ fn setup_wizard(
     //  - listen addresses
     //  - tip
 
-    let min_buy = config_prompt::min_buy_amount()?;
-    let max_buy = config_prompt::max_buy_amount()?;
+    let defaults = match (bitcoin_network, monero_network) {
+        (bitcoin::Network::Bitcoin, monero::Network::Mainnet) => Mainnet::get_config_file_defaults()?,
+        (bitcoin::Network::Testnet, monero::Network::Stagenet) => Testnet::get_config_file_defaults()?,
+        (a, b) => bail!("unsupported network combo: Bitcoin::{a} and Monero::{:?}", b)
+    };
+
+    let min_buy_btc = config_prompt::min_buy_amount()?;
+    let max_buy_btc = config_prompt::max_buy_amount()?;
     let markup = config_prompt::ask_spread()?;
     let rendezvous_points = config_prompt::rendezvous_points()?;
     let hidden_service = config_prompt::tor_hidden_service()?;
@@ -162,8 +171,33 @@ fn setup_wizard(
     let monero_node_type = prompt::monero_node_type();
     let electrum_node_type = prompt::electrum_server_type(&defaults.electrum_rpc_urls);
 
+    let electrum_rpc_urls = match electrum_node_type {
+        prompt::ElectrumServerType::Included => vec![],
+    }
+
     let tip = config_prompt::developer_tip()?;
 
+
+    let config = Config {
+        data: Data {
+            dir: PathBuf::from("/").join(containers::ASB_DATA),
+        },
+        network: Network {
+            listen: listen_addresses,
+            rendezvous_point: rendezvous_points,
+            external_addresses: Vec::new(),
+        },
+        maker: Maker {
+            max_buy_btc,
+            min_buy_btc,
+            ask_spread: markup,
+            price_ticker_ws_url: defaults.price_ticker_ws_url,
+            external_bitcoin_redeem_address: None,
+            developer_tip: tip,
+        },
+        bitcoin: Bitcoin { electrum_rpc_urls: , target_block: defaults.bitcoin_confirmation_target, finality_confirmations: None, network: defaults., use_mempool_space_fee_estimation: () }
+    };
+
     bail!("unimplemented")
 }