Rename mint price denom param to price denom

Ref oursky#288
uguryuksel2022 · Jul 1, 2022 · 5d8353b · 5d8353b
1 parent 24a4645
commit 5d8353b
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 56 deletions.
diff --git a/proto/likechain/likenft/params.proto b/proto/likechain/likenft/params.proto
@@ -10,5  10,5 @@ option go_package = "github.com/likecoin/likechain/x/likenft/types";
 message Params {
   option (gogoproto.goproto_stringer) = false;
 
-  string mint_price_denom = 1;
   string price_denom = 1;
 }
diff --git a/x/likenft/keeper/msg_server_buy_nft.go b/x/likenft/keeper/msg_server_buy_nft.go
@@ -42,7  42,7 @@ func (k msgServer) BuyNFT(goCtx context.Context, msg *types.MsgBuyNFT) (*types.M
 	}
 
 	// check user has enough balance
-	if k.bankKeeper.GetBalance(ctx, buyerAddress, k.GetParams(ctx).MintPriceDenom).Amount.Uint64() < msg.Price {
 	if k.bankKeeper.GetBalance(ctx, buyerAddress, k.GetParams(ctx).PriceDenom).Amount.Uint64() < msg.Price {
 		return nil, types.ErrFailedToBuyNFT.Wrapf("User does not have enough balance")
 	}
 
@@ -62,15  62,15 @@ func (k msgServer) BuyNFT(goCtx context.Context, msg *types.MsgBuyNFT) (*types.M
 		if err != nil {
 			return nil, err
 		}
-		royaltyAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).MintPriceDenom, sdk.NewInt(int64(royaltyAmount))))
 		royaltyAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).PriceDenom, sdk.NewInt(int64(royaltyAmount))))
 		err = k.bankKeeper.SendCoins(ctx, buyerAddress, classParent.Owner, royaltyAmountCoins)
 		if err != nil {
 			return nil, types.ErrFailedToBuyNFT.Wrapf(err.Error())
 		}
 	}
 	// pay seller
 	netAmount := msg.Price - royaltyAmount
