feat: using max price field for node lease and node session instead denom

Author: ironman0x7b2

proto/sentinel/lease/v1/events.proto

@@ -26,7 +26,7 @@ message EventPay {
   uint64 id = 1 [(gogoproto.customname) = "ID"];
   string node_address = 2;
   string prov_address = 3;
-  string payment = 4;
+  string amount = 4;
   string staking_reward = 5;
 }
 

proto/sentinel/lease/v1/msg.proto

@@ -3,6 +3,7 @@ package sentinel.lease.v1;
 
 import "gogoproto/gogo.proto";
 import "sentinel/lease/v1/params.proto";
+import "sentinel/types/v1/price.proto";
 import "sentinel/types/v1/renewal.proto";
 
 option go_package = "github.com/sentinel-official/sentinelhub/v12/x/lease/types/v1";
@@ -18,14 +19,14 @@ message MsgRenewLeaseRequest {
   string from = 1;
   uint64 id = 2 [(gogoproto.customname) = "ID"];
   int64 hours = 3;
-  string denom = 4;
+  sentinel.types.v1.Price max_price = 4 [(gogoproto.nullable) = false];
 }
 
 message MsgStartLeaseRequest {
   string from = 1;
   string node_address = 2;
   int64 hours = 3;
-  string denom = 4;
+  sentinel.types.v1.Price max_price = 4 [(gogoproto.nullable) = false];
   sentinel.types.v1.RenewalPricePolicy renewal_price_policy = 5;
 }
 

proto/sentinel/node/v3/events.proto

@@ -19,7 +19,7 @@ message EventPay {
   uint64 id = 1 [(gogoproto.customname) = "ID"];
   string acc_address = 2;
   string node_address = 3;
-  string payment = 4;
+  string amount = 4;
   string staking_reward = 5;
 }
 

proto/sentinel/node/v3/msg.proto

