Merge pull request #1074 from cosmos/bucky/bech32

Bucky/bech32

CHANGELOG.md

@@ -14,6 +14,7 @@ BREAKING CHANGES
 * [x/auth] removed the FeeHandler function from the AnteHandler, Replaced with FeeKeeper
 * [x/auth] Removed GetSignatures() from Tx interface (as different Tx styles might use something different than StdSignature)
 * [store] Removed SubspaceIterator and ReverseSubspaceIterator from KVStore interface and replaced them with helper functions in /types
+* Switch to bech32cosmos on all human readable inputs and outputs 
 
 BUG FIXES
 

Gopkg.toml

@@ -85,6 +85,11 @@
   name = "google.golang.org/genproto"
   revision = "7fd901a49ba6a7f87732eb344f6e3c5b19d1b200"
 
+  [[constraint]]
+  name = "github.com/cosmos/bech32cosmos"
+  branch = "master"
+
+
 [prune]
   go-tests = true
   unused-packages = true

client/keys/list.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/spf13/cobra"
 )
 
@@ -55,7 +56,7 @@ func QueryKeysRequestHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	keysOutput := make([]KeyOutput, len(infos))
 	for i, info := range infos {
-		keysOutput[i] = KeyOutput{Name: info.Name, Address: info.PubKey.Address().String()}
+		keysOutput[i] = KeyOutput{Name: info.Name, Address: sdk.Address(info.PubKey.Address().Bytes())}
 	}
 	output, err := json.MarshalIndent(keysOutput, "", "  ")
 	if err != nil {

client/keys/show.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/gorilla/mux"
 	keys "github.com/tendermint/go-crypto/keys"
 
@@ -50,7 +51,7 @@ func GetKeyRequestHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	keyOutput := KeyOutput{Name: info.Name, Address: info.PubKey.Address().String()}
+	keyOutput := KeyOutput{Name: info.Name, Address: sdk.Address(info.PubKey.Address())}
 	output, err := json.MarshalIndent(keyOutput, "", "  ")
 	if err != nil {
 		w.WriteHeader(500)

client/keys/utils.go

@@ -1,19 +1,20 @@
 package keys
 
 import (
-	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"path/filepath"
-	"strings"
 
 	"github.com/spf13/viper"
 
+	crypto "github.com/tendermint/go-crypto"
 	keys "github.com/tendermint/go-crypto/keys"
 	"github.com/tendermint/tmlibs/cli"
 	dbm "github.com/tendermint/tmlibs/db"
 
 	"github.com/cosmos/cosmos-sdk/client"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // KeyDBName is the directory under root where we store the keys
@@ -47,16 +48,16 @@ func SetKeyBase(kb keys.Keybase) {
 
 // used for outputting keys.Info over REST
 type KeyOutput struct {
-	Name    string `json:"name"`
-	Address string `json:"address"`
-	PubKey  string `json:"pub_key"`
+	Name    string        `json:"name"`
+	Address sdk.Address   `json:"address"`
+	PubKey  crypto.PubKey `json:"pub_key"`
 }
 
 func NewKeyOutput(info keys.Info) KeyOutput {
 	return KeyOutput{
 		Name:    info.Name,
-		Address: info.PubKey.Address().String(),
-		PubKey:  strings.ToUpper(hex.EncodeToString(info.PubKey.Bytes())),
+		Address: sdk.Address(info.PubKey.Address().Bytes()),
+		PubKey:  info.PubKey,
 	}
 }
 
@@ -72,8 +73,8 @@ func printInfo(info keys.Info) {
 	ko := NewKeyOutput(info)
 	switch viper.Get(cli.OutputFlag) {
 	case "text":
-		fmt.Printf("NAME:\tADDRESS:\t\t\t\t\tPUBKEY:\n")
-		fmt.Printf("%s\t%s\t%s\n", ko.Name, ko.Address, ko.PubKey)
+		fmt.Printf("NAME:\tADDRESS:\t\t\t\t\t\tPUBKEY:\n")
+		printKeyOutput(ko)
 	case "json":
 		out, err := json.MarshalIndent(ko, "", "\t")
 		if err != nil {
@@ -87,9 +88,9 @@ func printInfos(infos []keys.Info) {
 	kos := NewKeyOutputs(infos)
 	switch viper.Get(cli.OutputFlag) {
 	case "text":
-		fmt.Printf("NAME:\tADDRESS:\t\t\t\t\tPUBKEY:\n")
+		fmt.Printf("NAME:\tADDRESS:\t\t\t\t\t\tPUBKEY:\n")
 		for _, ko := range kos {
-			fmt.Printf("%s\t%s\t%s\n", ko.Name, ko.Address, ko.PubKey)
+			printKeyOutput(ko)
 		}
 	case "json":
 		out, err := json.MarshalIndent(kos, "", "\t")
@@ -99,3 +100,15 @@ func printInfos(infos []keys.Info) {
 		fmt.Println(string(out))
 	}
 }
+
+func printKeyOutput(ko KeyOutput) {
+	bechAccount, err := sdk.Bech32CosmosifyAcc(ko.Address)
+	if err != nil {
+		panic(err)
+	}
+	bechPubKey, err := sdk.Bech32CosmosifyAccPub(ko.PubKey)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Printf("%s\t%s\t%s\n", ko.Name, bechAccount, bechPubKey)
+}

client/lcd/lcd_test.go

@@ -92,10 +92,13 @@ func TestKeys(t *testing.T) {
 	err = cdc.UnmarshalJSON([]byte(body), &m)
 	require.Nil(t, err)
 
+	sendAddrAcc, _ := sdk.GetAccAddressHex(sendAddr)
+	addrAcc, _ := sdk.GetAccAddressHex(addr)
+
 	assert.Equal(t, m[0].Name, name, "Did not serve keys name correctly")
-	assert.Equal(t, m[0].Address, sendAddr, "Did not serve keys Address correctly")
+	assert.Equal(t, m[0].Address, sendAddrAcc, "Did not serve keys Address correctly")
 	assert.Equal(t, m[1].Name, newName, "Did not serve keys name correctly")
-	assert.Equal(t, m[1].Address, addr, "Did not serve keys Address correctly")
+	assert.Equal(t, m[1].Address, addrAcc, "Did not serve keys Address correctly")
 
 	// select key
 	keyEndpoint := fmt.Sprintf("/keys/%s", newName)
@@ -106,7 +109,7 @@ func TestKeys(t *testing.T) {
 	require.Nil(t, err)
 
 	assert.Equal(t, newName, m2.Name, "Did not serve keys name correctly")
-	assert.Equal(t, addr, m2.Address, "Did not serve keys Address correctly")
+	assert.Equal(t, addrAcc, m2.Address, "Did not serve keys Address correctly")
 
 	// update key
 	jsonStr = []byte(fmt.Sprintf(`{"old_password":"%s", "new_password":"12345678901"}`, newPassword))

cmd/gaia/cli_test/cli_test.go

@@ -13,9 +13,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/cmd/gaia/app"
 	"github.com/cosmos/cosmos-sdk/server"
 	"github.com/cosmos/cosmos-sdk/tests"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/wire"
 	"github.com/cosmos/cosmos-sdk/x/auth"
 	"github.com/cosmos/cosmos-sdk/x/stake"
+	crypto "github.com/tendermint/go-crypto"
 )
 
 func TestGaiaCLISend(t *testing.T) {
@@ -38,24 +40,32 @@ func TestGaiaCLISend(t *testing.T) {
 	fooAddr, _ := executeGetAddrPK(t, "gaiacli keys show foo --output=json")
 	barAddr, _ := executeGetAddrPK(t, "gaiacli keys show bar --output=json")
 
-	fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags))
+	fooBech, err := sdk.Bech32CosmosifyAcc(fooAddr)
+	if err != nil {
+		t.Error(err)
+	}
+	barBech, err := sdk.Bech32CosmosifyAcc(barAddr)
+	if err != nil {
+		t.Error(err)
+	}
+	fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooBech, flags))
 	assert.Equal(t, int64(50), fooAcc.GetCoins().AmountOf("steak"))
 
 	executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barAddr), pass)
 	time.Sleep(time.Second * 3) // waiting for some blocks to pass
 
-	barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags))
+	barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barBech, flags))
 	assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("steak"))
