need unsafe-dont-encrypt arg for testing

anoma · Dec 1, 2023 · bff9734 · bff9734
1 parent 4cabebc
commit bff9734
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/apps/src/lib/cli.rs b/apps/src/lib/cli.rs
@@ -5175,6 +5175,7 @@ pub mod args {
                 consensus_key: self
                     .consensus_key
                     .map(|x| chain_ctx.get_cached(&x)),
+                unsafe_dont_encrypt: self.unsafe_dont_encrypt,
                 tx_code_path: self.tx_code_path.to_path_buf(),
             }
         }
@@ -5185,11 +5186,13 @@ pub mod args {
             let tx = Tx::parse(matches);
             let validator = VALIDATOR.parse(matches);
             let consensus_key = VALIDATOR_CONSENSUS_KEY.parse(matches);
+            let unsafe_dont_encrypt = UNSAFE_DONT_ENCRYPT.parse(matches);
             let tx_code_path = PathBuf::from(TX_CHANGE_CONSENSUS_KEY_WASM);
             Self {
                 tx,
                 validator,
                 consensus_key,
+                unsafe_dont_encrypt,
                 tx_code_path,
             }
         }
@@ -5203,6 +5206,10 @@ pub mod args {
                     "The desired new consensus key. A new one will be \
                      generated if none given. Note this key must be ed25519.",
                 ))
+                .arg(UNSAFE_DONT_ENCRYPT.def().help(
+                    "UNSAFE: Do not encrypt the generated keypairs. Do not \
+                     use this for keys used in a live network.",
+                ))
         }
     }
 

diff --git a/apps/src/lib/client/tx.rs b/apps/src/lib/client/tx.rs
@@ -345,6 +345,7 @@ pub async fn submit_change_consensus_key<'a>(
         tx: tx_args,
         validator,
         consensus_key,
+        unsafe_dont_encrypt,
         tx_code_path: _,
     }: args::ConsensusKeyChange,
 ) -> Result<(), error::Error> {
@@ -392,7 +393,8 @@ pub async fn submit_change_consensus_key<'a>(
         })
         .unwrap_or_else(|| {
             display_line!(namada.io(), "Generating new consensus key...");
-            let password = read_and_confirm_encryption_password(false);
+            let password =
+                read_and_confirm_encryption_password(unsafe_dont_encrypt);
             wallet
                 .gen_store_secret_key(
                     // Note that TM only allows ed25519 for consensus key

diff --git a/sdk/src/args.rs b/sdk/src/args.rs
@@ -1363,6 +1363,8 @@ pub struct ConsensusKeyChange<C: NamadaTypes = SdkTypes> {
     pub validator: C::Address,
     /// New consensus key
     pub consensus_key: Option<C::Keypair>,
+    /// Don't encrypt the keypair
+    pub unsafe_dont_encrypt: bool,
     /// Path to the TX WASM code file
     pub tx_code_path: PathBuf,
 }

diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs
@@ -321,6 +321,7 @@ pub trait Namada<'a>: Sized {
             validator,
             consensus_key: None,
             tx_code_path: PathBuf::from(TX_CHANGE_CONSENSUS_KEY_WASM),
+            unsafe_dont_encrypt: false,
             tx: self.tx_builder(),
         }
     }

diff --git a/tests/src/e2e/ledger_tests.rs b/tests/src/e2e/ledger_tests.rs
@@ -3738,8 +3738,11 @@ fn change_consensus_key() -> Result<()> {
         "change-consensus-key",
         "--validator",
         "validator-0",
+        "--signing-keys",
+        "validator-0-validator-key",
         "--node",
         &validator_0_rpc,
+        "--unsafe-dont-encrypt",
     ];
     let mut client =
         run_as!(test, Who::Validator(0), Bin::Client, tx_args, Some(40))?;