From 3aae3f65f302ab85b8975cc2d337b8b38434216f Mon Sep 17 00:00:00 2001 From: Aleksandr Karbyshev Date: Tue, 12 Sep 2023 17:27:14 +0200 Subject: [PATCH 1/3] Respect force option for proposal vote transactions --- shared/src/ledger/tx.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/shared/src/ledger/tx.rs b/shared/src/ledger/tx.rs index 5ebc7f52bb..ac55a9e130 100644 --- a/shared/src/ledger/tx.rs +++ b/shared/src/ledger/tx.rs @@ -1154,9 +1154,13 @@ pub async fn build_vote_proposal< let is_validator = rpc::is_validator(client, &voter).await?; if !proposal.can_be_voted(epoch, is_validator) { - return Err(Error::from(TxError::InvalidProposalVotingPeriod( - proposal_id, - ))); + if tx.force { + eprintln!("Invalid proposal {} vote period.", proposal_id); + } else { + return Err(Error::from(TxError::InvalidProposalVotingPeriod( + proposal_id, + ))); + } } let delegations = rpc::get_delegators_delegation_at( From b5017b4a9fd36153e3805fa77852a5f26b6561e9 Mon Sep 17 00:00:00 2001 From: Aleksandr Karbyshev Date: Tue, 12 Sep 2023 17:28:06 +0200 Subject: [PATCH 2/3] Fix typo --- shared/src/ledger/tx.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/src/ledger/tx.rs b/shared/src/ledger/tx.rs index ac55a9e130..8cc3fd872f 100644 --- a/shared/src/ledger/tx.rs +++ b/shared/src/ledger/tx.rs @@ -1728,7 +1728,7 @@ pub async fn build_transfer< // inner tx will fail, so abort tx creation if fee_unshield_epoch != transfer_unshield_epoch && !args.tx.force { return Err(Error::Other( - "Fee unshilding masp tx and inner tx masp transaction \ + "Fee unshielding masp tx and inner tx masp transaction \ were crafted on an epoch boundary" .to_string(), )); From d993c23a484411ac6f3c2d757d9d8fd55a101682 Mon Sep 17 00:00:00 2001 From: Aleksandr Karbyshev Date: Tue, 12 Sep 2023 19:13:21 +0200 Subject: [PATCH 3/3] Add changelog --- .changelog/unreleased/bug-fixes/1889-respect-force-option.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/bug-fixes/1889-respect-force-option.md diff --git a/.changelog/unreleased/bug-fixes/1889-respect-force-option.md b/.changelog/unreleased/bug-fixes/1889-respect-force-option.md new file mode 100644 index 0000000000..00a182dfb7 --- /dev/null +++ b/.changelog/unreleased/bug-fixes/1889-respect-force-option.md @@ -0,0 +1,2 @@ +- Respect force option for proposal vote transaction + ([\#1889](https://github.com/anoma/namada/pull/1889)) \ No newline at end of file