diff --git a/PENDING.md b/PENDING.md index f45541ccdc..339868c99d 100644 --- a/PENDING.md +++ b/PENDING.md @@ -13,6 +13,7 @@ BREAKING CHANGES * [cli] \#2061 changed proposalID in governance REST endpoints to proposal-id * [cli] \#2014 `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively * [makefile] `get_vendor_deps` no longer updates lock file it just updates vendor directory. Use `update_vendor_deps` to update the lock file. [#2152](https://github.com/cosmos/cosmos-sdk/pull/2152) + * [cli] \#2190 `gaiacli init --gen-txs` is now `gaiacli init --with-txs` to reduce confusion * Gaia * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013) diff --git a/docs/getting-started/create-testnet.md b/docs/getting-started/create-testnet.md index 0b68b3287b..74fd1d5ef2 100644 --- a/docs/getting-started/create-testnet.md +++ b/docs/getting-started/create-testnet.md @@ -13,7 +13,7 @@ Now these json files need to be aggregated together via Github, a Google form, p Place all files on one computer in `$HOME/.gaiad/gen-tx/` ```bash -gaiad init --gen-txs -o --chain= +gaiad init --with-txs -o --chain= ``` This will generate a `genesis.json` in `$HOME/.gaiad/config/genesis.json` distribute this file to all validators on your testnet. diff --git a/networks/remote/ansible/roles/setup-validators/tasks/main.yml b/networks/remote/ansible/roles/setup-validators/tasks/main.yml index 8832db4aa2..d8cb499135 100644 --- a/networks/remote/ansible/roles/setup-validators/tasks/main.yml +++ b/networks/remote/ansible/roles/setup-validators/tasks/main.yml @@ -70,7 +70,7 @@ unarchive: src=files/gen-tx.tgz dest=/home/gaiad/.gaiad/config/gentx owner=gaiad - name: Generate genesis.json - command: "/usr/bin/gaiad init --gen-txs --name=node{{nodeid.stdout_lines[0]}} --chain-id={{TESTNET_NAME}}" + command: "/usr/bin/gaiad init --with-txs --name=node{{nodeid.stdout_lines[0]}} --chain-id={{TESTNET_NAME}}" become: yes become_user: gaiad args: diff --git a/server/init.go b/server/init.go index 39f3d0b7f8..105325e0d5 100644 --- a/server/init.go +++ b/server/init.go @@ -41,7 +41,7 @@ var ( //parameter names, init command var ( FlagOverwrite = "overwrite" - FlagGenTxs = "gen-txs" + FlagWithTxs = "with-txs" FlagIP = "ip" FlagChainID = "chain-id" ) @@ -169,7 +169,7 @@ func InitCmd(ctx *Context, cdc *wire.Codec, appInit AppInit) *cobra.Command { config.SetRoot(viper.GetString(tmcli.HomeFlag)) initConfig := InitConfig{ viper.GetString(FlagChainID), - viper.GetBool(FlagGenTxs), + viper.GetBool(FlagWithTxs), filepath.Join(config.RootDir, "config", "gentx"), viper.GetBool(FlagOverwrite), } @@ -198,7 +198,7 @@ func InitCmd(ctx *Context, cdc *wire.Codec, appInit AppInit) *cobra.Command { } cmd.Flags().BoolP(FlagOverwrite, "o", false, "overwrite the genesis.json file") cmd.Flags().String(FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") - cmd.Flags().Bool(FlagGenTxs, false, "apply genesis transactions from [--home]/config/gentx/") + cmd.Flags().Bool(FlagWithTxs, false, "apply existing genesis transactions from [--home]/config/gentx/") cmd.Flags().AddFlagSet(appInit.FlagsAppGenState) cmd.Flags().AddFlagSet(appInit.FlagsAppGenTx) // need to add this flagset for when no GenTx's provided cmd.AddCommand(GenTxCmd(ctx, cdc, appInit))