-	netAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).MintPriceDenom, sdk.NewInt(int64(netAmount))))
 	netAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).PriceDenom, sdk.NewInt(int64(netAmount))))
 	err = k.bankKeeper.SendCoins(ctx, buyerAddress, sellerAddress, netAmountCoins)
 	if err != nil {
 		return nil, types.ErrFailedToBuyNFT.Wrapf(err.Error())

diff --git a/x/likenft/keeper/msg_server_mint_nft.go b/x/likenft/keeper/msg_server_mint_nft.go
@@ -52,12  52,12 @@ func (k msgServer) mintBlindBoxNFT(ctx sdk.Context, classId string, classData *t
 
 	// Pay price to owner if mintPrice is not zero and the minter is not the owner
 	if !ownerAddress.Equals(userAddress) && mintPeriod.MintPrice > 0 {
-		spentableTokens := k.bankKeeper.GetBalance(ctx, userAddress, params.GetMintPriceDenom())
 		spentableTokens := k.bankKeeper.GetBalance(ctx, userAddress, params.GetPriceDenom())
 		if spentableTokens.Amount.Uint64() < mintPeriod.MintPrice {
 			return nil, types.ErrInsufficientFunds.Wrapf("insufficient funds to mint tokenId %s", tokenId)
 		}
 
-		err = k.bankKeeper.SendCoins(ctx, userAddress, ownerAddress, sdk.NewCoins(sdk.NewCoin(params.GetMintPriceDenom(), sdk.NewInt(int64(mintPeriod.MintPrice)))))
 		err = k.bankKeeper.SendCoins(ctx, userAddress, ownerAddress, sdk.NewCoins(sdk.NewCoin(params.GetPriceDenom(), sdk.NewInt(int64(mintPeriod.MintPrice)))))
 		if err != nil {
 			return nil, types.ErrFailedToMintNFT.Wrapf("%s", err.Error())
 		}

diff --git a/x/likenft/keeper/msg_server_offer.go b/x/likenft/keeper/msg_server_offer.go
@@ -47,8  47,7 @@ func (k msgServer) CreateOffer(goCtx context.Context, msg *types.MsgCreateOffer)
 
 	// Take deposit if needed
 	if offer.Price > 0 {
-		// TODO: rename mint price denom
-		denom := k.MintPriceDenom(ctx)
 		denom := k.PriceDenom(ctx)
 		coins := sdk.NewCoins(sdk.NewCoin(denom, sdk.NewInt(int64(offer.Price))))
 		if k.bankKeeper.GetBalance(ctx, userAddress, denom).Amount.Uint64() < offer.Price {
 			return nil, types.ErrInsufficientFunds
@@ -118,7  117,7 @@ func (k msgServer) UpdateOffer(goCtx context.Context, msg *types.MsgUpdateOffer)
 	// Update deposit if needed
 	if oldOffer.Price != newOffer.Price {
 		// Check user has enough fund to pay extra
-		denom := k.MintPriceDenom(ctx)
 		denom := k.PriceDenom(ctx)
 		priceDiff := int64(newOffer.Price) - int64(oldOffer.Price)
 		if priceDiff > 0 && k.bankKeeper.GetBalance(ctx, userAddress, denom).Amount.Int64() < priceDiff {
 			return nil, types.ErrInsufficientFunds
@@ -180,7  179,7 @@ func (k msgServer) DeleteOffer(goCtx context.Context, msg *types.MsgDeleteOffer)
 
 	// Refund deposit if needed
 	if offer.Price > 0 {
-		denom := k.MintPriceDenom(ctx)
 		denom := k.PriceDenom(ctx)
 		coins := sdk.NewCoins(sdk.NewCoin(denom, sdk.NewInt(int64(offer.Price))))
 		if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, userAddress, coins); err != nil {
 			return nil, types.ErrFailedToDeleteOffer.Wrapf(err.Error())

diff --git a/x/likenft/keeper/msg_server_sell_nft.go b/x/likenft/keeper/msg_server_sell_nft.go
@@ -56,23  56,23 @@ func (k msgServer) SellNFT(goCtx context.Context, msg *types.MsgSellNFT) (*types
 		if err != nil {
 			return nil, err
 		}
-		royaltyAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).MintPriceDenom, sdk.NewInt(int64(royaltyAmount))))
 		royaltyAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).PriceDenom, sdk.NewInt(int64(royaltyAmount))))
 		err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, classParent.Owner, royaltyAmountCoins)
 		if err != nil {
 			return nil, types.ErrFailedToSellNFT.Wrapf(err.Error())
 		}
 	}
 	// pay seller
 	netAmount := msg.Price - royaltyAmount
-	netAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).MintPriceDenom, sdk.NewInt(int64(netAmount))))
 	netAmountCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).PriceDenom, sdk.NewInt(int64(netAmount))))
 	err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, sellerAddress, netAmountCoins)
 	if err != nil {
 		return nil, types.ErrFailedToSellNFT.Wrapf(err.Error())
 	}
 	// refund remainder to buyer
 	remainder := offer.Price - msg.Price
 	if remainder > 0 {
-		remainCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).MintPriceDenom, sdk.NewInt(int64(remainder))))
 		remainCoins := sdk.NewCoins(sdk.NewCoin(k.GetParams(ctx).PriceDenom, sdk.NewInt(int64(remainder))))
 		err = k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, buyerAddress, remainCoins)
 		if err != nil {
 			return nil, types.ErrFailedToSellNFT.Wrapf(err.Error())

diff --git a/x/likenft/keeper/offer_expire.go b/x/likenft/keeper/offer_expire.go
@@ -13,7  13,7 @@ func (k Keeper) ExpireOffer(ctx sdk.Context, offer types.OfferStoreRecord) error
 
 	// Refund deposit if needed
 	if offer.Price > 0 {
-		denom := k.MintPriceDenom(ctx)
 		denom := k.PriceDenom(ctx)
 		coins := sdk.NewCoins(sdk.NewCoin(denom, sdk.NewInt(int64(offer.Price))))
 		if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, offer.Buyer, coins); err != nil {
 			return types.ErrFailedToExpireOffer.Wrapf(err.Error())

diff --git a/x/likenft/keeper/params.go b/x/likenft/keeper/params.go
@@ -8,12  8,12 @@ import (
 // GetParams get all parameters as types.Params
 func (k Keeper) GetParams(ctx sdk.Context) types.Params {
 	return types.Params{
-		MintPriceDenom: k.MintPriceDenom(ctx),
 		PriceDenom: k.PriceDenom(ctx),
 	}
 }
 
-func (k Keeper) MintPriceDenom(ctx sdk.Context) (res string) {
-	k.paramstore.Get(ctx, types.ParamKeyMintPriceDenom, &res)
 func (k Keeper) PriceDenom(ctx sdk.Context) (res string) {
 	k.paramstore.Get(ctx, types.ParamKeyPriceDenom, &res)
 	return
 }
 

diff --git a/x/likenft/keeper/params_test.go b/x/likenft/keeper/params_test.go
@@ -17,22  17,22 @@ func TestParamsValidate(t *testing.T) {
 	require.NoError(t, err)
 
 	params = types.Params{
-		MintPriceDenom: "nanolike",
 		PriceDenom: "nanolike",
 	}
 	err = params.Validate()
 	require.NoError(t, err)
 
 	params = types.Params{
-		MintPriceDenom: "",
 		PriceDenom: "",
 	}
 	err = params.Validate()
-	require.Error(t, err, "should not accept empty mint price denom")
 	require.Error(t, err, "should not accept empty price denom")
 
 	params = types.Params{
-		MintPriceDenom: "nanolike123!!!??",
 		PriceDenom: "nanolike123!!!??",
 	}
 	err = params.Validate()
-	require.Error(t, err, "should not accept mint price denom with invalid characters")
 	require.Error(t, err, "should not accept price denom with invalid characters")
 
 	params = types.Params{}
 	err = params.Validate()

diff --git a/x/likenft/types/genesis_test.go b/x/likenft/types/genesis_test.go
@@ -142,7  142,7 @@ func TestGenesisState_Validate(t *testing.T) {
 			valid: false,
 		},
 		{
-			desc: "empty mint price denom param",
 			desc: "empty price denom param",
 			genState: &types.GenesisState{
 				ClassesByAccountList: []types.ClassesByAccount{
 					{
@@ -153,13  153,13 @@ func TestGenesisState_Validate(t *testing.T) {
 					},
 				},
 				Params: types.Params{
-					MintPriceDenom: "",
 					PriceDenom: "",
 				},
 			},
 			valid: false,
 		},
 		{
-			desc: "invalid mint price denom param",
 			desc: "invalid price denom param",
 			genState: &types.GenesisState{
 				ClassesByAccountList: []types.ClassesByAccount{
 					{
@@ -170,7  170,7 @@ func TestGenesisState_Validate(t *testing.T) {
 					},
 				},
 				Params: types.Params{
-					MintPriceDenom: "123456",
 					PriceDenom: "123456",
 				},
 			},
 			valid: false,

diff --git a/x/likenft/types/params.go b/x/likenft/types/params.go
@@ -8,11  8,11 @@ import (
 )
 
 var (
-	DefaultMintPriceDenom = "nanolike"
 	DefaultPriceDenom = "nanolike"
 )
 
 var (
-	ParamKeyMintPriceDenom = []byte("MintPriceDenom")
 	ParamKeyPriceDenom = []byte("PriceDenom")
 )
 
 var _ paramtypes.ParamSet = (*Params)(nil)
@@ -25,18  25,18 @@ func ParamKeyTable() paramtypes.KeyTable {
 // DefaultParams returns a default set of parameters
 func DefaultParams() Params {
 	return Params{
-		MintPriceDenom: DefaultMintPriceDenom,
 		PriceDenom: DefaultPriceDenom,
 	}
 }
 
-// Validate Mint price denom type
-func validateMintPriceDenom(i interface{}) error {
 // Validate price denom type
 func validatePriceDenom(i interface{}) error {
 	s, ok := i.(string)
 	if !ok {
-		return fmt.Errorf("Mint price denom must be string, got type %T", i)
 		return fmt.Errorf("Price denom must be string, got type %T", i)
 	}
 	if s == "" {
-		return fmt.Errorf("Mint price denom is empty")
 		return fmt.Errorf("Price denom is empty")
 	}
 	if err := sdk.ValidateDenom(s); err != nil {
 		return err
@@ -48,14  48,14 @@ func validateMintPriceDenom(i interface{}) error {
 // ParamSetPairs get the params.ParamSet
 func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	return paramtypes.ParamSetPairs{
-		paramtypes.NewParamSetPair(ParamKeyMintPriceDenom, &p.MintPriceDenom, validateMintPriceDenom),
 		paramtypes.NewParamSetPair(ParamKeyPriceDenom, &p.PriceDenom, validatePriceDenom),
 	}
 }
 
 // Validate validates the set of params
 func (p Params) Validate() error {
 	var err error
-	err = validateMintPriceDenom(p.MintPriceDenom)
 	err = validatePriceDenom(p.PriceDenom)
 	if err != nil {
 		return err
 	}
@@ -65,5  65,5 @@ func (p Params) Validate() error {
 // String implements the Stringer interface.
 func (p Params) String() string {
 	return fmt.Sprintf(`Params:
-	Mint Price denom: %s`, p.MintPriceDenom)
 	Price denom: %s`, p.PriceDenom)
 }
diff --git a/x/likenft/types/params.pb.go b/x/likenft/types/params.pb.go