From 4f6f8e09ae19b8cd314dbb9e8d1a15cd30c50179 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Tue, 6 Nov 2018 09:08:26 +0000 Subject: [PATCH 1/7] Add small utility to add account to genesis.json after gaiad init --- cmd/gaia/cmd/gaiad/main.go | 1 + cmd/gaia/init/genesis_accts.go | 65 ++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 cmd/gaia/init/genesis_accts.go diff --git a/cmd/gaia/cmd/gaiad/main.go b/cmd/gaia/cmd/gaiad/main.go index ae076571b5..ef7b39d111 100644 --- a/cmd/gaia/cmd/gaiad/main.go +++ b/cmd/gaia/cmd/gaiad/main.go @@ -42,6 +42,7 @@ func main() { rootCmd.AddCommand(gaiaInit.CollectGenTxsCmd(ctx, cdc)) rootCmd.AddCommand(gaiaInit.TestnetFilesCmd(ctx, cdc, server.AppInit{})) rootCmd.AddCommand(gaiaInit.GenTxCmd(ctx, cdc)) + rootCmd.AddCommand(gaiaInit.AddGenesisAccountCmd(ctx, cdc)) server.AddCommands(ctx, cdc, rootCmd, appInit, newApp, exportAppStateAndTMValidators) diff --git a/cmd/gaia/init/genesis_accts.go b/cmd/gaia/init/genesis_accts.go new file mode 100644 index 0000000000..af260d9d69 --- /dev/null +++ b/cmd/gaia/init/genesis_accts.go @@ -0,0 +1,65 @@ +package init + +import ( + "fmt" + "github.com/cosmos/cosmos-sdk/cmd/gaia/app" + "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/server" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/auth" + "github.com/spf13/cobra" + "github.com/spf13/viper" + "github.com/tendermint/tendermint/libs/cli" + "github.com/tendermint/tendermint/libs/common" +) + +// AddGenesisAccountCmd returns add-genesis-account cobra Command +func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command { + cmd := &cobra.Command{ + Use: "add-genesis-account [address] [coin][,[coin]]", + Short: "Add genesis account to genesis.json", + Args: cobra.ExactArgs(2), + RunE: func(_ *cobra.Command, args []string) error { + config := ctx.Config + config.SetRoot(viper.GetString(cli.HomeFlag)) + + addr, err := sdk.AccAddressFromBech32(args[0]) + if err != nil { + return err + } + coins, err := sdk.ParseCoins(args[1]) + if err != nil { + return err + } + coins.Sort() + + genFile := config.GenesisFile() + if !common.FileExists(genFile) { + return fmt.Errorf("%s does not exist, run `gaiad init` first", genFile) + } + genDoc, err := loadGenesisDoc(cdc, genFile) + if err != nil { + return err + } + + var appState app.GenesisState + if err = cdc.UnmarshalJSON(genDoc.AppState, &appState); err != nil { + return err + } + + acc := auth.NewBaseAccountWithAddress(addr) + acc.Coins = coins + appState.Accounts = append(appState.Accounts, app.NewGenesisAccount(&acc)) + + appStateJSON, err := cdc.MarshalJSON(appState) + if err != nil { + return err + } + + return WriteGenesisFile(genFile, genDoc.ChainID, nil, appStateJSON) + }, + } + + cmd.Flags().String(cli.HomeFlag, app.DefaultNodeHome, "node's home directory") + return cmd +} From 194691f052aa7acee802c20e99302f391a4638ac Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 9 Nov 2018 10:53:40 +0000 Subject: [PATCH 2/7] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f635b7ea6f..45a9eb66cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ FEATURES * [cli] [\#2569](https://github.com/cosmos/cosmos-sdk/pull/2569) Add commands to query validator unbondings and redelegations * [cli] [\#2524](https://github.com/cosmos/cosmos-sdk/issues/2524) Add support offline mode to `gaiacli tx sign`. Lookups are not performed if the flag `--offline` is on. * [cli] [\#2558](https://github.com/cosmos/cosmos-sdk/issues/2558) Rename --print-sigs to --validate-signatures. It now performs a complete set of sanity checks and reports to the user. Also added --print-signature-only to print the signature only, not the whole transaction. + * [cli] [\#2704](https://github.com/cosmos/cosmos-sdk/pull/2704) New add-genesis-account convenience command to populate genesis.json with genesis accounts. * SDK * [\#1336](https://github.com/cosmos/cosmos-sdk/issues/1336) Mechanism for SDK Users to configure their own Bech32 prefixes instead of using the default cosmos prefixes. From 8a7c4900f44f370f04a564aefc62d53165ca61ef Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 9 Nov 2018 10:59:11 +0000 Subject: [PATCH 3/7] s/WriteGenesisFile/ExportGenesisFile/ --- cmd/gaia/init/genesis_accts.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/gaia/init/genesis_accts.go b/cmd/gaia/init/genesis_accts.go index af260d9d69..3d43712fcc 100644 --- a/cmd/gaia/init/genesis_accts.go +++ b/cmd/gaia/init/genesis_accts.go @@ -2,6 +2,7 @@ package init import ( "fmt" + "github.com/cosmos/cosmos-sdk/cmd/gaia/app" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" @@ -56,7 +57,7 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command return err } - return WriteGenesisFile(genFile, genDoc.ChainID, nil, appStateJSON) + return ExportGenesisFile(genFile, genDoc.ChainID, nil, appStateJSON) }, } From 61fd142b9e43a364bc05ee28abb92a41b0edefd0 Mon Sep 17 00:00:00 2001 From: Hendrik Hofstadt Date: Sat, 10 Nov 2018 01:08:35 +0100 Subject: [PATCH 4/7] Fix TimeoutCommit (#2743) * Fix TimeoutCommit to 5 seconds instead of whatever it was before which was too short. --- PENDING.md | 3 ++- server/util.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PENDING.md b/PENDING.md index 2e93ddea5c..1c782aa4fb 100644 --- a/PENDING.md +++ b/PENDING.md @@ -48,7 +48,8 @@ BUG FIXES * Gaia CLI (`gaiacli`) * Gaia - + * [\#2742](https://github.com/cosmos/cosmos-sdk/issues/2742) Fix time format of TimeoutCommit override + * SDK * Tendermint diff --git a/server/util.go b/server/util.go index 51f10c765a..633ad88704 100644 --- a/server/util.go +++ b/server/util.go @@ -7,6 +7,7 @@ import ( "os/signal" "path/filepath" "syscall" + "time" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -92,7 +93,7 @@ func interceptLoadConfig() (conf *cfg.Config, err error) { conf.P2P.RecvRate = 5120000 conf.P2P.SendRate = 5120000 conf.TxIndex.IndexAllTags = true - conf.Consensus.TimeoutCommit = 5000 + conf.Consensus.TimeoutCommit = 5 * time.Second cfg.WriteConfigFile(configFilePath, conf) // Fall through, just so that its parsed into memory. } From e66a39c898384b524e31742303a6d1f8e816929d Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Fri, 9 Nov 2018 16:11:58 -0800 Subject: [PATCH 5/7] Gaia-9000: Update to TM 0.26.1-rc2 (#2753) * Update to tm 0.26.1-rc2 to fix prometheus issue and node disconnect issue. --- Gopkg.lock | 11 ++++++----- Gopkg.toml | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 8dd4be7083..04067bdfcb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -165,12 +165,13 @@ version = "v1.2.0" [[projects]] - digest = "1:ea40c24cdbacd054a6ae9de03e62c5f252479b96c716375aace5c120d68647c8" + digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10" name = "github.com/hashicorp/hcl" packages = [ ".", "hcl/ast", "hcl/parser", + "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", @@ -298,7 +299,7 @@ "model", ] pruneopts = "UT" - revision = "7e9e6cabbd393fc208072eedef99188d0ce788b6" + revision = "0b1957f9d949dfa3084171a6ec5642b38055276a" [[projects]] branch = "master" @@ -434,7 +435,7 @@ version = "v0.11.1" [[projects]] - digest = "1:395820b381043b9d2204e181ddf0f9147397c4a7b8f5dc3162de4cfcddf4589a" + digest = "1:fc6b632a318f32a77b2bd4c60c6c9276ce82256a4bb0b67b4c8bebac4d367622" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -500,8 +501,8 @@ "version", ] pruneopts = "UT" - revision = "03e42d2e3866f01a00625f608e3bbfaeb30690de" - version = "v0.26.1-rc0" + revision = "58574b7372cc9dd224ef04aaa438578f72e69a77" + version = "v0.26.1-rc2" [[projects]] digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666" diff --git a/Gopkg.toml b/Gopkg.toml index 5726008858..1d120f9406 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -36,7 +36,7 @@ [[override]] name = "github.com/tendermint/tendermint" - version = "v0.26.1-rc0" # TODO replace w/ 0.26.1 + version = "v0.26.1-rc2" # TODO replace w/ 0.26.1 ## deps without releases: From bb54a0de127e45713f272217f578c0abe53a5b21 Mon Sep 17 00:00:00 2001 From: Jae Kwon Date: Fri, 9 Nov 2018 19:39:22 -0800 Subject: [PATCH 6/7] Gaia-9000: Update to TM 0.26.1-rc3 -- pex SeedMode fix --- Gopkg.lock | 9 ++++----- Gopkg.toml | 2 +- PENDING.md | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 04067bdfcb..9289fd24b5 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -165,13 +165,12 @@ version = "v1.2.0" [[projects]] - digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10" + digest = "1:ea40c24cdbacd054a6ae9de03e62c5f252479b96c716375aace5c120d68647c8" name = "github.com/hashicorp/hcl" packages = [ ".", "hcl/ast", "hcl/parser", - "hcl/printer", "hcl/scanner", "hcl/strconv", "hcl/token", @@ -435,7 +434,7 @@ version = "v0.11.1" [[projects]] - digest = "1:fc6b632a318f32a77b2bd4c60c6c9276ce82256a4bb0b67b4c8bebac4d367622" + digest = "1:5b1373b03f39e6f6061cd91f3829100527ebb5f94240c092bf9e5d314b153501" name = "github.com/tendermint/tendermint" packages = [ "abci/client", @@ -501,8 +500,8 @@ "version", ] pruneopts = "UT" - revision = "58574b7372cc9dd224ef04aaa438578f72e69a77" - version = "v0.26.1-rc2" + revision = "48ab899923c564bbf2fa2f1244c11cb930e28132" + version = "v0.26.1-rc3" [[projects]] digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666" diff --git a/Gopkg.toml b/Gopkg.toml index 1d120f9406..466fd373fe 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -36,7 +36,7 @@ [[override]] name = "github.com/tendermint/tendermint" - version = "v0.26.1-rc2" # TODO replace w/ 0.26.1 + version = "v0.26.1-rc3" # TODO replace w/ 0.26.1 ## deps without releases: diff --git a/PENDING.md b/PENDING.md index 1c782aa4fb..f3eea20023 100644 --- a/PENDING.md +++ b/PENDING.md @@ -53,3 +53,4 @@ BUG FIXES * SDK * Tendermint + * [\#2797](https://github.com/tendermint/tendermint/pull/2797) AddressBook requires addresses to have IDs; Do not crap out immediately after sending pex addrs in seed mode From 811b863677e0944dfad8a6b187cbab9d131c6e95 Mon Sep 17 00:00:00 2001 From: Alexander Bezobchuk Date: Mon, 12 Nov 2018 02:34:50 -0500 Subject: [PATCH 7/7] Use correct Bech32 prefix for show-address command (#2746) * Use consensus address bech32 prefix * Update show-address CLI description --- PENDING.md | 1 + server/tm_cmds.go | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PENDING.md b/PENDING.md index f3eea20023..1ff6e3ee19 100644 --- a/PENDING.md +++ b/PENDING.md @@ -48,6 +48,7 @@ BUG FIXES * Gaia CLI (`gaiacli`) * Gaia + * [\#2723] Use `cosmosvalcons` Bech32 prefix in `tendermint show-address` * [\#2742](https://github.com/cosmos/cosmos-sdk/issues/2742) Fix time format of TimeoutCommit override * SDK diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 82652bdec5..5aeacf92f3 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -63,17 +63,17 @@ func ShowValidatorCmd(ctx *Context) *cobra.Command { func ShowAddressCmd(ctx *Context) *cobra.Command { cmd := &cobra.Command{ Use: "show-address", - Short: "Shows this node's tendermint validator address", + Short: "Shows this node's tendermint validator consensus address", RunE: func(cmd *cobra.Command, args []string) error { cfg := ctx.Config privValidator := pvm.LoadOrGenFilePV(cfg.PrivValidatorFile()) - valAddr := (sdk.ValAddress)(privValidator.Address) + valConsAddr := (sdk.ConsAddress)(privValidator.Address) if viper.GetBool(client.FlagJson) { - return printlnJSON(valAddr) + return printlnJSON(valConsAddr) } - fmt.Println(valAddr.String()) + fmt.Println(valConsAddr.String()) return nil }, }