From dbac3ad782d7500f173f1bb492303821928b3c65 Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Thu, 22 Aug 2024 16:54:56 +0200 Subject: [PATCH 1/2] Minor fixes to governance cli/msgs --- crates/apps_lib/src/cli.rs | 26 +++----------------------- crates/governance/src/vp/mod.rs | 3 ++- wasm/vp_implicit/src/lib.rs | 3 ++- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs index 6636224145..1859250770 100644 --- a/crates/apps_lib/src/cli.rs +++ b/crates/apps_lib/src/cli.rs @@ -3379,7 +3379,6 @@ pub mod args { DefaultFn(|| PortId::from_str("transfer").unwrap()), ); pub const PRE_GENESIS: ArgFlag = flag("pre-genesis"); - pub const PROPOSAL_ETH: ArgFlag = flag("eth"); pub const PROPOSAL_PGF_STEWARD: ArgFlag = flag("pgf-stewards"); pub const PROPOSAL_PGF_FUNDING: ArgFlag = flag("pgf-funding"); pub const PROTOCOL_KEY: ArgOpt = arg_opt("protocol-key"); @@ -5609,15 +5608,6 @@ pub mod args { .arg(DATA_PATH.def().help(wrap!( "The data path file (json) that describes the proposal." ))) - .arg( - PROPOSAL_ETH - .def() - .help(wrap!("Flag if the proposal is of type eth.")) - .conflicts_with_all([ - PROPOSAL_PGF_FUNDING.name, - PROPOSAL_PGF_STEWARD.name, - ]), - ) .arg( PROPOSAL_PGF_STEWARD .def() @@ -5625,10 +5615,7 @@ pub mod args { "Flag if the proposal is of type pgf-stewards. \ Used to elect/remove stewards." )) - .conflicts_with_all([ - PROPOSAL_ETH.name, - PROPOSAL_PGF_FUNDING.name, - ]), + .conflicts_with(PROPOSAL_PGF_FUNDING.name), ) .arg( PROPOSAL_PGF_FUNDING @@ -5637,10 +5624,7 @@ pub mod args { "Flag if the proposal is of type pgf-funding. \ Used to control continuous/retro PGF fundings." )) - .conflicts_with_all([ - PROPOSAL_ETH.name, - PROPOSAL_PGF_STEWARD.name, - ]), + .conflicts_with(PROPOSAL_PGF_STEWARD.name), ) } } @@ -5685,11 +5669,7 @@ pub mod args { fn def(app: App) -> App { app.add_args::>() - .arg( - PROPOSAL_ID_OPT - .def() - .help(wrap!("The proposal identifier.")), - ) + .arg(PROPOSAL_ID.def().help(wrap!("The proposal identifier."))) .arg(PROPOSAL_VOTE.def().help(wrap!( "The vote for the proposal. Either yay, nay, or abstain." ))) diff --git a/crates/governance/src/vp/mod.rs b/crates/governance/src/vp/mod.rs index 26d105ef34..31865cc52b 100644 --- a/crates/governance/src/vp/mod.rs +++ b/crates/governance/src/vp/mod.rs @@ -373,7 +373,8 @@ where if !is_delegator { return Err(native_vp::Error::new_alloc(format!( - "Address {voter} is neither a validator nor a delegator." + "Address {voter} is neither a validator nor a delegator at \ + the beginning of epoch {pre_voting_start_epoch}." )) .into()); } diff --git a/wasm/vp_implicit/src/lib.rs b/wasm/vp_implicit/src/lib.rs index f8f0784544..c04a1c8127 100644 --- a/wasm/vp_implicit/src/lib.rs +++ b/wasm/vp_implicit/src/lib.rs @@ -24,7 +24,8 @@ fn validate_tx( verifiers: BTreeSet
, ) -> VpResult { debug_log!( - "vp_user called with user addr: {}, key_changed: {:?}, verifiers: {:?}", + "vp_implicit called with user addr: {}, key_changed: {:?}, verifiers: \ + {:?}", addr, keys_changed, verifiers From ff6b06fc01aa85e6478f2fb313c8fdd0dc9cbe52 Mon Sep 17 00:00:00 2001 From: Marco Granelli Date: Thu, 22 Aug 2024 17:00:42 +0200 Subject: [PATCH 2/2] Changelog #3689 --- .changelog/unreleased/improvements/3689-misc-gov-fixes.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .changelog/unreleased/improvements/3689-misc-gov-fixes.md diff --git a/.changelog/unreleased/improvements/3689-misc-gov-fixes.md b/.changelog/unreleased/improvements/3689-misc-gov-fixes.md new file mode 100644 index 0000000000..8d0af22279 --- /dev/null +++ b/.changelog/unreleased/improvements/3689-misc-gov-fixes.md @@ -0,0 +1,2 @@ +- Improved some governance messages and cli commands arguments. + ([\#3689](https://github.com/anoma/namada/pull/3689)) \ No newline at end of file