-	fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags))
+	fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooBech, flags))
 	assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("steak"))
 
 	// test autosequencing
 	executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barAddr), pass)
 	time.Sleep(time.Second * 3) // waiting for some blocks to pass
 
-	barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags))
+	barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barBech, flags))
 	assert.Equal(t, int64(20), barAcc.GetCoins().AmountOf("steak"))
-	fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags))
+	fooAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooBech, flags))
 	assert.Equal(t, int64(30), fooAcc.GetCoins().AmountOf("steak"))
 }
 
@@ -77,21 +87,32 @@ func TestGaiaCLIDeclareCandidacy(t *testing.T) {
 	defer cmd.Process.Kill()
 
 	fooAddr, _ := executeGetAddrPK(t, "gaiacli keys show foo --output=json")
-	barAddr, barPubKey := executeGetAddrPK(t, "gaiacli keys show bar --output=json")
+	barAddr, _ := executeGetAddrPK(t, "gaiacli keys show bar --output=json")
 
-	executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barAddr), pass)
+	fooBech, err := sdk.Bech32CosmosifyAcc(fooAddr)
+	if err != nil {
+		t.Error(err)
+	}
+	barBech, err := sdk.Bech32CosmosifyAcc(barAddr)
+	if err != nil {
+		t.Error(err)
+	}
+	valPrivkey := crypto.GenPrivKeyEd25519()
+	valAddr := sdk.Address((valPrivkey.PubKey().Address()))
+	bechVal, err := sdk.Bech32CosmosifyVal(valAddr)
+
+	executeWrite(t, fmt.Sprintf("gaiacli send %v --amount=10steak --to=%v --name=foo", flags, barBech), pass)
 	time.Sleep(time.Second * 3) // waiting for some blocks to pass
 
