Merge pull request #187 from ergoplatform/i184-print-conf

add print-safe-config command to share current config with operators …

Author: greenhat

core/src/cli_commands.rs

@@ -3,6 +3,7 @@ use ergo_lib::ergotree_ir::chain::address::NetworkPrefix;
 pub mod bootstrap;
 pub mod extract_reward_tokens;
 pub mod prepare_update;
+pub mod print_conf;
 pub mod print_reward_tokens;
 pub mod transfer_oracle_token;
 pub mod update_pool;

core/src/cli_commands/print_conf.rs

@@ -0,0 +1,19 @@
+use ergo_lib::ergotree_ir::chain::address::AddressEncoder;
+
+use crate::oracle_config::OracleConfig;
+use crate::serde::OracleConfigSerde;
+
+pub fn print_safe_config(config: &OracleConfig) {
+    let safe_config = OracleConfig {
+        node_ip: "127.0.0.1".to_owned(),
+        node_api_key: "hello".to_owned(),
+        oracle_address: AddressEncoder::unchecked_parse_network_address_from_str(
+            "3Wy3BaCjGDWE3bjjZkNo3aWaMz3cYrePMFhchcKovY9uG9vhpAuW",
+        )
+        .unwrap(),
+        ..config.clone()
+    };
+    let serde_conf = OracleConfigSerde::from(safe_config);
+    let s = serde_yaml::to_string(&serde_conf).unwrap();
+    println!("{s}");
+}

core/src/logging.rs

@@ -33,7 +33,7 @@ fn get_level_filter() -> LevelFilter {
     // }
 }
 
-pub fn setup_log(override_log_level: Option<LevelFilter>) {
+pub fn setup_log(cmdline_log_level: Option<LevelFilter>) {
     let stdout = ConsoleAppender::builder().build();
 
     // via https://stackoverflow.com/questions/56345288/how-do-i-use-log4rs-rollingfileappender-to-incorporate-rolling-logging#
@@ -48,7 +48,17 @@ pub fn setup_log(override_log_level: Option<LevelFilter>) {
     let compound_policy =
         CompoundPolicy::new(Box::new(size_trigger), Box::new(fixed_window_roller));
 
-    let log_level = override_log_level.unwrap_or_else(get_level_filter);
+    let log_level = if let Some(cmdline_log_level) = cmdline_log_level {
+        if cmdline_log_level > get_level_filter() {
+            cmdline_log_level
+        } else {
+            get_level_filter()
+        }
+    } else {
+        get_level_filter()
+    };
+
+    // cmdline_log_level.unwrap_or_else(get_level_filter);
 
     let config = Config::builder()
         .appender(Appender::builder().build("stdout", Box::new(stdout)))

core/src/main.rs

@@ -104,7 +104,7 @@ const APP_VERSION: &str = concat!(
 struct Args {
     #[clap(subcommand)]
     command: Command,
-    /// Increase the verbosity of the output to trace log level overriding the log level in the config file.
+    /// Increase the logging verbosity
     #[clap(short, long)]
     verbose: bool,
     /// Set path of configuration file to use. Default is ./oracle_config.yaml
@@ -181,6 +181,10 @@ enum Command {
 
     /// Print base 64 encodings of the blake2b hash of ergo-tree bytes of each contract
     PrintContractHashes,
+
+    /// Print the current config file with zeroed sensitive/private fields.
+    /// Intended to be shared with pool operators.
+    PrintSafeConfig,
 }
 
 fn main() {
@@ -200,8 +204,6 @@ fn main() {
     };
     logging::setup_log(cmdline_log_level);
 
-    log_on_launch();
-
     #[allow(clippy::wildcard_enum_match_arm)]
     match args.command {
         Command::Bootstrap {
@@ -225,12 +227,14 @@ fn main() {
         Command::PrintContractHashes => {
             print_contract_hashes();
         }
+        Command::PrintSafeConfig => cli_commands::print_conf::print_safe_config(&ORACLE_CONFIG),
         oracle_command => handle_oracle_command(oracle_command),
     }
 }
 
 /// Handle all non-bootstrap commands that require ORACLE_CONFIG/OraclePool
 fn handle_oracle_command(command: Command) {
+    log_on_launch();
     assert_wallet_unlocked(&new_node_interface());
     register_and_save_scans().unwrap();
     let op = OraclePool::new().unwrap();
@@ -337,6 +341,7 @@ fn handle_oracle_command(command: Command) {
             }
         }
         Command::Bootstrap { .. } | Command::PrintContractHashes => unreachable!(),
+        Command::PrintSafeConfig => unreachable!(),
     }
 }
 

core/src/oracle_config.rs

@@ -138,7 +138,7 @@ impl OracleConfig {
             node_port: bootstrap.node_port,
             node_api_key: bootstrap.node_api_key,
             base_fee: bootstrap.base_fee,
-            log_level: None,
+            log_level: Some(LevelFilter::Info),
             core_api_port: bootstrap.core_api_port,
             oracle_address: bootstrap.oracle_address,
             data_point_source: bootstrap.data_point_source,