fix: prices validation is node params

sentinel-official · Dec 18, 2024 · 767e06b · 767e06b
1 parent b0ad886
commit 767e06b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/x/lease/keeper/abci.go b/x/lease/keeper/abci.go
@@ -142,7 +142,7 @@ func (k *Keeper) handleLeaseRenewals(ctx sdk.Context) {
 		// Execute the handler to process the lease renewal
 		resp, err := handler(cc, msg)
 		if err != nil {
-			k.Logger(cc).Error("Failed to handle lease renewal", "id", item.ID, "message", err)
+			k.Logger(cc).Error("Failed to handle lease renewal", "id", item.ID, "msg", err)
 			return false
 		}
 

diff --git a/x/lease/keeper/msg_handler.go b/x/lease/keeper/msg_handler.go
@@ -114,7 +114,7 @@ func (k *Keeper) HandleMsgRenewLease(ctx sdk.Context, msg *v1.MsgRenewLeaseReque
 	}
 
 	if err := lease.ValidateRenewalPolicies(price); err != nil {
-		return nil, sdkerrors.Wrapf(types.ErrInvalidRenewalPolicy, err.Error())
+		return nil, sdkerrors.Wrap(types.ErrInvalidRenewalPolicy, err.Error())
 	}
 
 	refund := lease.RefundAmount()

diff --git a/x/node/types/v3/params.go b/x/node/types/v3/params.go
@@ -200,31 +200,31 @@ func validateActiveDuration(v interface{}) error {
 }
 
 func validateMinGigabytePrices(v interface{}) error {
-	value, ok := v.(v1base.Prices)
+	value, ok := v.([]v1base.Price)
 	if !ok {
 		return fmt.Errorf("invalid parameter type %T", v)
 	}
 
 	if value == nil {
 		return nil
 	}
-	if !value.IsValid() {
+	if !v1base.Prices(value).IsValid() {
 		return fmt.Errorf("min_gigabyte_prices must be valid")
 	}
 
 	return nil
 }
 
 func validateMinHourlyPrices(v interface{}) error {
-	value, ok := v.(v1base.Prices)
+	value, ok := v.([]v1base.Price)
 	if !ok {
 		return fmt.Errorf("invalid parameter type %T", v)
 	}
 
 	if value == nil {
 		return nil
 	}
-	if !value.IsValid() {
+	if !v1base.Prices(value).IsValid() {
 		return fmt.Errorf("min_hourly_prices must be valid")
 	}
 

diff --git a/x/oracle/keeper/abci.go b/x/oracle/keeper/abci.go
@@ -53,7 +53,7 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
 		// Send the GetProtoRevPool query packet over IBC.
 		sequence, err := k.SendQueryPacket(ctx, channelCap, portID, channelID, uint64(timeout), req)
 		if err != nil {
-			k.Logger(ctx).Error("Failed to send query packet", "asset", item.Denom, "message", err)
+			k.Logger(ctx).Error("Failed to send query packet", "asset", item.Denom, "msg", err)
 			return false
 		}
 

diff --git a/x/subscription/keeper/abci.go b/x/subscription/keeper/abci.go
@@ -116,7 +116,7 @@ func (k *Keeper) handleSubscriptionRenewals(ctx sdk.Context) {
 		// Execute the handler to process the subscription renewal
 		resp, err := handler(cc, msg)
 		if err != nil {
-			k.Logger(cc).Error("Failed to handle subscription renewal", "id", item.ID, "message", err)
+			k.Logger(cc).Error("Failed to handle subscription renewal", "id", item.ID, "msg", err)
 			return false
 		}
 

diff --git a/x/subscription/keeper/msg_handler.go b/x/subscription/keeper/msg_handler.go
@@ -86,7 +86,7 @@ func (k *Keeper) HandleMsgRenewSubscription(ctx sdk.Context, msg *v3.MsgRenewSub
 	}
 
 	if err := subscription.ValidateRenewalPolicies(price); err != nil {
-		return nil, sdkerrors.Wrapf(types.ErrInvalidRenewalPolicy, err.Error())
+		return nil, sdkerrors.Wrap(types.ErrInvalidRenewalPolicy, err.Error())
 	}
 
 	k.DeleteSubscriptionForInactiveAt(ctx, subscription.InactiveAt, subscription.ID)