GH-598: merged master in

Author: bertllll

.gitignore

@@ -59,6 +59,7 @@ Temporary Items
 **/.idea/markdown-navigator/**
 **/.idea/aws.xml
 **/.idea/scopes/*.xml
+**/.idea/copilot*
 
 # Sensitive or high-churn files:
 **/.idea/**/dataSources/

automap/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "automap"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Library full of code to make routers map ports through firewalls"

automap/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dns_utility"
-version = "0.9.0"
+version = "0.9.1"
 license = "GPL-3.0-only"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
 copyright = "Copyright (c) 2019, MASQ (https://masq.ai) and/or its affiliates. All rights reserved."

dns_utility/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ip_country"
-version = "0.1.0"
+version = "0.9.1"
 edition = "2021"
 license = "GPL-3.0-only"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]

dns_utility/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "masq"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Reference implementation of user interface for MASQ Node"

ip_country/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "masq_lib"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
 license = "GPL-3.0-only"
 description = "Code common to Node and masq; also, temporarily, to dns_utility"

masq/Cargo.toml

@@ -7,7 +7,7 @@ use crate::constants::{
     POLYGON_MAINNET_FULL_IDENTIFIER,
 };
 use crate::crash_point::CrashPoint;
-use clap::{App, Arg};
+use clap::{arg_enum, App, Arg};
 use lazy_static::lazy_static;
 
 pub const BLOCKCHAIN_SERVICE_HELP: &str =
@@ -81,6 +81,17 @@ pub const NEIGHBORS_HELP: &str = "One or more Node descriptors for running Nodes
      if you don't specify a neighbor, your Node will start without being connected to any MASQ \
      Network, although other Nodes will be able to connect to yours if they know your Node's descriptor. \
      --neighbors is meaningless in --neighborhood-mode zero-hop.";
+pub const NEW_PUBLIC_KEY_HELP: &str = "Whenever you start it, the Node will try to use the same public key \
+     it used last time. That's '--new-public-key off'. If you want it to select a new public key when it \
+     starts, then specify '--new-public-key on', and you'll get a different one this time...which it will \
+     reuse next time unless you specify '--new-public-key on' again.\n\n\
+     You should be careful about restarting your Node with the same public key too quickly. If your new \
+     Node tries to join the Network before the Network has forgotten your old Node, every Node you try \
+     to connect to will ignore you.\n\n\
+     There are some conditions under which the Node cannot use the same public key it used last time: \
+     for example, if there was no last time, or if you don't specify a `--db-password`. Normally, in \
+     these situations, the Node will select a new public key and store it for future use; but if you \
+     explicitly demand the old public key with `--new-public-key off`, the Node will refuse to start.";
 
 // generated valid encoded keys for future needs
 // UJNoZW5p/PDVqEjpr3b+8jZ/93yPG8i5dOAgE1bhK+A
@@ -225,6 +236,14 @@ lazy_static! {
        DEFAULT_GAS_PRICE);
 }
 
+arg_enum! {
+    #[derive(Debug, PartialEq, Eq, Clone, Copy)]
+    pub enum OnOff {
+        On,
+        Off,
+    }
+}
+
 // These Args are needed in more than one clap schema. To avoid code duplication, they're defined here and referred
 // to from multiple places.
 pub fn chain_arg<'a>() -> Arg<'a, 'a> {
@@ -466,13 +485,23 @@ pub fn shared_app(head: App<'static, 'static>) -> App<'static, 'static> {
             .min_values(0)
             .help(NEIGHBORS_HELP),
     )
+    .arg(
+        Arg::with_name("new-public-key")
+            .long("new-public-key")
+            .value_name("NEW-PUBLIC-KEY")
+            .takes_value(true)
+            .possible_values(&OnOff::variants())
+            .case_insensitive(true)
+            .help(NEW_PUBLIC_KEY_HELP),
+    )
     .arg(real_user_arg())
     .arg(
         Arg::with_name("scans")
             .long("scans")
             .value_name("SCANS")
             .takes_value(true)
-            .possible_values(&["on", "off"])
+            .possible_values(&OnOff::variants())
+            .case_insensitive(true)
             .help(SCANS_HELP),
     )
     .arg(common_parameter_with_separate_u64_values(

masq_lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "multinode_integration_tests"
-version = "0.9.0"
+version = "0.9.1"
 authors = ["Dan Wiebe <dnwiebe@gmail.com>", "MASQ"]
 license = "GPL-3.0-only"
 description = ""