Skip to content

Commit

Permalink
fix: rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
mateuszjasiuk committed Nov 2, 2023
1 parent d2a5cf9 commit 34bfb7d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion packages/ledger-namada/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@zondax/ledger-namada",
"name": "@namada/ledger-namada",
"author": "Zondax AG",
"license": "Apache-2.0",
"version": "0.0.1",
Expand Down
15 changes: 4 additions & 11 deletions packages/shared/lib/src/sdk/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -353,28 +353,21 @@ impl Sdk {
vote_proposal_msg: &[u8],
tx_msg: &[u8],
password: Option<String>,
gas_payer: Option<String>,
_gas_payer: Option<String>,
) -> Result<BuiltTx, JsError> {
let (args, faucet_signer) = tx::vote_proposal_tx_args(vote_proposal_msg, tx_msg, password)?;

let voter = args.voter.clone();
let default_signer = faucet_signer.clone().or(Some(voter.clone()));

let (signing_data, fee_payer) = self
.signing_data_and_fee_payer(&args.tx, Some(voter), default_signer, gas_payer)
.await?;

let epoch = query_epoch(&self.client).await?;
let namada = self.get_namada();

let (tx, _, _) = build_vote_proposal(&namada, &args, epoch)
let (tx, signing_data, _) = build_vote_proposal(&namada, &args, epoch)
.await

.map_err(JsError::from)?;

Ok(BuiltTx {
tx,
signing_data,
is_faucet_transfer: false,
is_faucet_transfer: faucet_signer.is_some(),
})
}

Expand Down

0 comments on commit 34bfb7d

Please sign in to comment.