feat(simapp): Genesis related commands under one `genesis` command #14149

pysel · 2022-12-05T09:37:55Z

Description

Changes

Available Commands:
  completion  Generate the autocompletion script for the specified shell
  config      Create or query an application CLI configuration file
  debug       Tool for helping with debugging your application
  export      Export state to JSON
  genesis     Genesis subcommands                                                <===== GENESIS
  help        Help about any command
  init        Initialize private validator, p2p, genesis, and application configuration files
  keys        Manage your application's keys
  prune       Prune app history states by keeping the recent heights and deleting old heights
  query       Querying subcommands
  rollback    rollback cosmos-sdk and tendermint state by one height
  rosetta     spin up a rosetta server
  start       Run the full node
  status      Query remote node for status
  tendermint  Tendermint subcommands
  testnet     subcommands for starting or configuring local testnets
  tx          Transactions subcommands
  version     Print the application binary version information

Genesis related commands now are all under one genesis command in simd. These ones are:

Migrate
Add-genesis-account
Gentx
Validate-genesis

Moved genaccount.go (add-genesis-accound command source) and it's test to x/genutil/client/cli. Marked original files as deprecated.

After this PR is merged, will create a PR to gaia with similar changes.

Further question

Should we also add export command as a sub-command to genesis?

x/genutil/client/cli/genaccount.go

+			appendflag, _ := cmd.Flags().GetBool(flagAppendMode)
+			vestingStart, _ := cmd.Flags().GetInt64(flagVestingStart)
+			vestingEnd, _ := cmd.Flags().GetInt64(flagVestingEnd)
+			vestingAmtStr, _ := cmd.Flags().GetString(flagVestingAmt)


x/genutil/client/cli/genaccount.go

+
+			appendflag, _ := cmd.Flags().GetBool(flagAppendMode)
+			vestingStart, _ := cmd.Flags().GetInt64(flagVestingStart)
+			vestingEnd, _ := cmd.Flags().GetInt64(flagVestingEnd)


x/genutil/client/cli/genaccount.go

+			}
+
+			appendflag, _ := cmd.Flags().GetBool(flagAppendMode)
+			vestingStart, _ := cmd.Flags().GetInt64(flagVestingStart)


x/genutil/client/cli/genaccount.go

+				}
+			}
+
+			appendflag, _ := cmd.Flags().GetBool(flagAppendMode)


x/genutil/client/cli/genaccount.go