@@ -34,7 +34,7 @@ message MsgStartSessionRequest {
   string node_address = 2;
   int64 gigabytes = 3;
   int64 hours = 4;
-  string denom = 5;
+  sentinel.types.v1.Price max_price = 5 [(gogoproto.nullable) = false];
 }
 
 message MsgUpdateParamsRequest {

types/v1/price.go

@@ -89,9 +89,55 @@ func (p Price) String() string {
 }
 
 func (p Price) IsEqual(v Price) bool {
-	return p.Denom == v.Denom &&
-		p.BaseValue.Equal(v.BaseValue) &&
-		p.QuoteValue.Equal(v.QuoteValue)
+	if p.Denom != v.Denom {
+		return false
+	}
+
+	if !p.BaseValue.IsZero() || !v.BaseValue.IsZero() {
+		return p.BaseValue.Equal(v.BaseValue)
+	}
+
+	return p.QuoteValue.Equal(v.QuoteValue)
+}
+
+func (p Price) IsGT(v Price) bool {
+	if p.Denom != v.Denom {
+		return false
+	}
+
+	if !p.BaseValue.IsZero() || !v.BaseValue.IsZero() {
+		return p.BaseValue.GT(v.BaseValue)
+	}
+
+	return p.QuoteValue.GT(v.QuoteValue)
+}
+
+func (p Price) IsGTE(v Price) bool {
+	if p.Denom != v.Denom {
+		return false
+	}
+
+	return !p.IsLT(v)
+}
+
+func (p Price) IsLT(v Price) bool {
+	if p.Denom != v.Denom {
+		return false
+	}
+
+	if !p.BaseValue.IsZero() || !v.BaseValue.IsZero() {
+		return p.BaseValue.LT(v.BaseValue)
+	}
+
+	return p.QuoteValue.LT(v.QuoteValue)
+}
+
+func (p Price) IsLTE(v Price) bool {
+	if p.Denom != v.Denom {
+		return false
+	}
+
+	return !p.IsGT(v)
 }
 
 func (p Price) Validate() error {

x/lease/client/cli/flags.go

@@ -7,10 +7,22 @@ import (
 )
 
 const (
-	flagDenom              = "denom"
+	flagMaxPrice           = "max-price"
 	flagRenewalPricePolicy = "renewal-price-policy"
 )
 
+func GetMaxPrice(flags *pflag.FlagSet) (v1base.Price, error) {
+	s, err := flags.GetString(flagMaxPrice)
+	if err != nil {
+		return v1base.Price{}, err
+	}
+	if s == "" {
+		return v1base.ZeroPrice(""), nil
+	}
+
+	return v1base.NewPriceFromString(s)
+}
+
 func GetRenewalPricePolicy(flags *pflag.FlagSet) (v1base.RenewalPricePolicy, error) {
 	s, err := flags.GetString(flagRenewalPricePolicy)
 	if err != nil {

x/lease/client/cli/tx.go

@@ -66,7 +66,7 @@ func txRenewLease() *cobra.Command {
 				return err
 			}
 
-			denom, err := cmd.Flags().GetString(flagDenom)
+			maxPrice, err := GetMaxPrice(cmd.Flags())
 			if err != nil {
 				return err
 			}
@@ -75,7 +75,7 @@ func txRenewLease() *cobra.Command {
 				ctx.FromAddress.Bytes(),
 				id,
 				hours,
-				denom,
+				maxPrice,
 			)
 			if err = msg.ValidateBasic(); err != nil {
 				return err
@@ -86,7 +86,7 @@ func txRenewLease() *cobra.Command {
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
-	cmd.Flags().String(flagDenom, "", "Specify the payment denomination for the lease")
+	cmd.Flags().String(flagMaxPrice, "", "Specify the maximum hourly price for the lease")
 
 	return cmd
 }
@@ -112,7 +112,7 @@ func txStartLease() *cobra.Command {
 				return err
 			}
 
-			denom, err := cmd.Flags().GetString(flagDenom)
+			maxPrice, err := GetMaxPrice(cmd.Flags())
 			if err != nil {
 				return err
 			}
@@ -126,7 +126,7 @@ func txStartLease() *cobra.Command {
 				ctx.FromAddress.Bytes(),
 				nodeAddr,
 				hours,
-				denom,
+				maxPrice,
 				renewalPricePolicy,
 			)
 			if err = msg.ValidateBasic(); err != nil {
@@ -138,7 +138,7 @@ func txStartLease() *cobra.Command {
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
-	cmd.Flags().String(flagDenom, "", "Specify the payment denomination for the lease")
+	cmd.Flags().String(flagMaxPrice, "", "Specify the maximum hourly price for the lease")
 	cmd.Flags().String(flagRenewalPricePolicy, "", "Specify the lease renewal price policy")
 
 	return cmd

x/lease/keeper/abci.go

@@ -80,7 +80,7 @@ func (k *Keeper) handleLeasePayouts(ctx sdk.Context) {
 				ID:            item.ID,
 				NodeAddress:   item.NodeAddress,
 				ProvAddress:   item.ProvAddress,
-				Payment:       payment.String(),
+				Amount:        payment.String(),
 				StakingReward: reward.String(),
 			},
 		)
@@ -118,10 +118,10 @@ func (k *Keeper) handleLeaseRenewals(ctx sdk.Context) {
 
 		// Create a message to renew the lease
 		msg := &v1.MsgRenewLeaseRequest{
-			From:  item.ProvAddress,
-			ID:    item.ID,
-			Hours: item.MaxHours,
-			Denom: item.Price.Denom,
+			From:     item.ProvAddress,
+			ID:       item.ID,
+			Hours:    item.MaxHours,
+			MaxPrice: item.Price,
 		}
 
 		// Get the appropriate handler for processing the renewal message

x/lease/keeper/msg_handler.go

@@ -103,15 +103,18 @@ func (k *Keeper) HandleMsgRenewLease(ctx sdk.Context, msg *v1.MsgRenewLeaseReque
 		return nil, types.NewErrorInvalidNodeStatus(nodeAddr, node.Status)
 	}
 
-	price, found := node.HourlyPrice(msg.Denom)
+	price, found := node.HourlyPrice(msg.MaxPrice.Denom)
 	if !found {
-		return nil, types.NewErrorPriceNotFound(msg.Denom)
+		return nil, types.NewErrorPriceNotFound(msg.MaxPrice.Denom)
 	}
 
 	price, err = price.UpdateQuoteValue(ctx, k.QuotePriceFunc)
 	if err != nil {
 		return nil, err
 	}
+	if price.IsGT(msg.MaxPrice) {
+		return nil, types.NewErrorInvalidPrice(price)
+	}
 
 	if err := lease.ValidateRenewalPolicies(price); err != nil {
 		return nil, sdkerrors.Wrap(types.ErrInvalidRenewalPolicy, err.Error())
@@ -199,15 +202,18 @@ func (k *Keeper) HandleMsgStartLease(ctx sdk.Context, msg *v1.MsgStartLeaseReque
 		return nil, types.NewErrorInvalidNodeStatus(nodeAddr, node.Status)
 	}
 
-	price, found := node.HourlyPrice(msg.Denom)
+	price, found := node.HourlyPrice(msg.MaxPrice.Denom)
 	if !found {
-		return nil, types.NewErrorPriceNotFound(msg.Denom)
+		return nil, types.NewErrorPriceNotFound(msg.MaxPrice.Denom)
 	}
 
 	price, err = price.UpdateQuoteValue(ctx, k.QuotePriceFunc)
 	if err != nil {
 		return nil, err
 	}
+	if price.IsGT(msg.MaxPrice) {
+		return nil, types.NewErrorInvalidPrice(price)
+	}
 
 	leaseExists := false
 	k.IterateLeasesForNodeByProvider(ctx, nodeAddr, provAddr, func(_ int, _ v1.Lease) bool {

x/lease/types/errors.go

@@ -13,13 +13,14 @@ var (
 	ErrDuplicateLease        = sdkerrors.Register(ModuleName, 201, "duplicate lease")
 	ErrInvalidHours          = sdkerrors.Register(ModuleName, 202, "invalid hours")
 	ErrInvalidNodeStatus     = sdkerrors.Register(ModuleName, 203, "invalid node status")
-	ErrInvalidProviderStatus = sdkerrors.Register(ModuleName, 204, "invalid provider status")
-	ErrInvalidRenewalPolicy  = sdkerrors.Register(ModuleName, 205, "invalid renewal policy")
-	ErrLeaseNotFound         = sdkerrors.Register(ModuleName, 206, "lease not found")
-	ErrNodeNotFound          = sdkerrors.Register(ModuleName, 207, "node not found")
-	ErrPriceNotFound         = sdkerrors.Register(ModuleName, 208, "price not found")
-	ErrProviderNotFound      = sdkerrors.Register(ModuleName, 209, "provider not found")
-	ErrUnauthorized          = sdkerrors.Register(ModuleName, 210, "unauthorized")
+	ErrInvalidPrice          = sdkerrors.Register(ModuleName, 204, "invalid price")
+	ErrInvalidProviderStatus = sdkerrors.Register(ModuleName, 205, "invalid provider status")
+	ErrInvalidRenewalPolicy  = sdkerrors.Register(ModuleName, 206, "invalid renewal policy")
+	ErrLeaseNotFound         = sdkerrors.Register(ModuleName, 207, "lease not found")
+	ErrNodeNotFound          = sdkerrors.Register(ModuleName, 208, "node not found")
+	ErrPriceNotFound         = sdkerrors.Register(ModuleName, 209, "price not found")
+	ErrProviderNotFound      = sdkerrors.Register(ModuleName, 210, "provider not found")
+	ErrUnauthorized          = sdkerrors.Register(ModuleName, 211, "unauthorized")
 )
 
 // NewErrorDuplicateLease returns an error indicating that a lease for the specified node and provider already exists.
@@ -37,6 +38,11 @@ func NewErrorInvalidNodeStatus(addr base.NodeAddress, status v1base.Status) erro
 	return sdkerrors.Wrapf(ErrInvalidNodeStatus, "invalid status %s for node %s", status, addr)
 }
 
+// NewErrorInvalidPrice returns an error indicating that the price is invalid.
+func NewErrorInvalidPrice(price v1base.Price) error {
+	return sdkerrors.Wrapf(ErrInvalidPrice, "invalid price %s", price)
+}
+
 // NewErrorInvalidProviderStatus returns an error indicating that the provided status is invalid for the given provider.
 func NewErrorInvalidProviderStatus(addr base.ProvAddress, status v1base.Status) error {
 	return sdkerrors.Wrapf(ErrInvalidProviderStatus, "invalid status %s for provider %s", status, addr)