rename price_multiplier to min_price_multiplier

proto/stride/auction/auction.proto

@@ -30,8 +30,9 @@ message Auction {
   // Whether auction is active
   bool enabled = 5;
 
-  // Price multiplier (e.g. 0.95 for 5% discount)
-  string price_multiplier = 6 [
+  // Minimum price multiplier (e.g. 0.95 for 5% discount off the oracle price)
+  // bids_floor_price = oracle_price * min_price_multiplier
+  string min_price_multiplier = 6 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];

proto/stride/auction/tx.proto

@@ -75,8 +75,9 @@ message MsgCreateAuction {
   // Whether auction is active
   bool enabled = 6;
 
-  // Price multiplier (e.g. 0.95 for 5% discount)
-  string price_multiplier = 7 [
+  // Minimum price multiplier (e.g. 0.95 for 5% discount off the oracle price)
+  // bids_floor_price = oracle_price * min_price_multiplier
+  string min_price_multiplier = 7 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
@@ -109,8 +110,9 @@ message MsgUpdateAuction {
   // Whether auction is active
   bool enabled = 4;
 
-  // Price multiplier (e.g. 0.95 for 5% discount)
-  string price_multiplier = 5 [
+  // Minimum price multiplier (e.g. 0.95 for 5% discount off the oracle price)
+  // bids_floor_price = oracle_price * min_price_multiplier
+  string min_price_multiplier = 5 [
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];

x/auction/client/cli/tx.go

@@ -83,7 +83,7 @@ Example:
 
 func CmdCreateAuction() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create-auction [name] [selling-denom] [payment-denom] [enabled] [price-multiplier] [min-bid-amount] [beneficiary]",
+		Use:   "create-auction [name] [selling-denom] [payment-denom] [enabled] [min-price-multiplier] [min-bid-amount] [beneficiary]",
 		Short: "Create a new auction",
 		Long: strings.TrimSpace(
 			fmt.Sprintf(`Create a new auction for a specific token.
@@ -133,7 +133,7 @@ Example:
 
 func CmdUpdateAuction() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "update-auction [name] [enabled] [price-multiplier] [min-bid-amount] [beneficiary]",
+		Use:   "update-auction [name] [enabled] [min-price-multiplier] [min-bid-amount] [beneficiary]",
 		Short: "Update an existing auction",
 		Long: strings.TrimSpace(
 			fmt.Sprintf(`Update an existing auction's parameters.

x/auction/keeper/auction_type.go

@@ -38,19 +38,19 @@ func fcfsBidHandler(ctx sdk.Context, k Keeper, auction *types.Auction, bid *type
 		return err
 	}
 
-	discountedPrice := price.Mul(auction.PriceMultiplier)
+	bidsFloorPrice := price.Mul(auction.MinPriceMultiplier)
 
 	if bid.SellingTokenAmount.ToLegacyDec().
-		Mul(discountedPrice).
+		Mul(bidsFloorPrice).
 		LT(bid.PaymentTokenAmount.ToLegacyDec()) {
-		return fmt.Errorf("bid price too low: offered %s%s for %s%s, minimum required is %s%s (price=%s %s/%s)",
+		return fmt.Errorf("bid price too low: offered %s%s for %s%s, bids floor price is %s%s (price=%s %s/%s)",
 			bid.PaymentTokenAmount.String(),
 			auction.PaymentDenom,
 			bid.SellingTokenAmount.String(),
 			auction.SellingDenom,
-			bid.SellingTokenAmount.ToLegacyDec().Mul(discountedPrice).String(),
+			bid.SellingTokenAmount.ToLegacyDec().Mul(bidsFloorPrice).String(),
 			auction.PaymentDenom,
-			discountedPrice.String(),
+			bidsFloorPrice.String(),
 			auction.PaymentDenom,
 			auction.SellingDenom,
 		)
@@ -106,7 +106,7 @@ func fcfsBidHandler(ctx sdk.Context, k Keeper, auction *types.Auction, bid *type
 			sdk.NewAttribute(types.AttributeKeyPaymentDenom, auction.PaymentDenom),
 			sdk.NewAttribute(types.AttributeKeySellingAmount, bid.SellingTokenAmount.String()),
 			sdk.NewAttribute(types.AttributeKeySellingDenom, auction.SellingDenom),
-			sdk.NewAttribute(types.AttributeKeyPrice, discountedPrice.String()),
+			sdk.NewAttribute(types.AttributeKeyPrice, bidsFloorPrice.String()),
 		),
 	)
 

x/auction/keeper/msg_server.go

@@ -48,7 +48,7 @@ func (ms msgServer) CreateAuction(goCtx context.Context, msg *types.MsgCreateAuc
 		SellingDenom:              msg.SellingDenom,
 		PaymentDenom:              msg.PaymentDenom,
 		Enabled:                   msg.Enabled,
-		PriceMultiplier:           msg.PriceMultiplier,
+		MinPriceMultiplier:        msg.MinPriceMultiplier,
 		MinBidAmount:              msg.MinBidAmount,
 		Beneficiary:               msg.Beneficiary,
 		TotalPaymentTokenReceived: math.ZeroInt(),
@@ -75,7 +75,7 @@ func (ms msgServer) UpdateAuction(goCtx context.Context, msg *types.MsgUpdateAuc
 	auction.Type = msg.AuctionType
 	auction.Enabled = msg.Enabled
 	auction.MinBidAmount = msg.MinBidAmount
-	auction.PriceMultiplier = msg.PriceMultiplier
+	auction.MinPriceMultiplier = msg.MinPriceMultiplier
 	auction.Beneficiary = msg.Beneficiary
 
 	err = ms.Keeper.SetAuction(ctx, auction)

x/auction/types/genesis.go

@@ -18,7 +18,7 @@ func (gs GenesisState) Validate() error {
 			auction.Type,
 			auction.SellingDenom,
 			auction.PaymentDenom,
-			auction.PriceMultiplier,
+			auction.MinPriceMultiplier,
 			auction.MinBidAmount,
 			auction.Beneficiary,
 		)

x/auction/types/msgs.go

@@ -97,25 +97,25 @@ func NewMsgCreateAuction(
 	sellingDenom string,
 	paymentDenom string,
 	enabled bool,
-	priceMultiplier string,
+	minPriceMultiplier string,
 	minBidAmount uint64,
 	beneficiary string,
 ) *MsgCreateAuction {
-	priceMultiplierDec, err := math.LegacyNewDecFromStr(priceMultiplier)
+	minPriceMultiplierDec, err := math.LegacyNewDecFromStr(minPriceMultiplier)
 	if err != nil {
-		panic(fmt.Sprintf("cannot parse LegacyDecimal from priceMultiplier '%s'", priceMultiplier))
+		panic(fmt.Sprintf("cannot parse LegacyDecimal from minPriceMultiplier '%s'", minPriceMultiplier))
 	}
 
 	return &MsgCreateAuction{
-		Admin:           admin,
-		AuctionName:     auctionName,
-		AuctionType:     auctionType,
-		SellingDenom:    sellingDenom,
-		PaymentDenom:    paymentDenom,
-		Enabled:         enabled,
-		PriceMultiplier: priceMultiplierDec,
-		MinBidAmount:    math.NewIntFromUint64(minBidAmount),
-		Beneficiary:     beneficiary,
+		Admin:              admin,
+		AuctionName:        auctionName,
+		AuctionType:        auctionType,
+		SellingDenom:       sellingDenom,
+		PaymentDenom:       paymentDenom,
+		Enabled:            enabled,
+		MinPriceMultiplier: minPriceMultiplierDec,
+		MinBidAmount:       math.NewIntFromUint64(minBidAmount),
+		Beneficiary:        beneficiary,
 	}
 }
 
@@ -150,7 +150,7 @@ func (msg *MsgCreateAuction) ValidateBasic() error {
 		msg.AuctionType,
 		msg.SellingDenom,
 		msg.PaymentDenom,
-		msg.PriceMultiplier,
+		msg.MinPriceMultiplier,
 		msg.MinBidAmount,
 		msg.Beneficiary,
 	)
@@ -165,23 +165,23 @@ func NewMsgUpdateAuction(
 	auctionName string,
 	auctionType AuctionType,
 	enabled bool,
-	priceMultiplier string,
+	minPriceMultiplier string,
 	minBidAmount uint64,
 	beneficiary string,
 ) *MsgUpdateAuction {
-	priceMultiplierDec, err := math.LegacyNewDecFromStr(priceMultiplier)
+	minPriceMultiplierDec, err := math.LegacyNewDecFromStr(minPriceMultiplier)
 	if err != nil {
-		panic(fmt.Sprintf("cannot parse LegacyDecimal from priceMultiplier '%s'", priceMultiplier))
+		panic(fmt.Sprintf("cannot parse LegacyDecimal from minPriceMultiplier '%s'", minPriceMultiplier))
 	}
 
 	return &MsgUpdateAuction{
-		Admin:           admin,
-		AuctionName:     auctionName,
-		AuctionType:     auctionType,
-		Enabled:         enabled,
-		PriceMultiplier: priceMultiplierDec,
-		MinBidAmount:    math.NewIntFromUint64(minBidAmount),
-		Beneficiary:     beneficiary,
+		Admin:              admin,
+		AuctionName:        auctionName,
+		AuctionType:        auctionType,
+		Enabled:            enabled,
+		MinPriceMultiplier: minPriceMultiplierDec,
+		MinBidAmount:       math.NewIntFromUint64(minBidAmount),
+		Beneficiary:        beneficiary,
 	}
 }
 
@@ -216,8 +216,8 @@ func (msg *MsgUpdateAuction) ValidateBasic() error {
 	if _, ok := AuctionType_name[int32(msg.AuctionType)]; !ok {
 		return errors.New("auction-type is invalid")
 	}
-	if msg.PriceMultiplier.IsZero() {
-		return errors.New("price-multiplier cannot be 0")
+	if msg.MinPriceMultiplier.IsZero() {
+		return errors.New("min-price-multiplier cannot be 0")
 	}
 	if msg.MinBidAmount.LT(math.ZeroInt()) {
 		return errors.New("min-bid-amount must be at least 0")