feat: specify staking bond_denom when creating a new chain (#9776)
## Description Add a flag that allows us to specify staking bond_denom when creating a new chain ref: #9407 <!-- Add a description of the changes that this PR introduces and the files that are the most critical to review. --> --- ### Author Checklist *All items are required. Please add a note to the item if the item is not applicable and please add links to any relevant follow up issues.* I have... - [ ] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] added `!` to the type prefix if API or client breaking change - [ ] targeted the correct branch (see [PR Targeting](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#pr-targeting)) - [ ] provided a link to the relevant issue or specification - [ ] followed the guidelines for [building modules](https://github.com/cosmos/cosmos-sdk/blob/master/docs/building-modules) - [ ] included the necessary unit and integration [tests](https://github.com/cosmos/cosmos-sdk/blob/master/CONTRIBUTING.md#testing) - [ ] added a changelog entry to `CHANGELOG.md` - [ ] included comments for [documenting Go code](https://blog.golang.org/godoc) - [ ] updated the relevant documentation or specification - [ ] reviewed "Files changed" and left comments if necessary - [ ] confirmed all CI checks have passed ### Reviewers Checklist *All items are required. Please add a note if the item is not applicable and please add your handle next to the items reviewed if you only reviewed selected items.* I have... - [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title - [ ] confirmed `!` in the type prefix if API or client breaking change - [ ] confirmed all author checklist items have been addressed - [ ] reviewed state machine logic - [ ] reviewed API design and naming - [ ] reviewed documentation is accurate - [ ] reviewed tests and test coverage - [ ] manually tested (if applicable)
This commit is contained in:
parent
d05c093378
commit
cab727af0f
|
@ -39,6 +39,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
|
||||||
|
* [\#9776](https://github.com/cosmos/cosmos-sdk/pull/9776) Add flag `staking-bond-denom` to specify the staking bond denomination value when initializing a new chain.
|
||||||
* [\#9533](https://github.com/cosmos/cosmos-sdk/pull/9533) Added a new gRPC method, `DenomOwners`, in `x/bank` to query for all account holders of a specific denomination.
|
* [\#9533](https://github.com/cosmos/cosmos-sdk/pull/9533) Added a new gRPC method, `DenomOwners`, in `x/bank` to query for all account holders of a specific denomination.
|
||||||
* (bank) [\#9618](https://github.com/cosmos/cosmos-sdk/pull/9618) Update bank.Metadata: add URI and URIHash attributes.
|
* (bank) [\#9618](https://github.com/cosmos/cosmos-sdk/pull/9618) Update bank.Metadata: add URI and URIHash attributes.
|
||||||
* [\#9750](https://github.com/cosmos/cosmos-sdk/pull/9750) Emit events for tx signature and sequence, so clients can now query txs by signature (`tx.signature='<base64_sig>'`) or by address and sequence combo (`tx.acc_seq='<addr>/<seq>'`).
|
* [\#9750](https://github.com/cosmos/cosmos-sdk/pull/9750) Emit events for tx signature and sequence, so clients can now query txs by signature (`tx.signature='<base64_sig>'`) or by address and sequence combo (`tx.acc_seq='<addr>/<seq>'`).
|
||||||
|
|
|
@ -7,7 +7,6 @@ import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/cosmos/go-bip39"
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
cfg "github.com/tendermint/tendermint/config"
|
cfg "github.com/tendermint/tendermint/config"
|
||||||
|
@ -23,6 +22,8 @@ import (
|
||||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||||
"github.com/cosmos/cosmos-sdk/types/module"
|
"github.com/cosmos/cosmos-sdk/types/module"
|
||||||
"github.com/cosmos/cosmos-sdk/x/genutil"
|
"github.com/cosmos/cosmos-sdk/x/genutil"
|
||||||
|
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
|
||||||
|
"github.com/cosmos/go-bip39"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -31,6 +32,9 @@ const (
|
||||||
|
|
||||||
// FlagSeed defines a flag to initialize the private validator key from a specific seed.
|
// FlagSeed defines a flag to initialize the private validator key from a specific seed.
|
||||||
FlagRecover = "recover"
|
FlagRecover = "recover"
|
||||||
|
|
||||||
|
// FlagStakingBondDenom defines a flag to specify the staking token in the genesis file.
|
||||||
|
FlagStakingBondDenom = "staking-bond-denom"
|
||||||
)
|
)
|
||||||
|
|
||||||
type printInfo struct {
|
type printInfo struct {
|
||||||
|
@ -114,12 +118,32 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
|
||||||
genFile := config.GenesisFile()
|
genFile := config.GenesisFile()
|
||||||
overwrite, _ := cmd.Flags().GetBool(FlagOverwrite)
|
overwrite, _ := cmd.Flags().GetBool(FlagOverwrite)
|
||||||
|
|
||||||
|
stakingBondDenom, _ := cmd.Flags().GetString(FlagStakingBondDenom)
|
||||||
|
|
||||||
if !overwrite && tmos.FileExists(genFile) {
|
if !overwrite && tmos.FileExists(genFile) {
|
||||||
return fmt.Errorf("genesis.json file already exists: %v", genFile)
|
return fmt.Errorf("genesis.json file already exists: %v", genFile)
|
||||||
}
|
}
|
||||||
appState, err := json.MarshalIndent(mbm.DefaultGenesis(cdc), "", " ")
|
|
||||||
|
appGenState := mbm.DefaultGenesis(cdc)
|
||||||
|
|
||||||
|
if stakingBondDenom != "" {
|
||||||
|
stakingRaw := appGenState[stakingtypes.ModuleName]
|
||||||
|
var stakingGenesis stakingtypes.GenesisState
|
||||||
|
err := clientCtx.Codec.UnmarshalJSON(stakingRaw, &stakingGenesis)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
stakingGenesis.Params.BondDenom = stakingBondDenom
|
||||||
|
modifiedStakingStr, err := clientCtx.Codec.MarshalJSON(&stakingGenesis)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
appGenState[stakingtypes.ModuleName] = modifiedStakingStr
|
||||||
|
}
|
||||||
|
|
||||||
|
appState, err := json.MarshalIndent(appGenState, "", " ")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.Wrap(err, "Failed to marshall default genesis state")
|
return errors.Wrap(err, "Failed to marshal default genesis state")
|
||||||
}
|
}
|
||||||
|
|
||||||
genDoc := &types.GenesisDoc{}
|
genDoc := &types.GenesisDoc{}
|
||||||
|
@ -152,6 +176,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command {
|
||||||
cmd.Flags().BoolP(FlagOverwrite, "o", false, "overwrite the genesis.json file")
|
cmd.Flags().BoolP(FlagOverwrite, "o", false, "overwrite the genesis.json file")
|
||||||
cmd.Flags().Bool(FlagRecover, false, "provide seed phrase to recover existing key instead of creating")
|
cmd.Flags().Bool(FlagRecover, false, "provide seed phrase to recover existing key instead of creating")
|
||||||
cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created")
|
cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created")
|
||||||
|
cmd.Flags().String(FlagStakingBondDenom, "", "genesis file staking bond denomination, if left blank default value is 'stake'")
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
|
@ -118,6 +118,30 @@ func TestInitRecover(t *testing.T) {
|
||||||
require.NoError(t, cmd.ExecuteContext(ctx))
|
require.NoError(t, cmd.ExecuteContext(ctx))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestInitStakingBondDenom(t *testing.T) {
|
||||||
|
home := t.TempDir()
|
||||||
|
logger := log.NewNopLogger()
|
||||||
|
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
serverCtx := server.NewContext(viper.New(), cfg, logger)
|
||||||
|
interfaceRegistry := types.NewInterfaceRegistry()
|
||||||
|
marshaler := codec.NewProtoCodec(interfaceRegistry)
|
||||||
|
clientCtx := client.Context{}.
|
||||||
|
WithCodec(marshaler).
|
||||||
|
WithLegacyAmino(makeCodec()).
|
||||||
|
WithHomeDir(home)
|
||||||
|
|
||||||
|
ctx := context.Background()
|
||||||
|
ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
|
||||||
|
ctx = context.WithValue(ctx, server.ServerContextKey, serverCtx)
|
||||||
|
|
||||||
|
cmd := genutilcli.InitCmd(testMbm, home)
|
||||||
|
|
||||||
|
cmd.SetArgs([]string{"appnode-test", fmt.Sprintf("--%s=%s --%s=testtoken", cli.HomeFlag, home, genutilcli.FlagStakingBondDenom)})
|
||||||
|
require.NoError(t, cmd.ExecuteContext(ctx))
|
||||||
|
}
|
||||||
|
|
||||||
func TestEmptyState(t *testing.T) {
|
func TestEmptyState(t *testing.T) {
|
||||||
home := t.TempDir()
|
home := t.TempDir()
|
||||||
logger := log.NewNopLogger()
|
logger := log.NewNopLogger()
|
||||||
|
|
Loading…
Reference in New Issue