wip: fix reveal pk

apps/src/lib/client/mod.rs

@@ -1,4 +1,3 @@
 pub mod rpc;
-pub mod signing;
 pub mod tx;
 pub mod utils;

apps/src/lib/client/tx.rs

@@ -12,7 +12,7 @@ use masp_proofs::prover::LocalTxProver;
 use namada::core::types::account::AccountPublicKeysMap;
 use namada::ledger::governance::storage as gov_storage;
 use namada::ledger::rpc::{TxBroadcastData, TxResponse};
-use namada::ledger::signing::TxSigningKey;
+use namada::ledger::signing::{find_pk, TxSigningKey};
 use namada::ledger::wallet::{Wallet, WalletUtils};
 use namada::ledger::{masp, pos, signing, tx};
 use namada::proof_of_stake::parameters::PosParams;
@@ -33,7 +33,6 @@ use super::rpc;
 use crate::cli::context::WalletAddress;
 use crate::cli::{args, safe_exit, Context};
 use crate::client::rpc::query_wasm_code_hash;
-use crate::client::signing::find_pk;
 use crate::client::tx::tx::ProcessTxResponse;
 use crate::config::TendermintMode;
 use crate::facade::tendermint_rpc::endpoint::broadcast::tx_sync::Response;
@@ -171,6 +170,7 @@ where
 {
     let (mut tx, addr, public_keys) =
         tx::build_init_account(client, &mut ctx.wallet, args.clone()).await?;
+
     submit_reveal_aux(
         client,
         ctx,
@@ -778,7 +778,7 @@ where
 
     if args.offline {
         let signer = ctx.get(&signer);
-        let key = find_pk(client, &mut ctx.wallet, &signer).await?;
+        let key = find_pk(client, &mut ctx.wallet, &signer, None).await?;
         let signing_key =
             signing::find_key_by_pk(&mut ctx.wallet, &args.tx, &key)?;
         let offline_proposal =
@@ -994,7 +994,8 @@ where
             safe_exit(1)
         }
 
-        let key = find_pk(client, &mut ctx.wallet, &args.voter_address).await?;
+        let key =
+            find_pk(client, &mut ctx.wallet, &args.voter_address, None).await?;
         let signing_key =
             signing::find_key_by_pk(&mut ctx.wallet, &args.tx, &key)?;
         let offline_vote = OfflineVote::new(

shared/src/ledger/signing.rs

@@ -154,17 +154,13 @@ pub async fn tx_signer<
     wallet: &mut Wallet<U>,
     args: &args::Tx,
     default: TxSigningKey,
-) -> Result<(Option<Address>, Vec<common::PublicKey>), Error> {
-    let signer = if args.dry_run {
-        // We cannot override the signer if we're doing a dry run
-        default
-    } else if !&args.signing_keys.is_empty() {
+) -> Result<Vec<common::PublicKey>, Error> {
+    let signer = if !&args.signing_keys.is_empty() {
         let public_keys =
             args.signing_keys.iter().map(|key| key.ref_to()).collect();
-
-        return Ok((None, public_keys));
+        return Ok(public_keys);
     } else if let Some(verification_key) = &args.verification_key {
-        return Ok((None, vec![verification_key.clone()]));
+        return Ok(vec![verification_key.clone()]);
     } else {
         // Otherwise use the signer determined by the caller
         default
@@ -173,15 +169,12 @@ pub async fn tx_signer<
     // Now actually fetch the signing key and apply it
     match signer {
         TxSigningKey::WalletAddress(signer) if signer == masp() => {
-            Ok((None, vec![masp_tx_key().ref_to()]))
+            Ok(vec![masp_tx_key().ref_to()])
         }
-        TxSigningKey::WalletAddress(signer) => Ok((
-            Some(signer.clone()),
-            vec![
-                find_pk::<C, U>(client, wallet, &signer, args.password.clone())
-                    .await?,
-            ],
-        )),
+        TxSigningKey::WalletAddress(signer) => Ok(vec![
+            find_pk::<C, U>(client, wallet, &signer, args.password.clone())
+                .await?,
+        ]),
         TxSigningKey::None => other_err(
             "All transactions must be signed; please either specify the key \
              or the address from which to look up the signing key."

shared/src/ledger/tx.rs

@@ -253,11 +253,11 @@ pub async fn prepare_tx<
     wallet: &mut Wallet<U>,
     args: &args::Tx,
     tx: Tx,
-    _owner: Option<Address>,
+    owner: Option<Address>,
     default_signer: TxSigningKey,
     #[cfg(not(feature = "mainnet"))] requires_pow: bool,
 ) -> Result<(Tx, Option<Address>, Vec<common::PublicKey>), Error> {
-    let (signer_address, signer_public_keys) =
+    let signer_public_keys =
         tx_signer::<C, U>(client, wallet, args, default_signer.clone()).await?;
 
     let fee_payer = match &args.fee_payer {
@@ -275,7 +275,7 @@ pub async fn prepare_tx<
     };
 
     if args.dry_run {
-        Ok((tx, signer_address, signer_public_keys))
+        Ok((tx, owner, signer_public_keys))
     } else {
         let epoch = rpc::query_epoch(client).await;
         Ok((
@@ -290,7 +290,7 @@ pub async fn prepare_tx<
                 requires_pow,
             )
             .await,
-            signer_address,
+            owner,
             signer_public_keys,
         ))
     }

tests/src/e2e/ledger_tests.rs

@@ -565,8 +565,8 @@ fn ledger_txs_and_queries() -> Result<()> {
             "--node",
             &validator_one_rpc,
         ],
-    // 6. Submit a tx to withdraw from faucet account (requires PoW challenge
-    //    solution)
+        // 6. Submit a tx to withdraw from faucet account (requires PoW challenge
+        //    solution)
         vec![
             "transfer",
             "--source",