Skip to content

Commit

Permalink
Address as reference in reveal pk
Browse files Browse the repository at this point in the history
  • Loading branch information
grarco committed Aug 29, 2024
1 parent dff2228 commit 50cbeb6
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions crates/apps_lib/src/client/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,10 @@ pub async fn submit_reveal_aux(
.map_err(|e| error::Error::Other(e.to_string()))?;

if tx::is_reveal_pk_needed(context.client(), address).await? {
// FIXME: rework this message? yes slightly
display_line!(
context.io(),
"Submitting a tx to reveal the public key for address \
{address}..."
{address}"
);
return Ok(Some(
tx::build_reveal_pk(context, args, &public_key).await?,
Expand All @@ -228,16 +227,14 @@ pub async fn submit_reveal_aux(
async fn batch_opt_reveal_pk_and_submit<N: Namada>(
namada: &N,
args: &args::Tx,
// FIXME: references here
owners: &[Address],
owners: &[&Address],
tx_data: (Tx, SigningTxData),
) -> Result<ProcessTxResponse, error::Error>
where
<N::Client as namada_sdk::queries::Client>::Error: std::fmt::Display,
{
let mut batched_tx_data = vec![];

// FIXME: can improve this for loop?
for owner in owners {
if let Some(reveal_pk_tx_data) =
submit_reveal_aux(namada, args, owner).await?
Expand Down Expand Up @@ -268,7 +265,7 @@ pub async fn submit_bridge_pool_tx<N: Namada>(
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
&[args.sender],
&[&args.sender],
bridge_pool_tx_data,
)
.await?;
Expand All @@ -292,7 +289,7 @@ where
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
&[args.owner],
&[&args.owner],
custom_tx_data,
)
.await?;
Expand Down Expand Up @@ -806,7 +803,7 @@ pub async fn submit_transparent_transfer(
tx::dump_tx(namada.io(), &args.tx, transfer_data.0);
} else {
let reveal_pks: Vec<_> =
args.data.into_iter().map(|datum| datum.source).collect();
args.data.iter().map(|datum| &datum.source).collect();
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
Expand Down Expand Up @@ -850,12 +847,8 @@ pub async fn submit_shielding_transfer(
let cmt_hash = tx.commitments().last().unwrap().get_hash();
let wrapper_hash = tx.wrapper_hash();

let reveal_pks: Vec<_> = args
.data
.clone()
.into_iter()
.map(|datum| datum.source)
.collect();
let reveal_pks: Vec<_> =
args.data.iter().map(|datum| &datum.source).collect();
let result = batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
Expand Down Expand Up @@ -924,7 +917,7 @@ where
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
&[args.source.effective_address()],
&[&args.source.effective_address()],
(tx, signing_data),
)
.await?;
Expand Down Expand Up @@ -1033,7 +1026,7 @@ where
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
&[proposal_author],
&[&proposal_author],
proposal_tx_data,
)
.await?;
Expand Down Expand Up @@ -1167,8 +1160,7 @@ where
if args.tx.dump_tx {
tx::dump_tx(namada.io(), &args.tx, submit_bond_tx_data.0);
} else {
let default_address =
args.source.clone().unwrap_or(args.validator.clone());
let default_address = args.source.as_ref().unwrap_or(&args.validator);
batch_opt_reveal_pk_and_submit(
namada,
&args.tx,
Expand Down

0 comments on commit 50cbeb6

Please sign in to comment.