Merge branch 'develop' into cli-updates

PENDING.md

@@ -10,6 +10,8 @@ BREAKING CHANGES
     * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
     * [cli] \#1983 --print-response now defaults to true in commands that create and send a transaction
     * [cli] \#1983 you can now pass --pubkey or --address to gaiacli keys show to return a plaintext representation of the key's address or public key for use with other commands
+    * [cli] \#2014 `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively
+
 
 * Gaia
     * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013)
@@ -43,6 +45,7 @@ IMPROVEMENTS
     * [x/stake] \#2000 Added tests for new staking endpoints
 
 * Gaia CLI  (`gaiacli`)
+    * [cli] #2060 removed `--select` from `block` command
 
 * Gaia
     * [x/stake] [#2023](https://github.com/cosmos/cosmos-sdk/pull/2023) Terminate iteration loop in `UpdateBondedValidators` and `UpdateBondedValidatorsFull` when the first revoked validator is encountered and perform a sanity check. 

client/rpc/block.go

@@ -12,10 +12,6 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const (
-	flagSelect = "select"
-)
-
 //BlockCommand returns the verified block data for a given heights
 func BlockCommand() *cobra.Command {
 	cmd := &cobra.Command{
@@ -27,7 +23,6 @@ func BlockCommand() *cobra.Command {
 	cmd.Flags().StringP(client.FlagNode, "n", "tcp://localhost:26657", "Node to connect to")
 	// TODO: change this to false when we can
 	cmd.Flags().Bool(client.FlagTrustNode, true, "Don't verify proofs for responses")
-	cmd.Flags().StringSlice(flagSelect, []string{"header", "tx"}, "Fields to return (header|txs|results)")
 	return cmd
 }
 
@@ -38,7 +33,6 @@ func getBlock(cliCtx context.CLIContext, height *int64) ([]byte, error) {
 		return nil, err
 	}
 
-	// TODO: actually honor the --select flag!
 	// header -> BlockchainInfo
 	// header, tx -> Block
 	// results -> BlockResults

cmd/gaia/cmd/gaiacli/main.go

@@ -62,18 +62,10 @@ func main() {
 			ibccmd.IBCRelayCmd(cdc),
 		)...)
 
-	advancedCmd := &cobra.Command{
-		Use:   "advanced",
-		Short: "Advanced subcommands",
-	}
-
-	advancedCmd.AddCommand(
+	rootCmd.AddCommand(
 		tendermintCmd,
 		ibcCmd,
 		lcd.ServeCommand(cdc),
-	)
-	rootCmd.AddCommand(
-		advancedCmd,
 		client.LineBreak,
 	)
 

docs/clients/lcd-rest-api.yaml

@@ -2,7 +2,7 @@ swagger: '2.0'
 info:
   version: '1.1.0'
   title: Gaia-Lite (former LCD) to interface with Cosmos BaseServer via REST
-  description: Specification for Gaia-lite provided by `gaiacli advanced rest-server`
+  description: Specification for Gaia-lite provided by `gaiacli rest-server`
 
 tags:
 - name: keys

docs/clients/rest.md

@@ -1,6 +1,6 @@
 # REST
 
-See `gaiacli advanced rest-server --help` for more.
+See `gaiacli rest-server --help` for more.
 
 Also see the 
 [work in progress API specification](https://github.com/cosmos/cosmos-sdk/pull/1314)

docs/validators/validator-setup.md

@@ -89,7 +89,7 @@ gaiacli stake unrevoke \
 Your validator is active if the following command returns anything:
 
 ```bash
-gaiacli advanced tendermint validator-set | grep "$(gaiad tendermint show-validator)"
+gaiacli tendermint validator-set | grep "$(gaiad tendermint show-validator)"
 ```
 
 You should also be able to see your validator on the [Explorer](https://explorecosmos.network/validators). You are looking for the `bech32` encoded `address` in the `~/.gaiad/config/priv_validator.json` file.

networks/remote/ansible/roles/add-lcd/templates/gaiacli.service.j2

@@ -8,7 +8,7 @@ Restart=on-failure
 User=gaiad
 Group=gaiad
 PermissionsStartOnly=true
-ExecStart=/usr/bin/gaiacli advanced rest-server --laddr {{GAIAD_ADDRESS}}
+ExecStart=/usr/bin/gaiacli rest-server --laddr {{GAIAD_ADDRESS}}
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGTERM