From 31ccfb5b5a4a4966f2de96172824222b8d52581a Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Thu, 15 Nov 2018 15:44:27 +0000 Subject: [PATCH 1/5] add-genesis-account: validate app state accounts --- cmd/gaia/init/genesis_accts.go | 20 +++++++++---- cmd/gaia/init/genesis_accts_test.go | 45 +++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 cmd/gaia/init/genesis_accts_test.go diff --git a/cmd/gaia/init/genesis_accts.go b/cmd/gaia/init/genesis_accts.go index 3d43712fc..04c1f6283 100644 --- a/cmd/gaia/init/genesis_accts.go +++ b/cmd/gaia/init/genesis_accts.go @@ -1,6 +1,7 @@ package init import ( + "encoding/json" "fmt" "github.com/cosmos/cosmos-sdk/cmd/gaia/app" @@ -48,11 +49,7 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command return err } - acc := auth.NewBaseAccountWithAddress(addr) - acc.Coins = coins - appState.Accounts = append(appState.Accounts, app.NewGenesisAccount(&acc)) - - appStateJSON, err := cdc.MarshalJSON(appState) + appStateJSON, err := addGenesisAccount(cdc, appState, addr, coins) if err != nil { return err } @@ -64,3 +61,16 @@ func AddGenesisAccountCmd(ctx *server.Context, cdc *codec.Codec) *cobra.Command cmd.Flags().String(cli.HomeFlag, app.DefaultNodeHome, "node's home directory") return cmd } + +func addGenesisAccount(cdc *codec.Codec, appState app.GenesisState, addr sdk.AccAddress, coins sdk.Coins) (json.RawMessage, error) { + for _, stateAcc := range appState.Accounts { + if stateAcc.Address.Equals(addr) { + return nil, fmt.Errorf("the application state already contains account %v", addr) + } + } + + acc := auth.NewBaseAccountWithAddress(addr) + acc.Coins = coins + appState.Accounts = append(appState.Accounts, app.NewGenesisAccount(&acc)) + return cdc.MarshalJSON(appState) +} diff --git a/cmd/gaia/init/genesis_accts_test.go b/cmd/gaia/init/genesis_accts_test.go new file mode 100644 index 000000000..8825a8cd3 --- /dev/null +++ b/cmd/gaia/init/genesis_accts_test.go @@ -0,0 +1,45 @@ +package init + +import ( + "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/crypto/secp256k1" + "testing" + + "github.com/cosmos/cosmos-sdk/cmd/gaia/app" + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func TestAddGenesisAccount(t *testing.T) { + cdc := codec.New() + addr1 := sdk.AccAddress(secp256k1.GenPrivKey().PubKey().Address()) + type args struct { + appState app.GenesisState + addr sdk.AccAddress + coins sdk.Coins + } + tests := []struct { + name string + args args + wantErr bool + }{ + { + "valid account", + args{ + app.GenesisState{}, + addr1, + sdk.Coins{}, + }, + false}, + {"dup account", args{ + app.GenesisState{Accounts: []app.GenesisAccount{app.GenesisAccount{Address:addr1}}}, + addr1, + sdk.Coins{}}, true}, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + _, err := addGenesisAccount(cdc, tt.args.appState, tt.args.addr, tt.args.coins) + require.Equal(t, tt.wantErr, (err != nil)) + }) + } +} From d22947f7b36bdc961dc7fa013f804fd0a19c93e1 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Thu, 15 Nov 2018 15:47:37 +0000 Subject: [PATCH 2/5] Update PENDING.md --- PENDING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/PENDING.md b/PENDING.md index af4a1193b..3f57592e0 100644 --- a/PENDING.md +++ b/PENDING.md @@ -8,6 +8,7 @@ BREAKING CHANGES * [cli] [\#2728](https://github.com/cosmos/cosmos-sdk/pull/2728) Seperate `tx` and `query` subcommands by module * [cli] [\#2727](https://github.com/cosmos/cosmos-sdk/pull/2727) Fix unbonding command flow * [cli] [\#2786](https://github.com/cosmos/cosmos-sdk/pull/2786) Fix redelegation command flow + * [cli] [\#2829](https://github.com/cosmos/cosmos-sdk/pull/2829) add-genesis-account command now validates state when adding accounts * Gaia From f2b38874ef04d22d2c93c737d78f62e8673e59b3 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 16 Nov 2018 05:01:34 +0000 Subject: [PATCH 3/5] Check whether key passed with --name exists before redirecting to tx create-validator Closes: #2804 --- cmd/gaia/init/gentx.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cmd/gaia/init/gentx.go b/cmd/gaia/init/gentx.go index 449eb2b85..6d66f2e30 100644 --- a/cmd/gaia/init/gentx.go +++ b/cmd/gaia/init/gentx.go @@ -3,6 +3,7 @@ package init import ( "fmt" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/keys" "github.com/cosmos/cosmos-sdk/cmd/gaia/app" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" @@ -61,6 +62,14 @@ following delegation and commission default parameters: return err } + kb, err := keys.GetKeyBaseFromDir(viper.GetString(flagClientHome)) + if err != nil { + return err + } + if _, err = kb.Get(viper.GetString(client.FlagName)); err != nil { + return err + } + // Read --pubkey, if empty take it from priv_validator.json if valPubKeyString := viper.GetString(cli.FlagPubKey); valPubKeyString != "" { valPubKey, err = sdk.GetConsPubKeyBech32(valPubKeyString) From 9beb6d405e9c3d8ac752e74973236d0d546407a3 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Fri, 16 Nov 2018 05:05:20 +0000 Subject: [PATCH 4/5] Update PENDING.md --- PENDING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/PENDING.md b/PENDING.md index 74395be2d..f58a8f543 100644 --- a/PENDING.md +++ b/PENDING.md @@ -8,6 +8,7 @@ BREAKING CHANGES * [cli] [\#2728](https://github.com/cosmos/cosmos-sdk/pull/2728) Seperate `tx` and `query` subcommands by module * [cli] [\#2727](https://github.com/cosmos/cosmos-sdk/pull/2727) Fix unbonding command flow * [cli] [\#2786](https://github.com/cosmos/cosmos-sdk/pull/2786) Fix redelegation command flow + * [cli] [\#2804](https://github.com/cosmos/cosmos-sdk/issues/2804) Check whether key exists before passing it on to `tx create-validator`. * Gaia From ca2270c87e7611eecd2e5a235d1568903f8ba02e Mon Sep 17 00:00:00 2001 From: Zach Date: Fri, 16 Nov 2018 08:48:38 -0500 Subject: [PATCH 5/5] Merge PR #2831: Fix dead link --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 048f9f39f..5d2ae9b2d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -34,7 +34,7 @@ To install the latest version of the `gaia` application and join the public test ## Contribute -See [this file](./DOCS_README.md) for details of the build process and +See [this file](https://github.com/cosmos/cosmos-sdk/blob/master/docs/DOCS_README.md) for details of the build process and considerations when making changes. ## Version