+			addr, err := sdk.AccAddressFromBech32(args[0])
+			if err != nil {
+				inBuf := bufio.NewReader(cmd.InOrStdin())
+				keyringBackend, _ := cmd.Flags().GetString(flags.FlagKeyringBackend)


julienrbrt

Hi, thanks for your contribution! However, simapp must not be imported in the SDK.

Changes implemented

pysel · 2022-12-05T10:21:17Z

Hi, thanks for your contribution! However, simapp must not be imported in the SDK.

@julienrbrt Fixed. One question left though, why does the genaccount.go located in simapp/simd/cmd folder? In this PR I moved it to x/genutil and left a deprecated version in simapp, but if there is a reason for it being there, I will revert my changes. Thanks

julienrbrt

I like the fact you've moved genaccount.go.
Apps are not supposed to import simapp, so it makes sense to have it in the SDK.
Thanks for that. For that exact reason, I think we can actually delete the old genaccount.go / genaccount_test.go from simapp as clean-up, and add a changelog.

simapp/simd/cmd/genaccount_test.go

julienrbrt · 2022-12-05T10:39:07Z

x/genutil/client/cli/genaccount.go

@@ -0,0 +1,89 @@
+// This file is deprecated. Use x/genutil/client/cli/genaccount.go


Suggested change

// This file is deprecated. Use x/genutil/client/cli/genaccount.go

This is not resolved. We can remove this comment.

julienrbrt · 2022-12-05T10:57:18Z

One more comment, can we update the docs / scripts to use the genesis sub-command?
I've seen a few scripts requiring to be updated.

simapp/simd/cmd/root.go

x/genutil/client/cli/genaccount.go

pysel · 2022-12-06T02:30:34Z

@tac0turtle @julienrbrt Changes addressed. Still, my question is open: is it worth also adding export command to genesis?

julienrbrt

lgtm, one nit.

julienrbrt · 2022-12-06T09:43:38Z

simapp/simd/cmd/root.go

@@ -207,6 +200,40 @@ func addModuleInitFlags(startCmd *cobra.Command) {
 	crisis.AddModuleInitFlags(startCmd)
 }

+// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter
+func genesisCommand(encodingConfig params.EncodingConfig, cmds ...*cobra.Command) *cobra.Command {


This is not so useful if genesisCoreCommand is still in simapp.
We can move genesisCoreCommand under x/genutil/... but do not import simapp (so, adding BasicManager as an argument and the nodeHomePath)

that's a fair point, changes addressed

julienrbrt · 2022-12-06T09:57:42Z

Should we also add export command as a sub-command to genesis?

This makes sense to me, but personally, I think keeping init and export together at the root makes sense too.
Maybe better to leave it as is.

atheeshp

lgtm, a small nit.
there is an empty file committed. https://github.com/cosmos/cosmos-sdk/pull/14149/files#diff-5ed89ad8d3d6fd496b68d70f5f1ab683bb115e37455f9e78d09af4d7f09f559a

julienrbrt

lgtm! Thank you 🙏

julienrbrt · 2022-12-07T08:29:30Z

x/genutil/client/cli/core_genesis_cmd.go

+	"github.com/spf13/cobra"
+)
+
+// genesisCoreCommand adds core sdk's sub-commands into genesis command:


Suggested change

// genesisCoreCommand adds core sdk's sub-commands into genesis command:

// GenesisCoreCommand adds core sdk's sub-commands into genesis command:

julienrbrt · 2022-12-07T08:29:46Z

x/genutil/client/cli/core_genesis_cmd.go

+
+// genesisCoreCommand adds core sdk's sub-commands into genesis command:
+// -> gentx, migrate, collect-gentxs, validate-genesis, add-genesis-account
+func GenesisCoreCommand(encodingConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string) *cobra.Command {


Suggested change

func GenesisCoreCommand(encodingConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string) *cobra.Command {

func GenesisCoreCommand(txConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string) *cobra.Command {

julienrbrt · 2022-12-07T08:30:06Z

x/genutil/client/cli/core_genesis_cmd.go

+	gentxModule := moduleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic)
+
+	cmd.AddCommand(
+		GenTxCmd(moduleBasics, encodingConfig,


Suggested change

GenTxCmd(moduleBasics, encodingConfig,

GenTxCmd(moduleBasics, txConfig,

pysel · 2022-12-07T09:36:51Z

lgtm, a small nit.
there is an empty file committed. https://github.com/cosmos/cosmos-sdk/pull/14149/files#diff-5ed89ad8d3d6fd496b68d70f5f1ab683bb115e37455f9e78d09af4d7f09f559a

oh, thanks for noticing, fixed

pysel · 2022-12-07T09:38:35Z

@julienrbrt addressed!

julienrbrt · 2022-12-07T09:43:29Z

Awesome! If you rebase it'll automerge.

…nd (#14149) (cherry picked from commit ecb4ca2)

…ackport #14149) (#14199) Co-authored-by: Ruslan Akhtariev <46343690+RusAkh@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr>

…nd (cosmos#14149)

Ruslan Akhtariev added 3 commits December 5, 2022 15:35

wip

abc991c

remove old test file, change import path in new one

fbc9176

bring back old genaccount files

5d8bdaa

pysel requested a review from a team as a code owner December 5, 2022 09:37

github-actions bot added C:CLI C:x/genutil genutil module issues labels Dec 5, 2022

pysel changed the title ~~Genesis related commands under one genesis command~~ simapp: Genesis related commands under one genesis command Dec 5, 2022

github-advanced-security bot found potential problems Dec 5, 2022

View reviewed changes

julienrbrt previously requested changes Dec 5, 2022

View reviewed changes

move genesis creation function to simapp

5b75163

pysel requested a review from julienrbrt December 5, 2022 10:17

julienrbrt changed the title ~~simapp: Genesis related commands under one genesis command~~ feat(simapp): Genesis related commands under one genesis command Dec 5, 2022

julienrbrt reviewed Dec 5, 2022

View reviewed changes

simapp/simd/cmd/root.go Outdated Show resolved Hide resolved

tac0turtle reviewed Dec 5, 2022

View reviewed changes

simapp/simd/cmd/root.go Outdated Show resolved Hide resolved

tac0turtle reviewed Dec 5, 2022

View reviewed changes

x/genutil/client/cli/genaccount.go Show resolved Hide resolved

julienrbrt added the backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release label Dec 5, 2022

Ruslan Akhtariev added 5 commits December 6, 2022 09:03

deleted old files

dd575c0

add functionality to add blockchain specific genesis subcommands

9e67cc3

docs update

5542cfb

changelog upd

51ce0d9

update scripts and docs

0125743

github-actions bot added C:Cosmovisor Issues and PR related to Cosmovisor C:Rosetta Issues and PR related to Rosetta Type: ADR labels Dec 6, 2022

pysel requested review from tac0turtle and removed request for tac0turtle December 6, 2022 02:29

pysel requested a review from julienrbrt December 6, 2022 02:29

julienrbrt reviewed Dec 6, 2022

View reviewed changes

julienrbrt assigned tac0turtle and julienrbrt Dec 6, 2022

Ruslan Akhtariev added 2 commits December 7, 2022 09:47

rm unneded doc

42623c5

move core genesis cmd to genutils

9093204

pysel requested a review from julienrbrt December 7, 2022 03:10

atheeshp approved these changes Dec 7, 2022

View reviewed changes

julienrbrt approved these changes Dec 7, 2022

View reviewed changes

julienrbrt reviewed Dec 7, 2022

View reviewed changes

rm empty file

f3ab2a7

docs and little changes

2660722

julienrbrt enabled auto-merge (squash) December 7, 2022 09:43

Merge branch 'cosmos:main' into ruslan/genesis-cli

e0f86a0

julienrbrt merged commit ecb4ca2 into cosmos:main Dec 7, 2022

mergify bot pushed a commit that referenced this pull request Dec 7, 2022

feat(simapp): move genesis related commands under one genesis comma…

8fb0b59

…nd (#14149) (cherry picked from commit ecb4ca2)

mergify bot mentioned this pull request Dec 7, 2022

feat(simapp): Genesis related commands under one genesis command (backport #14149) #14199

Merged

pysel mentioned this pull request Dec 8, 2022

Genesis-related commands under one genesis command osmosis-labs/cosmos-sdk#395

Closed

This was referenced Jan 29, 2023

Cosmos SDK v0.47 strangelove-ventures/interchaintest#359

Merged

Add support for genesis sub commands strangelove-ventures/interchaintest#384

Merged

crodriguezvega mentioned this pull request Mar 24, 2023

support simultaneously binaries with/without genesis sub-command informalsystems/gm#7

Closed

larry0x pushed a commit to larry0x/cosmos-sdk that referenced this pull request May 22, 2023

feat(simapp): move genesis related commands under one genesis comma…

4cf99e9

…nd (cosmos#14149)

tropicaldog mentioned this pull request Jan 30, 2024

Add genesis command to cudos-noded root cudoventures/cudos-node#134

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(simapp): Genesis related commands under one `genesis` command #14149

feat(simapp): Genesis related commands under one `genesis` command #14149

pysel commented Dec 5, 2022

julienrbrt left a comment

pysel commented Dec 5, 2022

julienrbrt left a comment

julienrbrt Dec 5, 2022

julienrbrt Dec 6, 2022

julienrbrt commented Dec 5, 2022

pysel commented Dec 6, 2022

julienrbrt left a comment

julienrbrt Dec 6, 2022 •

edited

Loading

pysel Dec 7, 2022

julienrbrt commented Dec 6, 2022

atheeshp left a comment

julienrbrt left a comment

julienrbrt Dec 7, 2022

julienrbrt Dec 7, 2022

julienrbrt Dec 7, 2022

pysel commented Dec 7, 2022

pysel commented Dec 7, 2022

julienrbrt commented Dec 7, 2022

		@@ -0,0 +1,89 @@
		// This file is deprecated. Use x/genutil/client/cli/genaccount.go

	// genesisCoreCommand adds core sdk's sub-commands into genesis command:
	// GenesisCoreCommand adds core sdk's sub-commands into genesis command:

	func GenesisCoreCommand(encodingConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string) *cobra.Command {
	func GenesisCoreCommand(txConfig client.TxConfig, moduleBasics module.BasicManager, defaultNodeHome string) *cobra.Command {

	GenTxCmd(moduleBasics, encodingConfig,
	GenTxCmd(moduleBasics, txConfig,

feat(simapp): Genesis related commands under one genesis command #14149

feat(simapp): Genesis related commands under one genesis command #14149

Conversation

pysel commented Dec 5, 2022

Description

Changes

Further question

julienrbrt left a comment

Choose a reason for hiding this comment

pysel commented Dec 5, 2022

julienrbrt left a comment

Choose a reason for hiding this comment

julienrbrt Dec 5, 2022

Choose a reason for hiding this comment

julienrbrt Dec 6, 2022

Choose a reason for hiding this comment

julienrbrt commented Dec 5, 2022

pysel commented Dec 6, 2022

julienrbrt left a comment

Choose a reason for hiding this comment

julienrbrt Dec 6, 2022 • edited Loading

Choose a reason for hiding this comment

pysel Dec 7, 2022

Choose a reason for hiding this comment

julienrbrt commented Dec 6, 2022

atheeshp left a comment

Choose a reason for hiding this comment

julienrbrt left a comment

Choose a reason for hiding this comment

julienrbrt Dec 7, 2022

Choose a reason for hiding this comment

julienrbrt Dec 7, 2022

Choose a reason for hiding this comment

julienrbrt Dec 7, 2022

Choose a reason for hiding this comment

pysel commented Dec 7, 2022

pysel commented Dec 7, 2022

julienrbrt commented Dec 7, 2022

feat(simapp): Genesis related commands under one `genesis` command #14149

feat(simapp): Genesis related commands under one `genesis` command #14149

julienrbrt Dec 6, 2022 •

edited

Loading