Merge PR #2251: Refactor Bech32 Prefixes and Nomenclature of Validator Pubkey and Operator

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

@@ -188,7 +188,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")