157 change token protocol name

app/app.go

@@ -240,7 +240,7 @@ func (app *CyberdApp) initChainer(ctx sdk.Context, req abci.RequestInitChain) ab
 		acc := gacc.ToAccount()
 		acc.AccountNumber = app.accountKeeper.GetNextAccountNumber(ctx)
 		app.accountKeeper.SetAccount(ctx, acc)
-		app.stakeIndex.UpdateStake(types.AccNumber(acc.AccountNumber), acc.Coins.AmountOf(coin.CBD).Int64())
+		app.stakeIndex.UpdateStake(types.AccNumber(acc.AccountNumber), acc.Coins.AmountOf(coin.CYB).Int64())
 	}
 
 	// initialize distribution (must happen before staking)

app/genesis.go

@@ -61,22 +61,22 @@ type GenesisAccount struct {
 func NewGenesisAccount(acc *auth.BaseAccount) GenesisAccount {
 	return GenesisAccount{
 		Address: acc.Address,
-		Amount:  acc.Coins.AmountOf(coin.CBD).Int64(),
+		Amount:  acc.Coins.AmountOf(coin.CYB).Int64(),
 	}
 }
 
 func NewGenesisAccountI(acc auth.Account) GenesisAccount {
 	return GenesisAccount{
 		Address: acc.GetAddress(),
-		Amount:  acc.GetCoins().AmountOf(coin.CBD).Int64(),
+		Amount:  acc.GetCoins().AmountOf(coin.CYB).Int64(),
 	}
 }
 
 // convert GenesisAccount to auth.BaseAccount
 func (ga *GenesisAccount) ToAccount() (acc *auth.BaseAccount) {
 	return &auth.BaseAccount{
 		Address: ga.Address,
-		Coins:   sdk.Coins{sdk.NewInt64Coin(coin.CBD, ga.Amount)},
+		Coins:   sdk.Coins{sdk.NewInt64Coin(coin.CYB, ga.Amount)},
 	}
 }
 
@@ -98,7 +98,7 @@ func NewDefaultGenesisState() GenesisState {
 		},
 		MintData: mint.GenesisState{
 			Params: mint.Params{
-				MintDenom:           coin.CBD,
+				MintDenom:           coin.CYB,
 				InflationRateChange: sdk.NewDecWithPrec(0, 2),
 				InflationMax:        sdk.NewDecWithPrec(200, 2),
 				InflationMin:        sdk.NewDecWithPrec(200, 2),
@@ -111,7 +111,7 @@ func NewDefaultGenesisState() GenesisState {
 			Params: types.Params{
 				UnbondingTime: defaultUnbondingTime,
 				MaxValidators: 146,
-				BondDenom:     coin.CBD,
+				BondDenom:     coin.CYB,
 			},
 		},
 		SlashingData: slashing.DefaultGenesisState(),

app/prefix.go

@@ -5,12 +5,12 @@ import (
 )
 
 var (
-	AccountAddressPrefix   = "cbd"
-	AccountPubKeyPrefix    = "cbdpub"
-	ValidatorAddressPrefix = "cbdvaloper"
-	ValidatorPubKeyPrefix  = "cbdvaloperpub"
-	ConsNodeAddressPrefix  = "cbdvalcons"
-	ConsNodePubKeyPrefix   = "cbdvalconspub"
+	AccountAddressPrefix   = "cyber"
+	AccountPubKeyPrefix    = "cyberpub"
+	ValidatorAddressPrefix = "cybervaloper"
+	ValidatorPubKeyPrefix  = "cybervaloperpub"
+	ConsNodeAddressPrefix  = "cybervalcons"
+	ConsNodePubKeyPrefix   = "cybervalconspub"
 )
 
 func SetPrefix() {

daemon/cmd/genesis.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/server"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cybercongress/cyberd/app"
 	cbd "github.com/cybercongress/cyberd/types"
 	"github.com/spf13/cobra"
 	"strconv"
@@ -17,6 +19,7 @@ func GenesisCmds(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 	}
 	rootCmd.AddCommand(AddEulerTokensCmd(ctx, cdc))
 	rootCmd.AddCommand(AddMissingEulerTokensCmd(ctx, cdc))
+	rootCmd.AddCommand(ChangeGenesisAccsPrefixCmd(ctx, cdc))
 	return rootCmd
 }
 
@@ -34,21 +37,21 @@ const tokensToBurnPercentage float64 = 11.8000 // 0x3b6ce0d5fd5f6de16fb6b687207e
 const proofOfUsePercentage float64 = 70.0000   // 0xccf0e5a05bf5c0fb7c2d91737b176b4a2d2fd7f0
 
 var pocvAccs = map[string]float64{
-	"cbd1f9yjqmxh6prsmgpcaqj8lmjnxg644n50qjl4vw": 8.288000001,              // 0x9f4062f6153ff4dbf93f6a6f686ed3c906bf0684
-	"cbd1hlu0kqwvxmhjjsezr00jdrvs2k537mqhrv02ja": 3.045611111,              // 0x7c4401ae98f12ef6de39ae24cf9fc51f80eba16b
-	"cbd1myeyqp96pz3tayjdctflrxpwf45dq3xyj56yk0": 2.1153,                   // 0xf2cb7985a5c3fdd8d7742a73d5dc001bbd32caf8
-	"cbd1gannk6qt3s5mnm5smx6xjqqvecu08666hpazlz": 1.5328,                   // 0x002f9caf40a444f20813da783d152bdfaf42852f
-	"cbd1sjedcfmqupxcnxudq9w0rxrf87r3c6tvep5fnj": 1.428,                    // 0x00b8fe1a1a2b899418702e32a96e276ff56a4d05
-	"cbd1ch4dpd8jxkl7w4wnzdx02utmw4j0xatfks6ulv": 1,                        // 0x8b788b444ca3203bba0fdcae1c482110494e81f1
-	"cbd1s3748ghvcwvrws3kxsdc8xnan3qhv77740gnnl": 0.568211111,              // 0x00cff8cf7bff03a9a2a81c01920ffd8cfa7ae9d0
-	"cbd14d92r4svhl4qa3g6q48tjekarw2kt67njlaeht": 0.083811111,              // 0x63e65bc441334b27d2178f81f2d701e4e58c158a
-	"cbd1up7dk03v4d898vqgmc2y32y7duuylgx8ra7jjj": 0.043511111,              // 0x9d7d6e753f055e40d3767337300e722e934086c1
-	"cbd1rqudjcrdwqedffxufmqgsleuguhm7pka6snns3": 0.028,                    // 0x00725d89a2a2fb3b21fd1035b579cbcde4a0991b
-	"cbd1hmkqhy8ygl6tnl5g8tc503rwrmmrkjcqtqrsx6": 0.023311111,              // 0x00ca47db1be92c1072e973fd8dc4a082f7d70214
-	"cbd1gs92s58t6rkallnml8ufdzrz3038dcylal0nlc": 0.023311111,              // 0x4585c7eaa2cb96d4b59e868929efabeeb8e65b07
-	"cbd1h7u5zvduvc3dqrfq9hejm35ktfxh3ha7fra64a": 0.0132800000000000911111, // 0x002b9c5b537a1b6004ed720f32cc808fd6210f26
-	"cbd1rl3xnsrkpjfwejqfy7v4kntu64hzxy8dgafh6j": 0.003111111,              // 0x00d3c9033570b8adea9c18780325a45635c55805
-	"cbd1xege0g92p6exmzjv58u7vh3s5zkz75v48mlnev": 0.003111111,              // 0x5d01f31f6eda95489ca1e3c6357a9627fa2983de
+	"cyber1f9yjqmxh6prsmgpcaqj8lmjnxg644n5074zznm": 8.288000001,              // 0x9f4062f6153ff4dbf93f6a6f686ed3c906bf0684
+	"cyber1hlu0kqwvxmhjjsezr00jdrvs2k537mqhatjadg": 3.045611111,              // 0x7c4401ae98f12ef6de39ae24cf9fc51f80eba16b
+	"cyber1myeyqp96pz3tayjdctflrxpwf45dq3xyvn8nf6": 2.1153,                   // 0xf2cb7985a5c3fdd8d7742a73d5dc001bbd32caf8
+	"cyber1gannk6qt3s5mnm5smx6xjqqvecu08666fxq4qh": 1.5328,                   // 0x002f9caf40a444f20813da783d152bdfaf42852f
+	"cyber1sjedcfmqupxcnxudq9w0rxrf87r3c6tv8xf7v8": 1.428,                    // 0x00b8fe1a1a2b899418702e32a96e276ff56a4d05
+	"cyber1ch4dpd8jxkl7w4wnzdx02utmw4j0xatfgh8tqe": 1,                        // 0x8b788b444ca3203bba0fdcae1c482110494e81f1
+	"cyber1s3748ghvcwvrws3kxsdc8xnan3qhv777tg4yv2": 0.568211111,              // 0x00cff8cf7bff03a9a2a81c01920ffd8cfa7ae9d0
+	"cyber14d92r4svhl4qa3g6q48tjekarw2kt67nvcqwg7": 0.083811111,              // 0x63e65bc441334b27d2178f81f2d701e4e58c158a
+	"cyber1up7dk03v4d898vqgmc2y32y7duuylgx8a6r9d8": 0.043511111,              // 0x9d7d6e753f055e40d3767337300e722e934086c1
+	"cyber1rqudjcrdwqedffxufmqgsleuguhm7pkayhwy0y": 0.028,                    // 0x00725d89a2a2fb3b21fd1035b579cbcde4a0991b
+	"cyber1hmkqhy8ygl6tnl5g8tc503rwrmmrkjcq4878e0": 0.023311111,              // 0x00ca47db1be92c1072e973fd8dc4a082f7d70214
+	"cyber1gs92s58t6rkallnml8ufdzrz3038dcylrcjyqd": 0.023311111,              // 0x4585c7eaa2cb96d4b59e868929efabeeb8e65b07
+	"cyber1h7u5zvduvc3dqrfq9hejm35ktfxh3ha7hyqd2g": 0.0132800000000000911111, // 0x002b9c5b537a1b6004ed720f32cc808fd6210f26
+	"cyber1rl3xnsrkpjfwejqfy7v4kntu64hzxy8dk65q98": 0.003111111,              // 0x00d3c9033570b8adea9c18780325a45635c55805
+	"cyber1xege0g92p6exmzjv58u7vh3s5zkz75v4euzyxe": 0.003111111,              // 0x5d01f31f6eda95489ca1e3c6357a9627fa2983de
 }
 
 // 0.1.0 Distribution
@@ -109,6 +112,32 @@ func AddMissingEulerTokensCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Comm
 	return cmd
 }
 
+func ChangeGenesisAccsPrefixCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
+
+	cmd := &cobra.Command{
+		Use: "change-genesis-accs-prefix",
+		RunE: func(cmd *cobra.Command, args []string) error {
+
+			// set old prefix for parsing file
+			sdk.GetConfig().SetBech32PrefixForAccount("cbd", "cbdpub")
+			sdk.GetConfig().SetBech32PrefixForValidator("cbdvaloper", "cbdvaloperpub")
+			sdk.GetConfig().SetBech32PrefixForConsensusNode("cbdvalcons", "cbdvalconspub")
+			doc, state, err := loadGenesisState(ctx, cdc)
+			if err != nil {
+				return err
+			}
+
+			fmt.Println("")
+			fmt.Println("Changing accs prefix from 'cbd' to 'cyber' (0.1.0 -> 0.1.1 change)")
+
+			// set new prefix to persis file
+			app.SetPrefix()
+			return saveGenesisState(ctx, cdc, doc, state)
+		},
+	}
+	return cmd
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // calculate proof of use(pou) tokens amount.

daemon/cmd/init.go

@@ -38,8 +38,10 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 		Long:  `Initialize validators's and node's configuration files.`,
 		Args:  cobra.NoArgs,
 		RunE: func(_ *cobra.Command, _ []string) error {
+
 			config := ctx.Config
 			config.SetRoot(viper.GetString(cli.HomeFlag))
+
 			chainID := viper.GetString(client.FlagChainID)
 			if chainID == "" {
 				chainID = fmt.Sprintf("test-chain-%v", common.RandStr(6))
@@ -53,8 +55,7 @@ func InitCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command {
 
 			var appState json.RawMessage
 			genFile := config.GenesisFile()
-			if appState, err = initializeEmptyGenesis(cdc, genFile, chainID,
-				viper.GetBool(flagOverwrite)); err != nil {
+			if appState, err = initializeEmptyGenesis(cdc, genFile, chainID, viper.GetBool(flagOverwrite)); err != nil {
 				return err
 			}
 			if err = ExportGenesisFile(genFile, chainID, nil, appState); err != nil {

daemon/cmd/testnet.go

@@ -185,7 +185,7 @@ func initTestnet(config *tmconfig.Config, cdc *codec.Codec) error {
 		msg := staking.NewMsgCreateValidator(
 			sdk.ValAddress(addr),
 			valPubKeys[i],
-			sdk.NewInt64Coin(coin.CBD, 10000000000000000),
+			sdk.NewInt64Coin(coin.CYB, 10000000000000000),
 			staking.NewDescription(nodeDirName, "", "", ""),
 			staking.NewCommissionMsg(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()),
 		)

daemon/main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"encoding/json"
 	"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/cybercongress/cyberd/app"
-	initCyberd "github.com/cybercongress/cyberd/daemon/cmd"
+	"github.com/cybercongress/cyberd/daemon/cmd"
 	"github.com/cybercongress/cyberd/daemon/rpc"
 	"github.com/cybercongress/cyberd/x/rank"
 	"github.com/spf13/cobra"
@@ -24,13 +25,16 @@ import (
 const (
 	flagGpuEnabled            = "compute-rank-on-gpu"
 	flagSearchRpcQueryEnabled = "allow-search-rpc-query"
+	flagNotToSealAccPrefix    = "not-to-seal-acc-prefix"
 )
 
 func main() {
 
+	rootDir := os.ExpandEnv("$HOME/.cyberd")
+
 	cdc := app.MakeCodec()
-	app.SetPrefix()
 	ctx := server.NewDefaultContext()
+	ctx.Config.RootDir = rootDir
 
 	cobra.EnableCommandSorting = false
 	rootCmd := &cobra.Command{
@@ -39,13 +43,24 @@ func main() {
 		PersistentPreRunE: server.PersistentPreRunEFn(ctx),
 	}
 
-	rootCmd.AddCommand(initCyberd.InitCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.GenerateAccountsCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.CollectGenTxsCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.TestnetFilesCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.GenTxCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.AddGenesisAccountCmd(ctx, cdc))
-	rootCmd.AddCommand(initCyberd.GenesisCmds(ctx, cdc))
+	rootCmd.PersistentPreRunE = func(_ *cobra.Command, args []string) error {
+		for _, arg := range args {
+			if arg == flagNotToSealAccPrefix {
+				return nil
+			}
+		}
+		app.SetPrefix()
+		return nil
+	}
+
+	rootCmd.AddCommand(cmd.InitCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.GenerateAccountsCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.CollectGenTxsCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.TestnetFilesCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.GenTxCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.AddGenesisAccountCmd(ctx, cdc))
+	rootCmd.AddCommand(cmd.GenesisCmds(ctx, cdc))
+	rootCmd.AddCommand(client.NewCompletionCmd(rootCmd, true))
 	server.AddCommands(ctx, cdc, rootCmd, newApp, exportAppStateAndTMValidators)
 
 	for _, c := range rootCmd.Commands() {
@@ -55,13 +70,9 @@ func main() {
 		}
 	}
 
-	// prepare and add flags
-	rootDir := os.ExpandEnv("$HOME/.cyberd")
 	executor := cli.PrepareBaseCmd(rootCmd, "CBD", rootDir)
-
 	err := executor.Execute()
 	if err != nil {
-		// Note: Handle with #870
 		panic(err)
 	}
 }

types/coin/coins.go

@@ -1,5 +1,5 @@
 package coin
 
 const (
-	CBD = "cbd"
+	CYB = "сyb"
 )

x/bank/keeper.go

@@ -95,7 +95,7 @@ func (k Keeper) GetAccountUnboundedStake(ctx sdk.Context, addr sdk.AccAddress) i
 	if acc == nil {
 		return 0
 	}
-	return acc.GetCoins().AmountOf(coin.CBD).Int64()
+	return acc.GetCoins().AmountOf(coin.CYB).Int64()
 }
 
 func (k Keeper) GetAccountBoundedStake(ctx sdk.Context, addr sdk.AccAddress) int64 {