From dfd7bd5889fdedd525a85a89230e5593b2f565ba Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Fri, 10 Mar 2023 17:10:01 +0100 Subject: [PATCH 1/5] adding pledge more --- .../src/validator/mixnet/delegators/mod.rs | 6 ++++ .../mixnet/delegators/pledge_more.rs | 29 ++++++++++++++++++ .../mixnet/delegators/vesting_pledge_more.rs | 30 +++++++++++++++++++ .../src/validator/mixnet/delegators/mod.rs | 6 ++++ 4 files changed, 71 insertions(+) create mode 100644 common/commands/src/validator/mixnet/delegators/pledge_more.rs create mode 100644 common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs diff --git a/common/commands/src/validator/mixnet/delegators/mod.rs b/common/commands/src/validator/mixnet/delegators/mod.rs index 61e87f119d..6acdfd1962 100644 --- a/common/commands/src/validator/mixnet/delegators/mod.rs +++ b/common/commands/src/validator/mixnet/delegators/mod.rs @@ -10,6 +10,8 @@ pub mod query_for_delegations; pub mod undelegate_from_mixnode; pub mod vesting_delegate_to_mixnode; pub mod vesting_undelegate_from_mixnode; +pub mod pledge_more; +pub mod vesting_pledge_more; #[derive(Debug, Args)] #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)] @@ -32,4 +34,8 @@ pub enum MixnetDelegatorsCommands { DelegateVesting(vesting_delegate_to_mixnode::Args), /// Undelegate from a mixnode (when originally using locked tokens) UndelegateVesting(vesting_undelegate_from_mixnode::Args), + /// Pledge more + PledgeMore(pledge_more::Args), + /// Pledge more with locked tokens + PledgeMoreVesting(vesting_pledge_more::Args), } diff --git a/common/commands/src/validator/mixnet/delegators/pledge_more.rs b/common/commands/src/validator/mixnet/delegators/pledge_more.rs new file mode 100644 index 0000000000..7270295019 --- /dev/null +++ b/common/commands/src/validator/mixnet/delegators/pledge_more.rs @@ -0,0 +1,29 @@ +// Copyright 2021 - Nym Technologies SA +// SPDX-License-Identifier: Apache-2.0 + +use crate::context::SigningClient; +use clap::Parser; +use log::info; +use nym_mixnet_contract_common::{Coin}; +use validator_client::nyxd::traits::{MixnetSigningClient}; + +#[derive(Debug, Parser)] +pub struct Args { + #[clap(long)] + pub amount: u128, +} + +pub async fn pledge_more(args: Args, client: SigningClient) { + let denom = client.current_chain_details().mix_denom.base.as_str(); + + info!("Starting to pledge more"); + + let coin = Coin::new(args.amount, denom); + + let res = client + .pledge_more( coin.into(), None) + .await + .expect("failed to pledge more!"); + + info!("pledging more: {:?}", res); +} diff --git a/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs b/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs new file mode 100644 index 0000000000..cf9c1042bd --- /dev/null +++ b/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs @@ -0,0 +1,30 @@ +// Copyright 2021 - Nym Technologies SA +// SPDX-License-Identifier: Apache-2.0 + +use clap::Parser; +use log::info; +use nym_mixnet_contract_common::{Coin}; +use validator_client::nyxd::VestingSigningClient; + +use crate::context::SigningClient; + +#[derive(Debug, Parser)] +pub struct Args { + #[clap(long)] + pub amount: u128, +} + +pub async fn vesting_pledge_more(args: Args, client: SigningClient) { + let denom = client.current_chain_details().mix_denom.base.as_str(); + + info!("Starting vesting pledge more"); + + let coin = Coin::new(args.amount, denom); + + let res = client + .vesting_pledge_more(coin.into(), None) + .await + .expect("failed to pledge more!"); + + info!("vesting pledge more: {:?}", res); +} diff --git a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs index 76776b1146..30222de4c8 100644 --- a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs @@ -20,6 +20,12 @@ pub(crate) async fn execute( nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::Delegate(args) => { nym_cli_commands::validator::mixnet::delegators::delegate_to_mixnode::delegate_to_mixnode(args, create_signing_client(global_args, network_details)?).await } + nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::PledgeMore(args) => { + nym_cli_commands::validator::mixnet::delegators::pledge_more::pledge_more(args, create_signing_client(global_args, network_details)?).await + } + nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::PledgeMoreVesting(args) => { + nym_cli_commands::validator::mixnet::delegators::vesting_pledge_more::vesting_pledge_more(args, create_signing_client(global_args, network_details)?).await + } nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::Undelegate(args) => { nym_cli_commands::validator::mixnet::delegators::undelegate_from_mixnode::undelegate_from_mixnode(args, create_signing_client(global_args, network_details)?).await } From c2a871a1a7bb6d8f09c996ca9decb0450b724a34 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Fri, 10 Mar 2023 17:10:27 +0100 Subject: [PATCH 2/5] typo --- .../validator/mixnet/operators/gateway/mod.rs | 8 ++++---- .../validator/mixnet/operators/mixnode/mod.rs | 8 ++++---- .../validator/mixnet/operators/gateways/mod.rs | 2 +- .../validator/mixnet/operators/mixnodes/mod.rs | 2 +- tools/nym-cli/user-docs/fig-spec.ts | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/common/commands/src/validator/mixnet/operators/gateway/mod.rs b/common/commands/src/validator/mixnet/operators/gateway/mod.rs index af658a7876..6eee68243a 100644 --- a/common/commands/src/validator/mixnet/operators/gateway/mod.rs +++ b/common/commands/src/validator/mixnet/operators/gateway/mod.rs @@ -19,10 +19,10 @@ pub struct MixnetOperatorsGateway { pub enum MixnetOperatorsGatewayCommands { /// Bond to a gateway Bond(bond_gateway::Args), - /// Unbound from a gateway - Unbound(unbond_gateway::Args), + /// Unbond from a gateway + Unbond(unbond_gateway::Args), /// Bond to a gateway with locked tokens VestingBond(vesting_bond_gateway::Args), - /// Unbound from a gateway (when originally using locked tokens) - VestingUnbound(vesting_unbond_gateway::Args), + /// Unbond from a gateway (when originally using locked tokens) + VestingUnbond(vesting_unbond_gateway::Args), } diff --git a/common/commands/src/validator/mixnet/operators/mixnode/mod.rs b/common/commands/src/validator/mixnet/operators/mixnode/mod.rs index e608c4c36f..ef988de113 100644 --- a/common/commands/src/validator/mixnet/operators/mixnode/mod.rs +++ b/common/commands/src/validator/mixnet/operators/mixnode/mod.rs @@ -28,10 +28,10 @@ pub enum MixnetOperatorsMixnodeCommands { Settings(settings::MixnetOperatorsMixnodeSettings), /// Bond to a mixnode Bond(bond_mixnode::Args), - /// Unbound from a mixnode - Unbound(unbond_mixnode::Args), + /// Unbond from a mixnode + Unbond(unbond_mixnode::Args), /// Bond to a mixnode with locked tokens BondVesting(vesting_bond_mixnode::Args), - /// Unbound from a mixnode (when originally using locked tokens) - UnboundVesting(vesting_unbond_mixnode::Args), + /// Unbond from a mixnode (when originally using locked tokens) + UnbondVesting(vesting_unbond_mixnode::Args), } diff --git a/tools/nym-cli/src/validator/mixnet/operators/gateways/mod.rs b/tools/nym-cli/src/validator/mixnet/operators/gateways/mod.rs index b7bde45cf3..f55dd56707 100644 --- a/tools/nym-cli/src/validator/mixnet/operators/gateways/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/operators/gateways/mod.rs @@ -13,7 +13,7 @@ pub(crate) async fn execute( nym_cli_commands::validator::mixnet::operators::gateway::MixnetOperatorsGatewayCommands::Bond(args) => { nym_cli_commands::validator::mixnet::operators::gateway::bond_gateway::bond_gateway(args, create_signing_client(global_args, network_details)?).await }, - nym_cli_commands::validator::mixnet::operators::gateway::MixnetOperatorsGatewayCommands::Unbound(_args) => { + nym_cli_commands::validator::mixnet::operators::gateway::MixnetOperatorsGatewayCommands::Unbond(_args) => { nym_cli_commands::validator::mixnet::operators::gateway::unbond_gateway::unbond_gateway(create_signing_client(global_args, network_details)?).await }, _ => unreachable!(), diff --git a/tools/nym-cli/src/validator/mixnet/operators/mixnodes/mod.rs b/tools/nym-cli/src/validator/mixnet/operators/mixnodes/mod.rs index fbe07679fb..8d70aa4387 100644 --- a/tools/nym-cli/src/validator/mixnet/operators/mixnodes/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/operators/mixnodes/mod.rs @@ -26,7 +26,7 @@ pub(crate) async fn execute( nym_cli_commands::validator::mixnet::operators::mixnode::MixnetOperatorsMixnodeCommands::Bond(args) => { nym_cli_commands::validator::mixnet::operators::mixnode::bond_mixnode::bond_mixnode(args, create_signing_client(global_args, network_details)?).await } - nym_cli_commands::validator::mixnet::operators::mixnode::MixnetOperatorsMixnodeCommands::Unbound(args) => { + nym_cli_commands::validator::mixnet::operators::mixnode::MixnetOperatorsMixnodeCommands::Unbond(args) => { nym_cli_commands::validator::mixnet::operators::mixnode::unbond_mixnode::unbond_mixnode(args, create_signing_client(global_args, network_details)?).await } _ => unreachable!(), diff --git a/tools/nym-cli/user-docs/fig-spec.ts b/tools/nym-cli/user-docs/fig-spec.ts index 3fbb1c213a..87bdd0eca1 100644 --- a/tools/nym-cli/user-docs/fig-spec.ts +++ b/tools/nym-cli/user-docs/fig-spec.ts @@ -3803,8 +3803,8 @@ const completion: Fig.Spec = { ], }, { - name: "unbound", - description: "Unbound from a mixnode", + name: "unbond", + description: "Unbond from a mixnode", options: [ { name: "--mnemonic", @@ -3994,8 +3994,8 @@ const completion: Fig.Spec = { ], }, { - name: "unbound-vesting", - description: "Unbound from a mixnode (when originally using locked tokens)", + name: "unbond-vesting", + description: "Unbond from a mixnode (when originally using locked tokens)", options: [ { name: "--gas", @@ -4296,8 +4296,8 @@ const completion: Fig.Spec = { ], }, { - name: "unbound", - description: "Unbound from a gateway", + name: "unbond", + description: "Unbond from a gateway", options: [ { name: "--mnemonic", @@ -4473,8 +4473,8 @@ const completion: Fig.Spec = { ], }, { - name: "vesting-unbound", - description: "Unbound from a gateway (when originally using locked tokens)", + name: "vesting-unbond", + description: "Unbond from a gateway (when originally using locked tokens)", options: [ { name: "--mnemonic", From 82c92501d988992ae074f0f4e5f8d72bfaaf201d Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Mon, 13 Mar 2023 12:01:22 +0100 Subject: [PATCH 3/5] vesting stuff --- tools/nym-cli/src/validator/mixnet/delegators/mod.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs index 30222de4c8..af40520255 100644 --- a/tools/nym-cli/src/validator/mixnet/delegators/mod.rs +++ b/tools/nym-cli/src/validator/mixnet/delegators/mod.rs @@ -20,6 +20,9 @@ pub(crate) async fn execute( nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::Delegate(args) => { nym_cli_commands::validator::mixnet::delegators::delegate_to_mixnode::delegate_to_mixnode(args, create_signing_client(global_args, network_details)?).await } + nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::DelegateVesting(args) => { + nym_cli_commands::validator::mixnet::delegators::vesting_delegate_to_mixnode::vesting_delegate_to_mixnode(args, create_signing_client(global_args, network_details)?).await + } nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::PledgeMore(args) => { nym_cli_commands::validator::mixnet::delegators::pledge_more::pledge_more(args, create_signing_client(global_args, network_details)?).await } @@ -29,6 +32,9 @@ pub(crate) async fn execute( nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::Undelegate(args) => { nym_cli_commands::validator::mixnet::delegators::undelegate_from_mixnode::undelegate_from_mixnode(args, create_signing_client(global_args, network_details)?).await } + nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::UndelegateVesting(args) => { + nym_cli_commands::validator::mixnet::delegators::vesting_undelegate_from_mixnode::vesting_undelegate_from_mixnode(args, create_signing_client(global_args, network_details)?).await + } nym_cli_commands::validator::mixnet::delegators::MixnetDelegatorsCommands::List(args) => { nym_cli_commands::validator::mixnet::delegators::query_for_delegations::execute(args, create_signing_client_with_nym_api(global_args, network_details)?).await } From 30c07712e35a491c92de9338d5bcce6bd9d83201 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Mon, 13 Mar 2023 12:03:38 +0100 Subject: [PATCH 4/5] format --- common/commands/src/validator/mixnet/delegators/mod.rs | 4 ++-- .../commands/src/validator/mixnet/delegators/pledge_more.rs | 6 +++--- .../src/validator/mixnet/delegators/vesting_pledge_more.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/commands/src/validator/mixnet/delegators/mod.rs b/common/commands/src/validator/mixnet/delegators/mod.rs index 6acdfd1962..1fa955c5f7 100644 --- a/common/commands/src/validator/mixnet/delegators/mod.rs +++ b/common/commands/src/validator/mixnet/delegators/mod.rs @@ -6,12 +6,12 @@ use clap::{Args, Subcommand}; pub mod rewards; pub mod delegate_to_mixnode; +pub mod pledge_more; pub mod query_for_delegations; pub mod undelegate_from_mixnode; pub mod vesting_delegate_to_mixnode; -pub mod vesting_undelegate_from_mixnode; -pub mod pledge_more; pub mod vesting_pledge_more; +pub mod vesting_undelegate_from_mixnode; #[derive(Debug, Args)] #[clap(args_conflicts_with_subcommands = true, subcommand_required = true)] diff --git a/common/commands/src/validator/mixnet/delegators/pledge_more.rs b/common/commands/src/validator/mixnet/delegators/pledge_more.rs index 7270295019..b368938515 100644 --- a/common/commands/src/validator/mixnet/delegators/pledge_more.rs +++ b/common/commands/src/validator/mixnet/delegators/pledge_more.rs @@ -4,8 +4,8 @@ use crate::context::SigningClient; use clap::Parser; use log::info; -use nym_mixnet_contract_common::{Coin}; -use validator_client::nyxd::traits::{MixnetSigningClient}; +use nym_mixnet_contract_common::Coin; +use validator_client::nyxd::traits::MixnetSigningClient; #[derive(Debug, Parser)] pub struct Args { @@ -21,7 +21,7 @@ pub async fn pledge_more(args: Args, client: SigningClient) { let coin = Coin::new(args.amount, denom); let res = client - .pledge_more( coin.into(), None) + .pledge_more(coin.into(), None) .await .expect("failed to pledge more!"); diff --git a/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs b/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs index cf9c1042bd..8971053563 100644 --- a/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs +++ b/common/commands/src/validator/mixnet/delegators/vesting_pledge_more.rs @@ -3,7 +3,7 @@ use clap::Parser; use log::info; -use nym_mixnet_contract_common::{Coin}; +use nym_mixnet_contract_common::Coin; use validator_client::nyxd::VestingSigningClient; use crate::context::SigningClient; From adb5ed7c30f016bab9edbb92e779fb9996b4b888 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Mon, 13 Mar 2023 12:14:14 +0100 Subject: [PATCH 5/5] typo fix --- common/commands/src/validator/mixnet/operators/gateway/mod.rs | 4 ++-- common/commands/src/validator/mixnet/operators/mixnode/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/commands/src/validator/mixnet/operators/gateway/mod.rs b/common/commands/src/validator/mixnet/operators/gateway/mod.rs index 4e7159d6c4..1cdd67520b 100644 --- a/common/commands/src/validator/mixnet/operators/gateway/mod.rs +++ b/common/commands/src/validator/mixnet/operators/gateway/mod.rs @@ -24,8 +24,8 @@ pub enum MixnetOperatorsGatewayCommands { Unbond(unbond_gateway::Args), /// Bond to a gateway with locked tokens VestingBond(vesting_bond_gateway::Args), - /// Unbound from a gateway (when originally using locked tokens) - VestingUnbound(vesting_unbond_gateway::Args), + /// Unbond from a gateway (when originally using locked tokens) + VestingUnbond(vesting_unbond_gateway::Args), /// Create base58-encoded payload required for producing valid bonding signature. CreateGatewayBondingSignPayload(gateway_bonding_sign_payload::Args), } diff --git a/common/commands/src/validator/mixnet/operators/mixnode/mod.rs b/common/commands/src/validator/mixnet/operators/mixnode/mod.rs index bd91623041..5ba93b4e29 100644 --- a/common/commands/src/validator/mixnet/operators/mixnode/mod.rs +++ b/common/commands/src/validator/mixnet/operators/mixnode/mod.rs @@ -33,8 +33,8 @@ pub enum MixnetOperatorsMixnodeCommands { Unbond(unbond_mixnode::Args), /// Bond to a mixnode with locked tokens BondVesting(vesting_bond_mixnode::Args), - /// Unbound from a mixnode (when originally using locked tokens) - UnboundVesting(vesting_unbond_mixnode::Args), + /// Unbond from a mixnode (when originally using locked tokens) + UnbondVesting(vesting_unbond_mixnode::Args), /// Create base58-encoded payload required for producing valid bonding signature. CreateMixnodeBondingSignPayload(mixnode_bonding_sign_payload::Args), }