From 4b102da1a94c09a222c51b7545926e0dadcec933 Mon Sep 17 00:00:00 2001 From: gluax <16431709+gluax@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:34:22 -0700 Subject: [PATCH 1/2] fix(staking): autocli flag panic fix --- x/staking/autocli.go | 155 +------------------------------------------ 1 file changed, 1 insertion(+), 154 deletions(-) diff --git a/x/staking/autocli.go b/x/staking/autocli.go index 16335d38..0710d013 100644 --- a/x/staking/autocli.go +++ b/x/staking/autocli.go @@ -15,168 +15,15 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions { Query: &autocliv1.ServiceCommandDescriptor{ Service: stakingv1beta.Query_ServiceDesc.ServiceName, RpcCommandOptions: []*autocliv1.RpcCommandOptions{ - { - RpcMethod: "Validators", - Short: "Query for all validators", - Long: "Query details about all validators on a network.", - }, - { - RpcMethod: "Validator", - Use: "validator [validator-addr]", - Short: "Query a validator", - Long: "Query details about an individual validator.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "validator_addr"}, - }, - }, - { - RpcMethod: "ValidatorDelegations", - Use: "delegations-to [validator-addr]", - Short: "Query all delegations made to one validator", - Long: "Query delegations on an individual validator.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - { - ProtoField: "validator_addr", - }, - }, - }, - { - RpcMethod: "ValidatorUnbondingDelegations", - Use: "unbonding-delegations-from [validator-addr]", - Short: "Query all unbonding delegatations from a validator", - Long: "Query delegations that are unbonding _from_ a validator.", - Example: fmt.Sprintf("$ %s query staking unbonding-delegations-from [val-addr]", version.AppName), - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "validator_addr"}, - }, - }, - { - RpcMethod: "Delegation", - Use: "delegation [delegator-addr] [validator-addr]", - Short: "Query a delegation based on address and validator address", - Long: "Query delegations for an individual delegator on an individual validator", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - {ProtoField: "validator_addr"}, - }, - }, - { - RpcMethod: "UnbondingDelegation", - Use: "unbonding-delegation [delegator-addr] [validator-addr]", - Short: "Query an unbonding-delegation record based on delegator and validator address", - Long: "Query unbonding delegations for an individual delegator on an individual validator.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - {ProtoField: "validator_addr"}, - }, - }, - { - RpcMethod: "DelegatorDelegations", - Use: "delegations [delegator-addr]", - Short: "Query all delegations made by one delegator", - Long: "Query delegations for an individual delegator on all validators.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - }, - }, - { - RpcMethod: "DelegatorValidators", - Use: "delegator-validators [delegator-addr]", - Short: "Query all validators info for given delegator address", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - }, - }, - { - RpcMethod: "DelegatorValidator", - Use: "delegator-validator [delegator-addr] [validator-addr]", - Short: "Query validator info for given delegator validator pair", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - {ProtoField: "validator_addr"}, - }, - }, - { - RpcMethod: "DelegatorUnbondingDelegations", - Use: "unbonding-delegations [delegator-addr]", - Short: "Query all unbonding-delegations records for one delegator", - Long: "Query unbonding delegations for an individual delegator.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - }, - }, - { - RpcMethod: "Redelegations", - Use: "redelegation [delegator-addr] [src-validator-addr] [dst-validator-addr]", - Short: "Query a redelegation record based on delegator and a source and destination validator address", - Long: "Query a redelegation record for an individual delegator between a source and destination validator.", - PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "delegator_addr"}, - {ProtoField: "src_validator_addr"}, - {ProtoField: "dst_validator_addr"}, - }, - }, { RpcMethod: "HistoricalInfo", Use: "historical-info [height]", Short: "Query historical info at given height", Example: fmt.Sprintf("$ %s query staking historical-info 5", version.AppName), PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "height"}, + {ProtoField: "height"}, }, - }, - { - RpcMethod: "Pool", - Use: "pool", - Short: "Query the current staking pool values", - Long: "Query values for amounts stored in the staking pool.", - }, - { - RpcMethod: "Params", - Use: "params", - Short: "Query the current staking parameters information", - Long: "Query values set as staking parameters.", - }, }, - }, - Tx: &autocliv1.ServiceCommandDescriptor{ - Service: stakingv1beta.Msg_ServiceDesc.ServiceName, - RpcCommandOptions: []*autocliv1.RpcCommandOptions{ - { - RpcMethod: "Delegate", - Use: "delegate [validator-addr] [amount] --from [delegator_address]", - Short: "Delegate liquid tokens to a validator", - Long: "Delegate an amount of liquid coins to a validator from your wallet.", - Example: fmt.Sprintf("%s tx staking delegate cosmosvaloper... 1000stake --from mykey", version.AppName), - PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "validator_address"}, {ProtoField: "amount"}}, - }, - { - RpcMethod: "BeginRedelegate", - Use: "redelegate [src-validator-addr] [dst-validator-addr] [amount] --from [delegator]", - Short: "Generate multisig signatures for transactions generated offline", - Long: "Redelegate an amount of illiquid staking tokens from one validator to another.", - Example: fmt.Sprintf(`%s tx staking redelegate cosmosvaloper... cosmosvaloper... 100stake --from mykey`, version.AppName), - PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "validator_src_address"}, {ProtoField: "validator_dst_address"}, {ProtoField: "amount"}}, - }, - { - RpcMethod: "Undelegate", - Use: "unbond [validator-addr] [amount] --from [delegator_address]", - Short: "Unbond shares from a validator", - Long: "Unbond an amount of bonded shares from a validator.", - Example: fmt.Sprintf(`%s tx staking unbond cosmosvaloper... 100stake --from mykey`, version.AppName), - PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "validator_address"}, {ProtoField: "amount"}}, - }, - { - RpcMethod: "CancelUnbondingDelegation", - Use: "cancel-unbond [validator-addr] [amount] [creation-height]", - Short: "Cancel unbonding delegation and delegate back to the validator", - Example: fmt.Sprintf(`%s tx staking cancel-unbond cosmosvaloper... 100stake 2 --from mykey`, version.AppName), - PositionalArgs: []*autocliv1.PositionalArgDescriptor{{ProtoField: "validator_address"}, {ProtoField: "amount"}, {ProtoField: "creation_height"}}, - }, - { - RpcMethod: "UpdateParams", - Skip: true, // skipped because authority gated - }, }, EnhanceCustomCommand: false, // use custom commands only until v0.51 }, From 970a7353ce967f58be3b9d0f11ce37cae9b0f1f8 Mon Sep 17 00:00:00 2001 From: gluax <16431709+gluax@users.noreply.github.com> Date: Mon, 18 Mar 2024 13:43:24 -0700 Subject: [PATCH 2/2] fix(staking): fmt fixes --- x/staking/autocli.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/staking/autocli.go b/x/staking/autocli.go index 0710d013..c6d3c98f 100644 --- a/x/staking/autocli.go +++ b/x/staking/autocli.go @@ -21,9 +21,9 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions { Short: "Query historical info at given height", Example: fmt.Sprintf("$ %s query staking historical-info 5", version.AppName), PositionalArgs: []*autocliv1.PositionalArgDescriptor{ - {ProtoField: "height"}, + {ProtoField: "height"}, }, - }, + }, }, EnhanceCustomCommand: false, // use custom commands only until v0.51 },