R4R: Refactor Bech32 Prefixes and Nomenclature of Validator Pubkey and Operator

PENDING.md

@@ -13,10 +13,10 @@ BREAKING CHANGES
     * [cli] [\#2061](https://github.com/cosmos/cosmos-sdk/issues/2061) changed proposalID in governance REST endpoints to proposal-id
     * [cli] [\#2014](https://github.com/cosmos/cosmos-sdk/issues/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
     * [makefile] `get_vendor_deps` no longer updates lock file it just updates vendor directory. Use `update_vendor_deps` to update the lock file. [#2152](https://github.com/cosmos/cosmos-sdk/pull/2152)
+    * [cli] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) All commands that
+    utilize a validator's operator address must now use the new Bech32 prefix,
+    `cosmosvaloper`.
     * [cli] [\#2190](https://github.com/cosmos/cosmos-sdk/issues/2190) `gaiacli init --gen-txs` is now `gaiacli init --with-txs` to reduce confusion
-    * [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) All commands that utilize a validator's address must now use the new
-    bech32 prefix, `cosmosval`. A validator's Tendermint signing key and address
-    now use a new bech32 prefix, `cosmoscons`.
 
 * Gaia
     * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013)
@@ -25,11 +25,15 @@ BREAKING CHANGES
     * [x/stake, x/slashing] [#1305](https://github.com/cosmos/cosmos-sdk/issues/1305) - Rename "revoked" to "jailed"
     * [x/stake] [#1676] Revoked and jailed validators put into the unbonding state
     * [x/stake] [#1877] Redelegations/unbonding-delegation from unbonding validator have reduced time
-    * [x/stake] [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Validator operator type has now changed to `sdk.ValAddress`
-      * A new bech32 prefix has been introduced for Tendermint signing keys and
-        addresses, `cosmosconspub` and `cosmoscons` respectively.
-    * [x/gov] \#2195 Made governance use BFT Time instead of Block Heights for deposit and voting periods.
-
+    * [x/stake] [\#2040](https://github.com/cosmos/cosmos-sdk/issues/2040) Validator
+    operator type has now changed to `sdk.ValAddress`
+    * [x/stake] [\#2221](https://github.com/cosmos/cosmos-sdk/issues/2221) New
+    Bech32 prefixes have been introduced for a validator's consensus address and
+    public key: `cosmosvalcons` and `cosmosvalconspub` respectively. Also, existing Bech32 prefixes have been
+    renamed for accounts and validator operators:
+      * `cosmosaccaddr` / `cosmosaccpub` => `cosmos` / `cosmospub`
+      * `cosmosvaladdr` / `cosmosvalpub` => `cosmosvaloper` / `cosmosvaloperpub`
+
 * SDK
     * [core] [\#1807](https://github.com/cosmos/cosmos-sdk/issues/1807) Switch from use of rational to decimal
     * [types] [\#1901](https://github.com/cosmos/cosmos-sdk/issues/1901) Validator interface's GetOwner() renamed to GetOperator()

client/lcd/lcd_test.go

@@ -206,8 +206,8 @@ func TestValidators(t *testing.T) {
 
 	require.NotEqual(t, rpc.ResultValidatorsOutput{}, resultVals)
 
-	require.Contains(t, resultVals.Validators[0].Address.String(), "cosmosval")
-	require.Contains(t, resultVals.Validators[0].PubKey, "cosmosconspub")
+	require.Contains(t, resultVals.Validators[0].Address.String(), "cosmosvaloper")
+	require.Contains(t, resultVals.Validators[0].PubKey, "cosmosvalconspub")
 
 	// --
 
@@ -461,10 +461,11 @@ func TestValidatorsQuery(t *testing.T) {
 	// make sure all the validators were found (order unknown because sorted by operator addr)
 	foundVal := false
 	pkBech := sdk.MustBech32ifyConsPub(pks[0])
-	if validators[0].PubKey == pkBech {
+	if validators[0].ConsPubKey == pkBech {
 		foundVal = true
 	}
-	require.True(t, foundVal, "pkBech %v, operator %v", pkBech, validators[0].Operator)
+
+	require.True(t, foundVal, "pkBech %v, operator %v", pkBech, validators[0].OperatorAddr)
 }
 
 func TestValidatorQuery(t *testing.T) {
@@ -474,7 +475,7 @@ func TestValidatorQuery(t *testing.T) {
 
 	validator1Operator := sdk.ValAddress(pks[0].Address())
 	validator := getValidator(t, port, validator1Operator)
-	assert.Equal(t, validator.Operator, validator1Operator, "The returned validator does not hold the correct data")
+	assert.Equal(t, validator.OperatorAddr, validator1Operator, "The returned validator does not hold the correct data")
 }
 
 func TestBonding(t *testing.T) {
@@ -510,11 +511,11 @@ func TestBonding(t *testing.T) {
 
 	bondedValidators := getDelegatorValidators(t, port, addr)
 	require.Len(t, bondedValidators, 1)
-	require.Equal(t, validator1Operator, bondedValidators[0].Operator)
+	require.Equal(t, validator1Operator, bondedValidators[0].OperatorAddr)
 	require.Equal(t, validator.DelegatorShares.Add(sdk.NewDec(60)).String(), bondedValidators[0].DelegatorShares.String())
 
 	bondedValidator := getDelegatorValidator(t, port, addr, validator1Operator)
-	require.Equal(t, validator1Operator, bondedValidator.Operator)
+	require.Equal(t, validator1Operator, bondedValidator.OperatorAddr)
 
 	//////////////////////
 	// testing unbonding

client/lcd/test_helpers.go

@@ -151,7 +151,7 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress
 
 	var validatorsPKs []crypto.PubKey
 
-	// NOTE: It's bad practice to reuse public key address for the owner
+	// NOTE: It's bad practice to reuse public key address for the operator
 	// address but doing in the test for simplicity.
 	var appGenTxs []json.RawMessage
 	for _, gdValidator := range genDoc.Validators {

cmd/gaia/app/genesis.go

@@ -205,8 +205,8 @@ func GaiaAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (genesisState
 
 			// create the self-delegation from the issuedDelShares
 			delegation := stake.Delegation{
-				DelegatorAddr: sdk.AccAddress(validator.Operator),
-				ValidatorAddr: validator.Operator,
+				DelegatorAddr: sdk.AccAddress(validator.OperatorAddr),
+				ValidatorAddr: validator.OperatorAddr,
 				Shares:        issuedDelShares,
 				Height:        0,
 			}

cmd/gaia/cli_test/cli_test.go

@@ -178,7 +178,7 @@ func TestGaiaCLICreateValidator(t *testing.T) {
 	require.Equal(t, int64(8), barAcc.GetCoins().AmountOf("steak").Int64(), "%v", barAcc)
 
 	validator := executeGetValidator(t, fmt.Sprintf("gaiacli stake validator %s --output=json %v", sdk.ValAddress(barAddr), flags))
-	require.Equal(t, validator.Operator, sdk.ValAddress(barAddr))
+	require.Equal(t, validator.OperatorAddr, sdk.ValAddress(barAddr))
 	require.True(sdk.DecEq(t, sdk.NewDec(2), validator.Tokens))
 
 	// unbond a single share

cmd/gaia/cmd/gaiadebug/hack.go

@@ -65,7 +65,7 @@ func runHackCmd(cmd *cobra.Command, args []string) error {
 	// The following powerKey was there, but the corresponding "trouble" validator did not exist.
 	// So here we do a binary search on the past states to find when the powerKey first showed up ...
 
-	// owner of the validator the bonds, gets revoked, later unbonds, and then later is still found in the bypower store
+	// operator of the validator the bonds, gets revoked, later unbonds, and then later is still found in the bypower store
 	trouble := hexToBytes("D3DC0FF59F7C3B548B7AFA365561B87FD0208AF8")
 	// this is his "bypower" key
 	powerKey := hexToBytes("05303030303030303030303033FFFFFFFFFFFF4C0C0000FFFED3DC0FF59F7C3B548B7AFA365561B87FD0208AF8")

docs/_attic/WIP-lamborghini-distribution/transactions.md

@@ -213,7 +213,7 @@ Note that the distribution scenario structures are found in `state.md`.
 #### Delegation's entitlement to Global.Pool
 
 For delegations (including validator's self-delegation) all fees from fee pool
-are subject to commission rate from the owner of the validator. The global
+are subject to commission rate from the operator of the validator. The global
 shares should be taken as true number of global bonded shares. The recipients
 shares should be taken as the bonded tokens less the validator's commission.
 

docs/clients/lcd-rest-api.yaml

@@ -714,15 +714,15 @@ definitions:
   ValidatorAddress:
     type: string
     description: bech32 encoded addres
-    example: cosmosval:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
+    example: cosmosvaloper:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
   PubKey:
     type: string
     description: bech32 encoded public key
     example: cosmospub:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
   ValidatorPubKey:
     type: string
     description: bech32 encoded public key
-    example: cosmosvalpub:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
+    example: cosmosvalconspub:zgnkwr7eyyv643dllwfpdwensmgdtz89yu73zq
   Coins:
     type: object
     properties:

docs/sdk/clients.md

@@ -22,17 +22,17 @@ There are three types of key representations that are used:
   - Derived from account keys generated by `gaiacli keys add`
   - Used to receive funds
   - e.g. `cosmos15h6vd5f0wqps26zjlwrc6chah08ryu4hzzdwhc`
-* `cosmosval`
+* `cosmosvaloper`
   * Used to associate a validator to it's operator
   * Used to invoke staking commands
-  * e.g. `cosmosval1carzvgq3e6y3z5kz5y6gxp3wpy3qdrv928vyah`
+  * e.g. `cosmosvaloper1carzvgq3e6y3z5kz5y6gxp3wpy3qdrv928vyah`
 - `cosmospub`
   - Derived from account keys generated by `gaiacli keys add`
   - e.g. `cosmospub1zcjduc3q7fu03jnlu2xpl75s2nkt7krm6grh4cc5aqth73v0zwmea25wj2hsqhlqzm`
-- `cosmosconspub`
+- `cosmosvalconspub`
   - Generated when the node is created with `gaiad init`.
   - Get this value with `gaiad tendermint show-validator`
-  - e.g. `cosmosconspub1zcjduepq0ms2738680y72v44tfyqm3c9ppduku8fs6sr73fx7m666sjztznqzp2emf`
+  - e.g. `cosmosvalconspub1zcjduepq0ms2738680y72v44tfyqm3c9ppduku8fs6sr73fx7m666sjztznqzp2emf`
 
 #### Generate Keys
 

docs/spec/other/bech32.md

@@ -6,14 +6,14 @@ In the Cosmos network, keys and addresses may refer to a number of different rol
 
 ## HRP table
 
-| HRP           | Definition                           |
-|---------------|--------------------------------------|
-| cosmos        | Cosmos Account Address               |
-| cosmospub     | Cosmos Account Public Key            |
-| cosmoscons    | Cosmos Consensus Address             |
-| cosmosconspub | Cosmos Consensus Public Key          |
-| cosmosval     | Cosmos Validator Operator Address    |
-| cosmosvalpub  | Cosmos Validator Operator Public Key |
+| HRP               | Definition                            |
+|-------------------|---------------------------------------|
+| cosmos            | Cosmos Account Address                |
+| cosmospub         | Cosmos Account Public Key             |
+| cosmosvalcons     | Cosmos Validator Consensus Address    |
+| cosmosvalconspub  | Cosmos Validator Consensus Public Key |
+| cosmosvaloper     | Cosmos Validator Operator Address     |
+| cosmosvaloperpub  | Cosmos Validator Operator Public Key  |
 
 ## Encoding
 

docs/spec/staking/state.md

@@ -14,7 +14,7 @@ type Pool struct {
     BondedTokens        int64   // reserve of bonded tokens
     InflationLastTime   int64   // block which the last inflation was processed // TODO make time
     Inflation           sdk.Dec // current annual inflation rate
-    
+
     DateLastCommissionReset int64  // unix timestamp for last commission accounting reset (daily)
 }
 ```
@@ -29,41 +29,40 @@ overall functioning of the stake module.
 ```golang
 type Params struct {
     InflationRateChange sdk.Dec // maximum annual change in inflation rate
-	InflationMax        sdk.Dec // maximum inflation rate
-	InflationMin        sdk.Dec // minimum inflation rate
-	GoalBonded          sdk.Dec // Goal of percent bonded atoms
+    InflationMax        sdk.Dec // maximum inflation rate
+    InflationMin        sdk.Dec // minimum inflation rate
+    GoalBonded          sdk.Dec // Goal of percent bonded atoms
 
-	MaxValidators uint16 // maximum number of validators
-	BondDenom     string // bondable coin denomination
+    MaxValidators uint16 // maximum number of validators
+    BondDenom     string // bondable coin denomination
 }
 ```
 
 ### Validator
 
-Validators are identified according to the `ValOwnerAddr`, 
-an SDK account address for the owner of the validator.
+Validators are identified according to the `OperatorAddr`, an SDK validator
+address for the operator of the validator.
 
-Validators also have a `ValTendermintAddr`, the address 
-of the public key of the validator.
+Validators also have a `ConsPubKey`, the public key of the validator.
 
 Validators are indexed in the store using the following maps:
 
- - Validators: `0x02 | ValOwnerAddr -> amino(validator)`
- - ValidatorsByPubKey: `0x03 | ValTendermintAddr -> ValOwnerAddr`
- - ValidatorsByPower: `0x05 | power | blockHeight | blockTx  -> ValOwnerAddr`
+- Validators: `0x02 | OperatorAddr -> amino(validator)`
+- ValidatorsByPubKey: `0x03 | ConsPubKey -> OperatorAddr`
+- ValidatorsByPower: `0x05 | power | blockHeight | blockTx  -> OperatorAddr`
 
- `Validators` is the primary index - it ensures that each owner can have only one
- associated validator, where the public key of that validator can change in the
- future. Delegators can refer to the immutable owner of the validator, without
- concern for the changing public key.
+`Validators` is the primary index - it ensures that each operator can have only one
+associated validator, where the public key of that validator can change in the
+future. Delegators can refer to the immutable operator of the validator, without
+concern for the changing public key.
 
- `ValidatorsByPubKey` is a secondary index that enables lookups for slashing.
- When Tendermint reports evidence, it provides the validator address, so this
- map is needed to find the owner.
+`ValidatorsByPubKey` is a secondary index that enables lookups for slashing.
+When Tendermint reports evidence, it provides the validator address, so this
+map is needed to find the operator.
 
- `ValidatorsByPower` is a secondary index that provides a sorted list of
- potential validators to quickly determine the current active set. For instance,
- the first 100 validators in this list can be returned with every EndBlock.
+`ValidatorsByPower` is a secondary index that provides a sorted list of
+potential validators to quickly determine the current active set. For instance,
+the first 100 validators in this list can be returned with every EndBlock.
 
 The `Validator` holds the current state and some historical actions of the
 validator.
@@ -72,18 +71,18 @@ validator.
 type Validator struct {
     ConsensusPubKey crypto.PubKey  // Tendermint consensus pubkey of validator
     Jailed          bool           // has the validator been jailed?
-    
-	Status          sdk.BondStatus // validator status (bonded/unbonding/unbonded)
-	Tokens          sdk.Dec        // delegated tokens (incl. self-delegation)
+
+    Status          sdk.BondStatus // validator status (bonded/unbonding/unbonded)
+    Tokens          sdk.Dec        // delegated tokens (incl. self-delegation)
     DelegatorShares sdk.Dec        // total shares issued to a validator's delegators
     SlashRatio      sdk.Dec        // increases each time the validator is slashed
-    
+
     Description        Description  // description terms for the validator
-    
+
     // Needed for ordering vals in the by-power key
     BondHeight         int64        // earliest height as a bonded validator
     BondIntraTxCounter int16        // block-local tx index of validator change
-    
+
     CommissionInfo     CommissionInfo // info about the validator's commission
 }
 
@@ -96,42 +95,41 @@ type CommissionInfo struct {
 }
 
 type Description struct {
-	Moniker  string // name
-	Identity string // optional identity signature (ex. UPort or Keybase)
-	Website  string // optional website link
-	Details  string // optional details
+    Moniker  string // name
+    Identity string // optional identity signature (ex. UPort or Keybase)
+    Website  string // optional website link
+    Details  string // optional details
 }
 ```
 
 ### Delegation
 
-Delegations are identified by combining `DelegatorAddr` (the address of the delegator) with the ValOwnerAddr 
-Delegators are indexed in the store as follows:
+Delegations are identified by combining `DelegatorAddr` (the address of the delegator)
+with the `OperatorAddr` Delegators are indexed in the store as follows:
 
- - Delegation: ` 0x0A | DelegatorAddr | ValOwnerAddr -> amino(delegation)`
+- Delegation: ` 0x0A | DelegatorAddr | OperatorAddr -> amino(delegation)`
 
 Atom holders may delegate coins to validators; under this circumstance their
-funds are held in a `Delegation` data structure. It is owned by one 
-delegator, and is associated with the shares for one validator. The sender of 
+funds are held in a `Delegation` data structure. It is owned by one
+delegator, and is associated with the shares for one validator. The sender of
 the transaction is the owner of the bond.
 
 ```golang
 type Delegation struct {
-	Shares        sdk.Dec      // delegation shares recieved 
-	Height        int64        // last height bond updated
+    Shares        sdk.Dec   // delegation shares received
+    Height        int64     // last height bond updated
 }
 ```
 
 ### UnbondingDelegation
 
-Shares in a `Delegation` can be unbonded, but they must for some time exist as an `UnbondingDelegation`,
-where shares can be reduced if Byzantine behaviour is detected.
+Shares in a `Delegation` can be unbonded, but they must for some time exist as an `UnbondingDelegation`, where shares can be reduced if Byzantine behavior is detected.
 
 `UnbondingDelegation` are indexed in the store as:
 
- - UnbondingDelegationByDelegator: ` 0x0B | DelegatorAddr | ValOwnerAddr ->
+- UnbondingDelegationByDelegator: ` 0x0B | DelegatorAddr | OperatorAddr ->
    amino(unbondingDelegation)`
- - UnbondingDelegationByValOwner: ` 0x0C | ValOwnerAddr | DelegatorAddr | ValOwnerAddr ->
+- UnbondingDelegationByValOwner: ` 0x0C | OperatorAddr | DelegatorAddr | OperatorAddr ->
    nil`
 
  The first map here is used in queries, to lookup all unbonding delegations for
@@ -148,26 +146,26 @@ type UnbondingDelegation struct {
     Tokens           sdk.Coins   // the value in Atoms of the amount of shares which are unbonding
     CompleteTime     int64       // unix time to complete redelegation
 }
-``` 
+```
 
 ### Redelegation
 
-Shares in a `Delegation` can be rebonded to a different validator, but they must for some time exist as a `Redelegation`,
-where shares can be reduced if Byzantine behaviour is detected. This is tracked
-as moving a delegation from a `FromValOwnerAddr` to a `ToValOwnerAddr`.
+Shares in a `Delegation` can be rebonded to a different validator, but they must
+for some time exist as a `Redelegation`, where shares can be reduced if Byzantine
+behavior is detected. This is tracked as moving a delegation from a `FromOperatorAddr`
+to a `ToOperatorAddr`.
 
 `Redelegation` are indexed in the store as:
 
- - Redelegations: `0x0D | DelegatorAddr | FromValOwnerAddr | ToValOwnerAddr ->
+ - Redelegations: `0x0D | DelegatorAddr | FromOperatorAddr | ToOperatorAddr ->
    amino(redelegation)`
- - RedelegationsBySrc: `0x0E | FromValOwnerAddr | ToValOwnerAddr |
+ - RedelegationsBySrc: `0x0E | FromOperatorAddr | ToOperatorAddr |
    DelegatorAddr -> nil`
- - RedelegationsByDst: `0x0F | ToValOwnerAddr | FromValOwnerAddr | DelegatorAddr
+ - RedelegationsByDst: `0x0F | ToOperatorAddr | FromOperatorAddr | DelegatorAddr
    -> nil`
 
-
 The first map here is used for queries, to lookup all redelegations for a given
-delegator. The second map is used for slashing based on the FromValOwnerAddr,
+delegator. The second map is used for slashing based on the `FromOperatorAddr`,
 while the third map is for slashing based on the ToValOwnerAddr.
 
 A redelegation object is created every time a redelegation occurs. The