fix(rollapp): make genesis info nullable (#1263)

zale144 · zale144 · commit dd9cddf548e4 · 2024-09-26T10:40:12.000+02:00
(cherry picked from commit 68f4a75)
diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go
@@ -56,7 +56,7 @@ func (s *KeeperTestHelper) CreateRollappByName(name string) {
 		InitialSequencer: "*",
 		Alias:            strings.ToLower(rand.Str(7)),
 		VmType:           rollapptypes.Rollapp_EVM,
-		GenesisInfo: rollapptypes.GenesisInfo{
+		GenesisInfo: &rollapptypes.GenesisInfo{
 			Bech32Prefix:    strings.ToLower(rand.Str(3)),
 			GenesisChecksum: "1234567890abcdefg",
 			InitialSupply:   sdk.NewInt(1000),
diff --git a/ibctesting/utils_test.go b/ibctesting/utils_test.go
@@ -135,7 +135,7 @@ func (s *utilSuite) createRollapp(transfersEnabled bool, channelID *string) {
 			Telegram:    "https://t.me/rolly",
 			X:           "https://x.dymension.xyz",
 		},
-		rollapptypes.GenesisInfo{
+		&rollapptypes.GenesisInfo{
 			GenesisChecksum: "somechecksum",
 			Bech32Prefix:    "eth",
 			NativeDenom: &rollapptypes.DenomMetadata{
diff --git a/proto/dymensionxyz/dymension/rollapp/tx.proto b/proto/dymensionxyz/dymension/rollapp/tx.proto
@@ -37,7 +37,7 @@ message MsgCreateRollapp {
   // metadata is the rollapp metadata
   RollappMetadata metadata = 13;
   // genesis_info is the genesis information
-  GenesisInfo genesis_info = 14 [(gogoproto.nullable) = false ];
+  GenesisInfo genesis_info = 14 [(gogoproto.nullable) = true ];
   // vm_type is the type of rollapp machine: EVM or WASM
   Rollapp.VMType vm_type = 15;
 }
@@ -59,7 +59,7 @@ message MsgUpdateRollappInformation {
   // metadata is the rollapp metadata
   RollappMetadata metadata = 5 [(gogoproto.nullable) = true ];
   // genesis_info is the genesis information
-  GenesisInfo genesis_info = 6 [(gogoproto.nullable) = false ];
+  GenesisInfo genesis_info = 6 [(gogoproto.nullable) = true ];
 }
 
 message MsgUpdateRollappInformationResponse {
diff --git a/x/denommetadata/ibc_middleware.go b/x/denommetadata/ibc_middleware.go
@@ -90,6 +90,10 @@ func (im IBCModule) OnRecvPacket(
 		return uevent.NewErrorAcknowledgement(ctx, gerrc.ErrNotFound)
 	}
 
+	if im.keeper.HasDenomMetadata(ctx, ibcDenom) {
+		return im.IBCModule.OnRecvPacket(ctx, packet, relayer)
+	}
+
 	dm.Base = ibcDenom
 	dm.DenomUnits[0].Denom = dm.Base
 
diff --git a/x/denommetadata/ibc_middleware_test.go b/x/denommetadata/ibc_middleware_test.go
@@ -596,15 +596,19 @@ func (m *mockIBCModule) OnRecvPacket(_ sdk.Context, p channeltypes.Packet, _ sdk
 	return emptyResult
 }
 
-func (m *mockIBCModule) OnAcknowledgementPacket(_ sdk.Context, _ channeltypes.Packet, ack []byte, _ sdk.AccAddress) error {
+func (m *mockIBCModule) OnAcknowledgementPacket(sdk.Context, channeltypes.Packet, []byte, sdk.AccAddress) error {
 	return nil
 }
 
 type mockDenomMetadataKeeper struct {
 	hasDenomMetaData, created bool
 }
 
-func (m *mockDenomMetadataKeeper) CreateDenomMetadata(ctx sdk.Context, metadata banktypes.Metadata) error {
+func (m *mockDenomMetadataKeeper) HasDenomMetadata(sdk.Context, string) bool {
+	return true
+}
+
+func (m *mockDenomMetadataKeeper) CreateDenomMetadata(sdk.Context, banktypes.Metadata) error {
 	m.created = true
 	return nil
 }
diff --git a/x/denommetadata/types/expected_keepers.go b/x/denommetadata/types/expected_keepers.go
@@ -3,6 +3,7 @@ package types
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/bank/types"
+
 	rollapptypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"
 )
 
@@ -14,6 +15,7 @@ type BankKeeper interface {
 
 type DenomMetadataKeeper interface {
 	CreateDenomMetadata(ctx sdk.Context, metadata types.Metadata) error
+	HasDenomMetadata(ctx sdk.Context, base string) bool
 }
 
 type RollappKeeper interface {
diff --git a/x/incentives/client/cli/query_test.go b/x/incentives/client/cli/query_test.go
@@ -34,7 +34,7 @@ func (suite *QueryTestSuite) CreateDefaultRollapp() string {
 		RollappId: urand.RollappID(),
 		Alias:     strings.ToLower(tmrand.Str(7)),
 		VmType:    rollapptypes.Rollapp_EVM,
-		GenesisInfo: rollapptypes.GenesisInfo{
+		GenesisInfo: &rollapptypes.GenesisInfo{
 			Bech32Prefix: strings.ToLower(tmrand.Str(3)),
 		},
 	}
diff --git a/x/incentives/keeper/suite_test.go b/x/incentives/keeper/suite_test.go
@@ -212,7 +212,7 @@ func (suite *KeeperTestSuite) CreateDefaultRollapp(addr sdk.AccAddress) string {
 		InitialSequencer: addr.String(),
 		Alias:            strings.ToLower(tmrand.Str(7)),
 		VmType:           rollapptypes.Rollapp_EVM,
-		GenesisInfo: rollapptypes.GenesisInfo{
+		GenesisInfo: &rollapptypes.GenesisInfo{
 			Bech32Prefix:    strings.ToLower(tmrand.Str(3)),
 			GenesisChecksum: "checksum",
 			NativeDenom: &rollapptypes.DenomMetadata{
diff --git a/x/rollapp/client/cli/tx_create_rollapp.go b/x/rollapp/client/cli/tx_create_rollapp.go
@@ -69,44 +69,43 @@ func CmdCreateRollapp() *cobra.Command {
 	return cmd
 }
 
-func parseGenesisInfo(cmd *cobra.Command) (types.GenesisInfo, error) {
+func parseGenesisInfo(cmd *cobra.Command) (*types.GenesisInfo, error) {
 	var (
-		genesisInfo types.GenesisInfo
+		genesisInfo = &types.GenesisInfo{}
 		err         error
 		ok          bool
 	)
 
 	genesisInfo.GenesisChecksum, err = cmd.Flags().GetString(FlagGenesisChecksum)
 	if err != nil {
-		return types.GenesisInfo{}, err
+		return nil, err
 	}
 
 	genesisInfo.Bech32Prefix, err = cmd.Flags().GetString(FlagBech32Prefix)
 	if err != nil {
-		return types.GenesisInfo{}, err
+		return nil, err
 	}
 
 	nativeDenomFlag, err := cmd.Flags().GetString(FlagNativeDenom)
 	if err != nil {
-		return types.GenesisInfo{}, err
+		return nil, err
 	}
 
 	if nativeDenomFlag != "" {
-		genesisInfo.NativeDenom = new(types.DenomMetadata)
-		if err = utils.ParseJsonFromFile(nativeDenomFlag, genesisInfo.NativeDenom); err != nil {
-			return types.GenesisInfo{}, err
+		if err = utils.ParseJsonFromFile(nativeDenomFlag, &genesisInfo.NativeDenom); err != nil {
+			return nil, err
 		}
 	}
 
 	initialSupplyFlag, err := cmd.Flags().GetString(FlagInitialSupply)
 	if err != nil {
-		return types.GenesisInfo{}, err
+		return nil, err
 	}
 
 	if initialSupplyFlag != "" {
 		genesisInfo.InitialSupply, ok = sdk.NewIntFromString(initialSupplyFlag)
 		if !ok {
-			return types.GenesisInfo{}, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag)
+			return nil, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag)
 		}
 	}
 
diff --git a/x/rollapp/keeper/msg_server_create_rollapp_test.go b/x/rollapp/keeper/msg_server_create_rollapp_test.go
@@ -351,7 +351,7 @@ func (suite *RollappTestSuite) createRollappWithCreatorAndVerify(
 		InitialSequencer: rollapp.GetInitialSequencer(),
 		VmType:           types.Rollapp_EVM,
 		Metadata:         rollapp.GetMetadata(),
-		GenesisInfo:      rollapp.GetGenesisInfo(),
+		GenesisInfo:      *rollapp.GetGenesisInfo(),
 	}
 	// create rollapp
 	createResponse, err := suite.msgServer.CreateRollapp(goCtx, &rollapp)
@@ -383,7 +383,7 @@ var mockRollappMetadata = types.RollappMetadata{
 	X:           "https://x.dymension.xyz",
 }
 
-var mockGenesisInfo = types.GenesisInfo{
+var mockGenesisInfo = &types.GenesisInfo{
 	Bech32Prefix:    "rol",
 	GenesisChecksum: "checksum",
 	NativeDenom: &types.DenomMetadata{
diff --git a/x/rollapp/keeper/msg_server_transfer_ownership_test.go b/x/rollapp/keeper/msg_server_transfer_ownership_test.go
@@ -25,7 +25,7 @@ func (suite *RollappTestSuite) TestTransferOwnership() {
 			expRollapp: types.Rollapp{
 				Owner:       bob,
 				RollappId:   rollappId,
-				GenesisInfo: mockGenesisInfo,
+				GenesisInfo: *mockGenesisInfo,
 			},
 		}, {
 			name: "Transfer rollapp ownership: failed, rollapp not found",
diff --git a/x/rollapp/keeper/msg_server_update_rollapp_test.go b/x/rollapp/keeper/msg_server_update_rollapp_test.go
@@ -33,7 +33,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 				RollappId:        rollappId,
 				InitialSequencer: initialSequencerAddress,
 				Metadata:         &mockRollappMetadata,
-				GenesisInfo: types.GenesisInfo{
+				GenesisInfo: &types.GenesisInfo{
 					Bech32Prefix:    "new",
 					GenesisChecksum: "new_checksum",
 					InitialSupply:   sdk.NewInt(1000),
@@ -103,7 +103,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 				RollappId:        rollappId,
 				InitialSequencer: "",
 				Metadata:         nil,
-				GenesisInfo: types.GenesisInfo{
+				GenesisInfo: &types.GenesisInfo{
 					GenesisChecksum: "new_checksum",
 				},
 			},
@@ -114,7 +114,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 			update: &types.MsgUpdateRollappInformation{
 				Owner:     alice,
 				RollappId: rollappId,
-				GenesisInfo: types.GenesisInfo{
+				GenesisInfo: &types.GenesisInfo{
 					Bech32Prefix: "new",
 				},
 			},
@@ -125,7 +125,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 			update: &types.MsgUpdateRollappInformation{
 				Owner:     alice,
 				RollappId: rollappId,
-				GenesisInfo: types.GenesisInfo{
+				GenesisInfo: &types.GenesisInfo{
 					NativeDenom: &types.DenomMetadata{
 						Display:  "DEN",
 						Base:     "aden",
@@ -140,7 +140,7 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 			update: &types.MsgUpdateRollappInformation{
 				Owner:     alice,
 				RollappId: rollappId,
-				GenesisInfo: types.GenesisInfo{
+				GenesisInfo: &types.GenesisInfo{
 					InitialSupply: sdk.NewInt(1000),
 				},
 			},
@@ -176,6 +176,38 @@ func (suite *RollappTestSuite) TestUpdateRollapp() {
 					},
 				},
 			},
+		}, {
+			name: "Update rollapp: success - unsealed, update rollapp without genesis info",
+			update: &types.MsgUpdateRollappInformation{
+				Owner:     alice,
+				RollappId: rollappId,
+				Metadata:  &mockRollappMetadata,
+			},
+			rollappLaunched: false,
+			genInfoSealed:   false,
+			expError:        nil,
+			expRollapp: types.Rollapp{
+				RollappId:        rollappId,
+				Owner:            alice,
+				InitialSequencer: "",
+				ChannelId:        "",
+				Frozen:           false,
+				RegisteredDenoms: nil,
+				Launched:         false,
+				VmType:           types.Rollapp_EVM,
+				Metadata:         &mockRollappMetadata,
+				GenesisInfo: types.GenesisInfo{
+					Bech32Prefix:    "old",
+					GenesisChecksum: "old",
+					InitialSupply:   sdk.NewInt(1000),
+					NativeDenom: types.DenomMetadata{
+						Display:  "OLD",
+						Base:     "aold",
+						Exponent: 18,
+					},
+					Sealed: false,
+				},
+			},
 		},
 	}
 
@@ -236,7 +268,7 @@ func (suite *RollappTestSuite) TestCreateAndUpdateRollapp() {
 		InitialSequencer: "",
 		Alias:            "default",
 		VmType:           types.Rollapp_EVM,
-		GenesisInfo: types.GenesisInfo{
+		GenesisInfo: &types.GenesisInfo{
 			Bech32Prefix:    "rol",
 			GenesisChecksum: "checksum",
 			InitialSupply:   sdk.NewInt(1000),
@@ -263,7 +295,7 @@ func (suite *RollappTestSuite) TestCreateAndUpdateRollapp() {
 		Owner:            alice,
 		RollappId:        rollappId,
 		InitialSequencer: addrInit,
-		GenesisInfo:      types.GenesisInfo{GenesisChecksum: "checksum1"},
+		GenesisInfo:      &types.GenesisInfo{GenesisChecksum: "checksum1"},
 	})
 	suite.Require().NoError(err)
 
diff --git a/x/rollapp/keeper/msg_server_update_state_test.go b/x/rollapp/keeper/msg_server_update_state_test.go
@@ -131,7 +131,7 @@ func (suite *RollappTestSuite) TestUpdateStateErrLogicUnpermissioned() {
 		RollappId:        rollappID,
 		Owner:            alice,
 		InitialSequencer: sample.AccAddress(),
-		GenesisInfo:      mockGenesisInfo,
+		GenesisInfo:      *mockGenesisInfo,
 	}
 	suite.App.RollappKeeper.SetRollapp(suite.Ctx, rollapp)
 
diff --git a/x/rollapp/keeper/rollapp.go b/x/rollapp/keeper/rollapp.go
@@ -39,20 +39,22 @@ func (k Keeper) CheckAndUpdateRollappFields(ctx sdk.Context, update *types.MsgUp
 		current.InitialSequencer = update.InitialSequencer
 	}
 
-	if update.GenesisInfo.GenesisChecksum != "" {
-		current.GenesisInfo.GenesisChecksum = update.GenesisInfo.GenesisChecksum
-	}
+	if update.GenesisInfo != nil {
+		if update.GenesisInfo.GenesisChecksum != "" {
+			current.GenesisInfo.GenesisChecksum = update.GenesisInfo.GenesisChecksum
+		}
 
-	if update.GenesisInfo.Bech32Prefix != "" {
-		current.GenesisInfo.Bech32Prefix = update.GenesisInfo.Bech32Prefix
-	}
+		if update.GenesisInfo.Bech32Prefix != "" {
+			current.GenesisInfo.Bech32Prefix = update.GenesisInfo.Bech32Prefix
+		}
 
-	if update.GenesisInfo.NativeDenom != nil {
-		current.GenesisInfo.NativeDenom = update.GenesisInfo.NativeDenom
-	}
+		if update.GenesisInfo.NativeDenom != nil {
+			current.GenesisInfo.NativeDenom = update.GenesisInfo.NativeDenom
+		}
 
-	if !update.GenesisInfo.InitialSupply.IsNil() {
-		current.GenesisInfo.InitialSupply = update.GenesisInfo.InitialSupply
+		if !update.GenesisInfo.InitialSupply.IsNil() {
+			current.GenesisInfo.InitialSupply = update.GenesisInfo.InitialSupply
+		}
 	}
 
 	if update.Metadata != nil && !update.Metadata.IsEmpty() {
diff --git a/x/rollapp/simulation/create_rollapp.go b/x/rollapp/simulation/create_rollapp.go
@@ -41,7 +41,7 @@ func SimulateMsgCreateRollapp(ak simulationtypes.AccountKeeper, bk simulationtyp
 				Telegram:    "https://t.me/rolly",
 				X:           "https://x.dymension.xyz",
 			},
-			GenesisInfo: types.GenesisInfo{
+			GenesisInfo: &types.GenesisInfo{
 				GenesisChecksum: "checksum",
 				Bech32Prefix:    "bech",
 				NativeDenom: &types.DenomMetadata{
diff --git a/x/rollapp/types/message_create_rollapp.go b/x/rollapp/types/message_create_rollapp.go
@@ -15,7 +15,7 @@ func NewMsgCreateRollapp(
 	alias string,
 	vmType Rollapp_VMType,
 	metadata *RollappMetadata,
-	genesisInfo GenesisInfo,
+	genesisInfo *GenesisInfo,
 ) *MsgCreateRollapp {
 	return &MsgCreateRollapp{
 		Creator:          creator,
@@ -50,14 +50,18 @@ func (msg *MsgCreateRollapp) GetSignBytes() []byte {
 }
 
 func (msg *MsgCreateRollapp) GetRollapp() Rollapp {
+	genInfo := GenesisInfo{}
+	if msg.GenesisInfo != nil {
+		genInfo = *msg.GenesisInfo
+	}
 	return NewRollapp(
 		msg.Creator,
 		msg.RollappId,
 		msg.InitialSequencer,
 		msg.VmType,
 		msg.Metadata,
-		msg.GenesisInfo,
-		false,
+		genInfo,
+		true,
 	)
 }
 
diff --git a/x/rollapp/types/message_create_rollapp_test.go b/x/rollapp/types/message_create_rollapp_test.go
diff --git a/x/rollapp/types/message_update_rollapp.go b/x/rollapp/types/message_update_rollapp.go
diff --git a/x/rollapp/types/message_update_rollapp_test.go b/x/rollapp/types/message_update_rollapp_test.go
diff --git a/x/rollapp/types/tx.pb.go b/x/rollapp/types/tx.pb.go

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,10 @@ func (im IBCModule) OnRecvPacket(`
`90`	`90`	`return uevent.NewErrorAcknowledgement(ctx, gerrc.ErrNotFound)`
`91`	`91`	`}`
`92`	`92`
	`93`	`+ if im.keeper.HasDenomMetadata(ctx, ibcDenom) {`
	`94`	`+ return im.IBCModule.OnRecvPacket(ctx, packet, relayer)`
	`95`	`+ }`
	`96`	`+`
`93`	`97`	`dm.Base = ibcDenom`
`94`	`98`	`dm.DenomUnits[0].Denom = dm.Base`
`95`	`99`
Original file line number	Diff line number	Diff line change
`@@ -596,15 +596,19 @@ func (m *mockIBCModule) OnRecvPacket(_ sdk.Context, p channeltypes.Packet, _ sdk`
`596`	`596`	`return emptyResult`
`597`	`597`	`}`
`598`	`598`
`599`		`-func (m *mockIBCModule) OnAcknowledgementPacket(_ sdk.Context, _ channeltypes.Packet, ack []byte, _ sdk.AccAddress) error {`
	`599`	`+func (m *mockIBCModule) OnAcknowledgementPacket(sdk.Context, channeltypes.Packet, []byte, sdk.AccAddress) error {`
`600`	`600`	`return nil`
`601`	`601`	`}`
`602`	`602`
`603`	`603`	`type mockDenomMetadataKeeper struct {`
`604`	`604`	`hasDenomMetaData, created bool`
`605`	`605`	`}`
`606`	`606`
`607`		`-func (m *mockDenomMetadataKeeper) CreateDenomMetadata(ctx sdk.Context, metadata banktypes.Metadata) error {`
	`607`	`+func (m *mockDenomMetadataKeeper) HasDenomMetadata(sdk.Context, string) bool {`
	`608`	`+ return true`
	`609`	`+}`
	`610`	`+`
	`611`	`+func (m *mockDenomMetadataKeeper) CreateDenomMetadata(sdk.Context, banktypes.Metadata) error {`
`608`	`612`	`m.created = true`
`609`	`613`	`return nil`
`610`	`614`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package types`
`3`	`3`	`import (`
`4`	`4`	`sdk "github.com/cosmos/cosmos-sdk/types"`
`5`	`5`	`"github.com/cosmos/cosmos-sdk/x/bank/types"`
	`6`	`+`
`6`	`7`	`rollapptypes "github.com/dymensionxyz/dymension/v3/x/rollapp/types"`
`7`	`8`	`)`
`8`	`9`
`@@ -14,6 +15,7 @@ type BankKeeper interface {`
`14`	`15`
`15`	`16`	`type DenomMetadataKeeper interface {`
`16`	`17`	`CreateDenomMetadata(ctx sdk.Context, metadata types.Metadata) error`
	`18`	`+ HasDenomMetadata(ctx sdk.Context, base string) bool`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`type RollappKeeper interface {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (suite *QueryTestSuite) CreateDefaultRollapp() string {`
`34`	`34`	`RollappId: urand.RollappID(),`
`35`	`35`	`Alias: strings.ToLower(tmrand.Str(7)),`
`36`	`36`	`VmType: rollapptypes.Rollapp_EVM,`
`37`		`- GenesisInfo: rollapptypes.GenesisInfo{`
	`37`	`+ GenesisInfo: &rollapptypes.GenesisInfo{`
`38`	`38`	`Bech32Prefix: strings.ToLower(tmrand.Str(3)),`
`39`	`39`	`},`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,44 +69,43 @@ func CmdCreateRollapp() *cobra.Command {`
`69`	`69`	`return cmd`
`70`	`70`	`}`
`71`	`71`
`72`		`-func parseGenesisInfo(cmd *cobra.Command) (types.GenesisInfo, error) {`
	`72`	`+func parseGenesisInfo(cmd cobra.Command) (types.GenesisInfo, error) {`
`73`	`73`	`var (`
`74`		`- genesisInfo types.GenesisInfo`
	`74`	`+ genesisInfo = &types.GenesisInfo{}`
`75`	`75`	`err error`
`76`	`76`	`ok bool`
`77`	`77`	`)`
`78`	`78`
`79`	`79`	`genesisInfo.GenesisChecksum, err = cmd.Flags().GetString(FlagGenesisChecksum)`
`80`	`80`	`if err != nil {`
`81`		`- return types.GenesisInfo{}, err`
	`81`	`+ return nil, err`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`genesisInfo.Bech32Prefix, err = cmd.Flags().GetString(FlagBech32Prefix)`
`85`	`85`	`if err != nil {`
`86`		`- return types.GenesisInfo{}, err`
	`86`	`+ return nil, err`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`nativeDenomFlag, err := cmd.Flags().GetString(FlagNativeDenom)`
`90`	`90`	`if err != nil {`
`91`		`- return types.GenesisInfo{}, err`
	`91`	`+ return nil, err`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`if nativeDenomFlag != "" {`
`95`		`- genesisInfo.NativeDenom = new(types.DenomMetadata)`
`96`		`- if err = utils.ParseJsonFromFile(nativeDenomFlag, genesisInfo.NativeDenom); err != nil {`
`97`		`- return types.GenesisInfo{}, err`
	`95`	`+ if err = utils.ParseJsonFromFile(nativeDenomFlag, &genesisInfo.NativeDenom); err != nil {`
	`96`	`+ return nil, err`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`initialSupplyFlag, err := cmd.Flags().GetString(FlagInitialSupply)`
`102`	`101`	`if err != nil {`
`103`		`- return types.GenesisInfo{}, err`
	`102`	`+ return nil, err`
`104`	`103`	`}`
`105`	`104`
`106`	`105`	`if initialSupplyFlag != "" {`
`107`	`106`	`genesisInfo.InitialSupply, ok = sdk.NewIntFromString(initialSupplyFlag)`
`108`	`107`	`if !ok {`
`109`		`- return types.GenesisInfo{}, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag)`
	`108`	`+ return nil, fmt.Errorf("invalid initial supply: %s", initialSupplyFlag)`
`110`	`109`	`}`
`111`	`110`	`}`
`112`	`111`