Make token factory handle empty genesis configurations better (backport

#1551) (#1553) * Make token factory handle empty genesis configurations better (#1551) * Make token factory handle empty genesis configurations better * add start back to dockerfile Co-authored-by: Adam Tucker <adamleetucker@outlook.com> (cherry picked from commit d610ff3) # Conflicts: # Dockerfile * Update Dockerfile Co-authored-by: Dev Ojha <ValarDragon@users.noreply.github.com> Co-authored-by: Adam Tucker <adamleetucker@outlook.com>
osmosis-labs · May 20, 2022 · 46cc167 · 46cc167
1 parent 8f27627
commit 46cc167
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -35,4 +35,4 @@ EXPOSE 26657
 EXPOSE 1317
 
 ENTRYPOINT ["osmosisd"]
-CMD [ "start" ]
+CMD [ "start" ]
diff --git a/x/tokenfactory/genesis.go b/x/tokenfactory/genesis.go
@@ -12,6 +12,9 @@ import (
 func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
 	k.CreateModuleAccount(ctx)
 
+	if genState.Params.DenomCreationFee == nil {
+		genState.Params.DenomCreationFee = sdk.NewCoins()
+	}
 	k.SetParams(ctx, genState.Params)
 
 	for _, genDenom := range genState.GetFactoryDenoms() {

diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go
@@ -15,8 +15,10 @@ func (k Keeper) CreateDenom(ctx sdk.Context, creatorAddr string, denomNonce stri
 	if err != nil {
 		return "", err
 	}
-	if err := k.distrKeeper.FundCommunityPool(ctx, creationFee, accAddr); err != nil {
-		return "", err
+	if len(creationFee) > 0 {
+		if err := k.distrKeeper.FundCommunityPool(ctx, creationFee, accAddr); err != nil {
+			return "", err
+		}
 	}
 
 	denom, err := types.GetTokenDenom(creatorAddr, denomNonce)