#265 Update to cosmos 0.32.0

app/app.go

@@ -124,7 +124,10 @@ func NewCyberdApp(
 	)
 
 	var stakingKeeper staking.Keeper
-	app.bankKeeper = cbdbank.NewBankKeeper(app.accountKeeper, &stakingKeeper)
+	app.bankKeeper = cbdbank.NewBankKeeper(
+		app.accountKeeper, &stakingKeeper,
+		app.paramsKeeper.Subspace(bank.DefaultParamspace),
+	)
 	app.bankKeeper.AddHook(bandwidth.CollectAddressesWithStakeChange())
 
 	stakingKeeper = staking.NewKeeper(
@@ -184,8 +187,11 @@ func NewCyberdApp(
 		AddRoute(staking.QuerierRoute, staking.NewQuerier(app.stakingKeeper, app.cdc))
 
 	// mount the multistore and load the latest state
-	app.MountStores(dbKeys.GetStoreKeys()...)
-	app.MountStoresTransient(dbKeys.GetTransientStoreKeys()...)
+	app.MountStores(
+		dbKeys.main, dbKeys.acc, dbKeys.cidNum, dbKeys.cidNumReverse, dbKeys.links, dbKeys.rank, dbKeys.stake,
+		dbKeys.slashing, dbKeys.params, dbKeys.distr, dbKeys.fees, dbKeys.accBandwidth, dbKeys.blockBandwidth,
+		dbKeys.tDistr, dbKeys.tParams, dbKeys.tStake,
+	)
 
 	app.SetInitChainer(app.initChainer)
 	app.SetBeginBlocker(app.BeginBlocker)
@@ -208,16 +214,16 @@ func NewCyberdApp(
 
 	// load in-memory data
 	start := time.Now()
-	app.BaseApp.Logger.Info("Loading mem state")
+	app.BaseApp.Logger().Info("Loading mem state")
 	app.linkIndexedKeeper.Load(rankCtx, ctx)
 	app.stakingIndex.Load(rankCtx, ctx)
-	app.BaseApp.Logger.Info("App loaded", "time", time.Since(start))
+	app.BaseApp.Logger().Info("App loaded", "time", time.Since(start))
 
 	// BANDWIDTH LOAD
 	app.bandwidthMeter.Load(ctx)
 
 	// RANK PARAMS
-	app.rankState.Load(ctx, app.Logger)
+	app.rankState.Load(ctx, app.Logger())
 	app.failBeforeHeight = opts.FailBeforeHeight
 	app.Seal()
 	return app
@@ -258,7 +264,10 @@ func (app *CyberdApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) ab
 	// auth.InitGenesis, but without collected fee
 	app.accountKeeper.SetParams(ctx, genesisState.AuthData.Params)
 
-	slashing.InitGenesis(ctx, app.slashingKeeper, genesisState.SlashingData, genesisState.StakingData)
+	slashing.InitGenesis(
+		ctx, app.slashingKeeper, genesisState.SlashingData,
+		genesisState.StakingData.Validators.ToSDKValidators(),
+	)
 	mint.InitGenesis(ctx, app.minter, genesisState.MintData)
 	bandwidth.InitGenesis(ctx, app.bandwidthMeter, app.accBandwidthKeeper, genesisState.GetAddresses())
 
@@ -300,7 +309,7 @@ func (app *CyberdApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) ab
 		}
 	}
 
-	err = link.InitGenesis(ctx, app.cidNumKeeper, app.linkIndexedKeeper, app.Logger)
+	err = link.InitGenesis(ctx, app.cidNumKeeper, app.linkIndexedKeeper, app.Logger())
 	if err != nil {
 		panic(err)
 	}
@@ -422,15 +431,15 @@ func getSignersTags(tx sdk.Tx) sdk.Tags {
 
 	var tags = make(sdk.Tags, 0)
 	for signer := range signers {
-		tags.AppendTag("signer", []byte(signer))
+		tags.AppendTag("signer", signer)
 	}
 	return tags
 }
 
 func (app *CyberdApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {
 
 	if app.failBeforeHeight != 0 && req.Header.Height == app.failBeforeHeight {
-		app.Logger.Info("Forced panic at begin blocker", "height", app.failBeforeHeight)
+		app.Logger().Info("Forced panic at begin blocker", "height", app.failBeforeHeight)
 		os.Exit(1)
 	}
 
@@ -463,7 +472,7 @@ func (app *CyberdApp) EndBlocker(ctx sdk.Context, _ abci.RequestEndBlock) abci.R
 	bandwidth.EndBlocker(ctx, app.bandwidthMeter)
 
 	// RANK CALCULATION
-	app.rankState.EndBlocker(ctx, app.Logger)
+	app.rankState.EndBlocker(ctx, app.Logger())
 
 	return abci.ResponseEndBlock{
 		ValidatorUpdates: validatorUpdates,

app/export.go

@@ -42,7 +42,7 @@ func (app *CyberdApp) ExportAppStateAndValidators() (appState json.RawMessage, v
 		return nil, nil, err
 	}
 	validators = staking.WriteValidators(ctx, app.stakingKeeper)
-	err = link.WriteGenesis(ctx, app.cidNumKeeper, app.linkIndexedKeeper, app.Logger)
+	err = link.WriteGenesis(ctx, app.cidNumKeeper, app.linkIndexedKeeper, app.Logger())
 	if err != nil {
 		return nil, nil, err
 	}

app/hooks.go

@@ -38,30 +38,32 @@ func (h Hooks) AfterValidatorBonded(ctx sdk.Context, consAddr sdk.ConsAddress, v
 	h.dh.AfterValidatorBonded(ctx, consAddr, valAddr)
 	h.sh.AfterValidatorBonded(ctx, consAddr, valAddr)
 }
-func (h Hooks) AfterValidatorPowerDidChange(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) {
-	h.dh.AfterValidatorPowerDidChange(ctx, consAddr, valAddr)
-	h.sh.AfterValidatorPowerDidChange(ctx, consAddr, valAddr)
-}
+
 func (h Hooks) AfterValidatorBeginUnbonding(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) {
 	h.dh.AfterValidatorBeginUnbonding(ctx, consAddr, valAddr)
 	h.sh.AfterValidatorBeginUnbonding(ctx, consAddr, valAddr)
 }
+
 func (h Hooks) BeforeDelegationCreated(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) {
 	h.dh.BeforeDelegationCreated(ctx, delAddr, valAddr)
 	h.sh.BeforeDelegationCreated(ctx, delAddr, valAddr)
 }
+
 func (h Hooks) BeforeDelegationSharesModified(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) {
 	h.dh.BeforeDelegationSharesModified(ctx, delAddr, valAddr)
 	h.sh.BeforeDelegationSharesModified(ctx, delAddr, valAddr)
 }
+
 func (h Hooks) BeforeDelegationRemoved(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) {
 	h.dh.BeforeDelegationRemoved(ctx, delAddr, valAddr)
 	h.sh.BeforeDelegationRemoved(ctx, delAddr, valAddr)
 }
+
 func (h Hooks) AfterDelegationModified(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress) {
 	h.dh.AfterDelegationModified(ctx, delAddr, valAddr)
 	h.sh.AfterDelegationModified(ctx, delAddr, valAddr)
 }
+
 func (h Hooks) BeforeValidatorSlashed(ctx sdk.Context, valAddr sdk.ValAddress, fraction sdk.Dec) {
 	h.dh.BeforeValidatorSlashed(ctx, valAddr, fraction)
 	h.sh.BeforeValidatorSlashed(ctx, valAddr, fraction)

cli/commands/keys/importprivate.go

@@ -26,7 +26,7 @@ func importPrivateKeyCmd() *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 
 			rootDir := viper.GetString(cli.HomeFlag)
-			kb, _ := keys.GetKeyBaseFromDirWithWritePerm(rootDir)
+			kb, _ := keys.NewKeyBaseFromDir(rootDir)
 
 			name := args[0]
 
@@ -81,9 +81,7 @@ func importPrivateKeyCmd() *cobra.Command {
 
 			armorStr := mintkey.ArmorInfoBytes(bufRes.Bytes())
 			// import armored bytesm
-			kb.Import(name, armorStr)
-
-			return nil
+			return kb.Import(name, armorStr)
 		},
 	}
 

cli/commands/linktx.go

@@ -46,21 +46,18 @@ func LinkTxCmd(cdc *codec.Codec) *cobra.Command {
 				return cbd.ErrInvalidCid()
 			}
 
-			from, err := cliCtx.GetFromAddress()
-			if err != nil {
-				return err
-			}
+			from := cliCtx.GetFromAddress()
 
 			// ensure that account exists in chain
-			_, err = cliCtx.GetAccount(from)
+			_, err := cliCtx.GetAccount(from)
 			if err != nil {
 				return err
 			}
 
 			// build and sign the transaction, then broadcast to Tendermint
 			msg := link.NewMsg(from, []cbdlink.Link{{From: cidFrom, To: cidTo}})
 
-			return utils.CompleteAndBroadcastTxCli(txCtx, cliCtx, []sdk.Msg{msg})
+			return utils.CompleteAndBroadcastTxCLI(txCtx, cliCtx, []sdk.Msg{msg})
 		},
 	}
 

cli/main.go

@@ -10,8 +10,8 @@ import (
 	at "github.com/cosmos/cosmos-sdk/x/auth"
 	authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli"
 	bankcmd "github.com/cosmos/cosmos-sdk/x/bank/client/cli"
-	dist "github.com/cosmos/cosmos-sdk/x/distribution"
 	distClient "github.com/cosmos/cosmos-sdk/x/distribution/client"
+	dist "github.com/cosmos/cosmos-sdk/x/distribution/client/rest"
 	gv "github.com/cosmos/cosmos-sdk/x/gov"
 	govClient "github.com/cosmos/cosmos-sdk/x/gov/client"
 	sl "github.com/cosmos/cosmos-sdk/x/slashing"
@@ -32,6 +32,8 @@ import (
 	gov "github.com/cosmos/cosmos-sdk/x/gov/client/rest"
 	slashing "github.com/cosmos/cosmos-sdk/x/slashing/client/rest"
 	staking "github.com/cosmos/cosmos-sdk/x/staking/client/rest"
+
+	distcmd "github.com/cosmos/cosmos-sdk/x/distribution"
 )
 
 func main() {
@@ -49,7 +51,7 @@ func main() {
 
 	mc := []sdk.ModuleClients{
 		govClient.NewModuleClient(gv.StoreKey, cdc),
-		distClient.NewModuleClient(dist.StoreKey, cdc),
+		distClient.NewModuleClient(distcmd.StoreKey, cdc),
 		stakingClient.NewModuleClient(st.StoreKey, cdc),
 		slashingClient.NewModuleClient(sl.StoreKey, cdc),
 	}
@@ -63,6 +65,7 @@ func main() {
 		rpc.StatusCommand(),
 		queryCmd(cdc, mc),
 		txCmd(cdc, mc),
+		client.LineBreak,
 		keys.Commands(),
 		client.LineBreak,
 		lcd.ServeCommand(cdc, registerRoutes),
@@ -89,6 +92,7 @@ func registerRoutes(rs *lcd.RestServer) {
 	tx.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc)
 	auth.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, at.StoreKey)
 	bank.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
+	dist.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, distcmd.StoreKey)
 	staking.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
 	slashing.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc, rs.KeyBase)
 	gov.RegisterRoutes(rs.CliCtx, rs.Mux, rs.Cdc)
@@ -102,7 +106,7 @@ func queryCmd(cdc *amino.Codec, mc []sdk.ModuleClients) *cobra.Command {
 	}
 
 	queryCmd.AddCommand(
-		rpc.ValidatorCommand(),
+		rpc.ValidatorCommand(cdc),
 		rpc.BlockCommand(),
 		tx.SearchTxCmd(cdc),
 		tx.QueryTxCmd(cdc),
@@ -128,7 +132,8 @@ func txCmd(cdc *amino.Codec, mc []sdk.ModuleClients) *cobra.Command {
 		client.LineBreak,
 		authcmd.GetSignCommand(cdc),
 		authcmd.GetMultiSignCommand(cdc),
-		bankcmd.GetBroadcastCommand(cdc),
+		authcmd.GetBroadcastCommand(cdc),
+		authcmd.GetEncodeCommand(cdc),
 		client.LineBreak,
 	)
 

client/http_client.go

@@ -178,7 +178,7 @@ func (c *HttpCyberdClient) BroadcastTx(msgs []sdk.Msg) error {
 	if result.Code != 0 {
 		return errors.New(string(result.Log))
 	}
-	newBuilder := c.txBuilder.WithSequence(c.txBuilder.GetSequence() + 1)
+	newBuilder := c.txBuilder.WithSequence(c.txBuilder.Sequence() + 1)
 	c.txBuilder = &newBuilder
 	return nil
 }
@@ -188,7 +188,7 @@ func accountFromAddress(from string) (fromAddr sdk.AccAddress, fromName string)
 		return nil, ""
 	}
 
-	keybase, err := keys.GetKeyBase()
+	keybase, err := keys.NewKeyBaseFromHomeFlag()
 	if err != nil {
 		fmt.Println("no keybase found")
 		os.Exit(1)

daemon/cmd/gentx.go

@@ -66,7 +66,7 @@ following delegation and commission default parameters:
 				return err
 			}
 
-			kb, err := keys.GetKeyBaseFromDir(viper.GetString(flagClientHome))
+			kb, err := keys.NewKeyBaseFromDir(viper.GetString(flagClientHome))
 			if err != nil {
 				return err
 			}
@@ -110,7 +110,8 @@ following delegation and commission default parameters:
 
 			// write the unsigned transaction to the buffer
 			w := bytes.NewBuffer([]byte{})
-			if err := utils.PrintUnsignedStdTx(w, txBldr, cliCtx, []sdk.Msg{msg}, true); err != nil {
+			cliCtx = cliCtx.WithOutput(w)
+			if err = utils.PrintUnsignedStdTx(txBldr, cliCtx, []sdk.Msg{msg}, true); err != nil {
 				return err
 			}
 

daemon/cmd/testnet.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/cosmos/cosmos-sdk/client/keys"
 	"github.com/cybercongress/cyberd/app"
 	"github.com/cybercongress/cyberd/types/coin"
 	"net"
@@ -195,11 +196,18 @@ func initTestnet(config *tmconfig.Config, cdc *codec.Codec) error {
 			sdk.ValAddress(addr),
 			valPubKeys[i],
 			sdk.NewInt64Coin(coin.CYB, 10000000000000000),
-			staking.NewDescription(nodeDirName, "", "", ""),
+			staking.NewDescription(nodeDirName, "tst", "com.com", "det"),
 			staking.NewCommissionMsg(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
+			sdk.OneInt(),
 		)
+
+		kb, err := keys.NewKeyBaseFromDir(clientDir)
+		if err != nil {
+			return err
+		}
+
 		tx := auth.NewStdTx([]sdk.Msg{msg}, auth.StdFee{}, []auth.StdSignature{}, memo)
-		txBldr := authtx.NewTxBuilderFromCLI().WithChainID(chainID).WithMemo(memo)
+		txBldr := authtx.NewTxBuilderFromCLI().WithChainID(chainID).WithMemo(memo).WithKeybase(kb)
 
 		signedTx, err := txBldr.SignStdTx(nodeDirName, keyPass, tx, false)
 		if err != nil {

daemon/main.go

@@ -5,7 +5,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cybercongress/cyberd/app"
 	"github.com/cybercongress/cyberd/daemon/cmd"
 	"github.com/cybercongress/cyberd/daemon/rpc"
@@ -69,7 +69,7 @@ func main() {
 
 func newApp(logger log.Logger, db dbm.DB, storeTracer io.Writer) abci.Application {
 	// todo use constant here
-	pruning := baseapp.SetPruning(sdk.NewPruningOptions(60*60*24, 0))
+	pruning := baseapp.SetPruning(types.NewPruningOptions(60*60*24, 0))
 
 	computeUnit := rank.CPU
 	if viper.GetBool(flagGpuEnabled) {
@@ -87,7 +87,7 @@ func newApp(logger log.Logger, db dbm.DB, storeTracer io.Writer) abci.Applicatio
 }
 
 func exportAppStateAndTMValidators(
-	logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool,
+	logger log.Logger, db dbm.DB, traceStore io.Writer, height int64, forZeroHeight bool, jailWhiteList []string,
 ) (json.RawMessage, []tmtypes.GenesisValidator, error) {
 
 	capp := app.NewCyberdApp(logger, db, app.Options{})

go.mod

@@ -9,8 +9,9 @@ require (
 	github.com/bgentry/speakeasy v0.1.0 // indirect
 	github.com/btcsuite/btcd v0.0.0-20180903232927-cff30e1d23fc // indirect
 	github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a // indirect
-	github.com/cosmos/cosmos-sdk v0.30.0
+	github.com/cosmos/cosmos-sdk v0.32.0
 	github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8 // indirect
+	github.com/ethereum/go-ethereum v1.8.23 // indirect
 	github.com/fortytw2/leaktest v1.2.0 // indirect
 	github.com/go-kit/kit v0.7.0 // indirect
 	github.com/go-logfmt/logfmt v0.3.0 // indirect
@@ -58,8 +59,8 @@ require (
 	github.com/syndtr/goleveldb v0.0.0-20181128100959-b001fa50d6b2 // indirect
 	github.com/tendermint/btcd v0.0.0-20180816174608-e5840949ff4f
 	github.com/tendermint/go-amino v0.14.1
-	github.com/tendermint/iavl v0.12.0 // indirect
-	github.com/tendermint/tendermint v0.29.1
+	github.com/tendermint/iavl v0.12.1 // indirect
+	github.com/tendermint/tendermint v0.30.1
 	github.com/whyrusleeping/base32 v0.0.0-20170828182744-c30ac30633cc // indirect
 	github.com/zondax/ledger-cosmos-go v0.1.0 // indirect
 	golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e // indirect