-	fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooAddr, flags))
+	fooAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", fooBech, flags))
 	assert.Equal(t, int64(40), fooAcc.GetCoins().AmountOf("steak"))
-	barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags))
+	barAcc := executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barBech, flags))
 	assert.Equal(t, int64(10), barAcc.GetCoins().AmountOf("steak"))
 
 	// declare candidacy
-	declStr := fmt.Sprintf("gaiacli declare-candidacy %v", flags)
+	declStr := fmt.Sprintf("gaiacli create-validator %v", flags)
 	declStr += fmt.Sprintf(" --name=%v", "bar")
-	declStr += fmt.Sprintf(" --address-candidate=%v", barAddr)
-	declStr += fmt.Sprintf(" --pubkey=%v", barPubKey)
+	declStr += fmt.Sprintf(" --validator-address=%v", bechVal)
 	declStr += fmt.Sprintf(" --amount=%v", "3steak")
 	declStr += fmt.Sprintf(" --moniker=%v", "bar-vally")
 	fmt.Printf("debug declStr: %v\n", declStr)
@@ -100,8 +121,8 @@ func TestGaiaCLIDeclareCandidacy(t *testing.T) {
 	barAcc = executeGetAccount(t, fmt.Sprintf("gaiacli account %v %v", barAddr, flags))
 	assert.Equal(t, int64(7), barAcc.GetCoins().AmountOf("steak"))
 	candidate := executeGetCandidate(t, fmt.Sprintf("gaiacli candidate %v --address-candidate=%v", flags, barAddr))
-	assert.Equal(t, candidate.Address.String(), barAddr)
-	assert.Equal(t, int64(3), candidate.BondedShares.Evaluate())
+	assert.Equal(t, candidate.Owner.String(), barAddr)
+	assert.Equal(t, int64(3), candidate.PoolShares)
 
 	// TODO timeout issues if not connected to the internet
 	// unbond a single share
@@ -125,6 +146,9 @@ func executeWrite(t *testing.T, cmdStr string, writes ...string) {
 
 	for _, write := range writes {
 		_, err := wc.Write([]byte(write + "\n"))
+		if err != nil {
+			fmt.Println(err)
+		}
 		require.NoError(t, err)
 	}
 	fmt.Printf("debug waiting cmdStr: %v\n", cmdStr)
@@ -159,7 +183,7 @@ func executeInit(t *testing.T, cmdStr string) (chainID string) {
 	return
 }
 
-func executeGetAddrPK(t *testing.T, cmdStr string) (addr, pubKey string) {
+func executeGetAddrPK(t *testing.T, cmdStr string) (sdk.Address, crypto.PubKey) {
 	out := tests.ExecuteT(t, cmdStr)
 	var ko keys.KeyOutput
 	keys.UnmarshalJSON([]byte(out), &ko)
@@ -180,9 +204,9 @@ func executeGetAccount(t *testing.T, cmdStr string) auth.BaseAccount {
 	return acc
 }
 
-func executeGetCandidate(t *testing.T, cmdStr string) stake.Candidate {
+func executeGetCandidate(t *testing.T, cmdStr string) stake.Validator {
 	out := tests.ExecuteT(t, cmdStr)
-	var candidate stake.Candidate
+	var candidate stake.Validator
 	cdc := app.MakeCodec()
 	err := cdc.UnmarshalJSON([]byte(out), &candidate)
 	require.NoError(t, err, "out %v, err %v", out, err)

docs/spec/governance/state.md

@@ -103,9 +103,9 @@ type ValidatorGovInfo struct {
 
 * `Proposals: int64 => Proposal` maps `proposalID` to the `Proposal`
   `proposalID`
-* `Options: <proposalID | voterAddress | validatorAddress> => VoteType`: maps to the vote of the `voterAddress` for `proposalID` re its delegation to `validatorAddress`.
+* `Options: <proposalID | voterAddress | Address> => VoteType`: maps to the vote of the `voterAddress` for `proposalID` re its delegation to `Address`.
    Returns 0x0 If `voterAddress` has not voted under this validator.
-* `ValidatorGovInfos: <proposalID | validatorAddress> => ValidatorGovInfo`: maps to the gov info for the `validatorAddress` and `proposalID`.
+* `ValidatorGovInfos: <proposalID | Address> => ValidatorGovInfo`: maps to the gov info for the `Address` and `proposalID`.
   Returns `nil` if proposal has not entered voting period or if `address` was not the 
   address of a validator when proposal entered voting period.