fix(rollapp): allow empty values when registering rollapp (#1200)

dymensionxyz · Sep 6, 2024 · 78c49cc · 78c49cc
1 parent 904c0d1
commit 78c49cc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/x/rollapp/client/cli/tx_create_rollapp.go b/x/rollapp/client/cli/tx_create_rollapp.go
@@ -91,8 +91,8 @@ func parseGenesisInfo(cmd *cobra.Command) (types.GenesisInfo, error) {
  return types.GenesisInfo{}, err
  }
 
- genesisInfo.NativeDenom = new(types.DenomMetadata)
  if nativeDenomFlag != "" {
+ genesisInfo.NativeDenom = new(types.DenomMetadata)
  if err = utils.ParseJsonFromFile(nativeDenomFlag, genesisInfo.NativeDenom); err != nil {
  return types.GenesisInfo{}, err
  }

diff --git a/x/rollapp/types/message_create_rollapp_test.go b/x/rollapp/types/message_create_rollapp_test.go
@@ -255,7 +255,7 @@ func TestMsgCreateRollapp_ValidateBasic(t *testing.T) {
  Bech32Prefix: bech32Prefix,
  GenesisChecksum: "checksum",
  NativeDenom: &DenomMetadata{Display: "DEN", Base: "aden", Exponent: 18},
- InitialSupply: sdk.Int{},
+ InitialSupply: sdk.NewInt(-1),
  },
  },
  err: ErrInvalidInitialSupply,

diff --git a/x/rollapp/types/rollapp.go b/x/rollapp/types/rollapp.go
@@ -106,15 +106,13 @@ func (r GenesisInfo) Validate() error {
  return errorsmod.Wrap(ErrInvalidGenesisChecksum, "GenesisChecksum")
  }
 
- if r.NativeDenom == nil {
- return errorsmod.Wrap(ErrInvalidNativeDenom, "NativeDenom")
- }
-
- if err := r.NativeDenom.Validate(); err != nil {
- return errorsmod.Wrap(ErrInvalidNativeDenom, err.Error())
+ if r.NativeDenom != nil {
+ if err := r.NativeDenom.Validate(); err != nil {
+ return errorsmod.Wrap(ErrInvalidNativeDenom, err.Error())
+ }
  }
 
- if r.InitialSupply.IsNil() {
+ if !r.InitialSupply.IsNil() && r.InitialSupply.IsNegative() {
  return errorsmod.Wrap(ErrInvalidInitialSupply, "InitialSupply")
  }