feat: using bytes and duration instead gigabytes and hours in plan

Author: ironman0x7b2

proto/sentinel/plan/v3/events.proto

@@ -10,8 +10,8 @@ option (gogoproto.goproto_getters_all) = false;
 message EventCreate {
   uint64 plan_id = 1 [(gogoproto.customname) = "PlanID"];
   string prov_address = 2;
-  int64 gigabytes = 3;
-  int64 hours = 4;
+  string bytes = 3;
+  string duration = 4;
   string prices = 5;
 }
 

proto/sentinel/plan/v3/msg.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package sentinel.plan.v3;
 
 import "gogoproto/gogo.proto";
+import "google/protobuf/duration.proto";
 import "sentinel/types/v1/price.proto";
 import "sentinel/types/v1/renewal.proto";
 import "sentinel/types/v1/status.proto";
@@ -12,8 +13,14 @@ option (gogoproto.goproto_getters_all) = false;
 
 message MsgCreatePlanRequest {
   string from = 1;
-  int64 gigabytes = 2;
-  int64 hours = 3;
+  string bytes = 2 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+  google.protobuf.Duration duration = 3 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true
+  ];
   repeated sentinel.types.v1.Price prices = 4 [(gogoproto.nullable) = false];
 }
 

proto/sentinel/plan/v3/plan.proto

@@ -2,6 +2,7 @@ syntax = "proto3";
 package sentinel.plan.v3;
 
 import "gogoproto/gogo.proto";
+import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "sentinel/types/v1/price.proto";
 import "sentinel/types/v1/status.proto";
@@ -13,8 +14,14 @@ option (gogoproto.goproto_getters_all) = false;
 message Plan {
   uint64 id = 1 [(gogoproto.customname) = "ID"];
   string prov_address = 2;
-  int64 gigabytes = 3;
-  int64 hours = 4;
+  string bytes = 3 [
+    (gogoproto.customtype) = "cosmossdk.io/math.Int",
+    (gogoproto.nullable) = false
+  ];
+  google.protobuf.Duration duration = 4 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdduration) = true
+  ];
   repeated sentinel.types.v1.Price prices = 5 [(gogoproto.nullable) = false];
   sentinel.types.v1.Status status = 6;
   google.protobuf.Timestamp status_at = 7 [

x/plan/client/cli/tx.go

@@ -1,8 +1,11 @@
 package cli
 
 import (
+	"fmt"
 	"strconv"
+	"time"
 
+	sdkmath "cosmossdk.io/math"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
@@ -15,21 +18,21 @@ import (
 
 func txCreatePlan() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "create-plan [gigabytes] [hours]",
-		Short: "Create a new subscription plan with gigabytes, hours and pricing details",
+		Use:   "create-plan [bytes] [duration]",
+		Short: "Create a new subscription plan with bytes, duration and pricing details",
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			gigabytes, err := strconv.ParseInt(args[0], 10, 64)
-			if err != nil {
-				return err
+			bytes, ok := sdkmath.NewIntFromString(args[0])
+			if !ok {
+				return fmt.Errorf("invalid bytes %s", args[0])
 			}
 
-			hours, err := strconv.ParseInt(args[1], 10, 64)
+			duration, err := time.ParseDuration(args[1])
 			if err != nil {
 				return err
 			}
@@ -41,8 +44,8 @@ func txCreatePlan() *cobra.Command {
 
 			msg := v3.NewMsgCreatePlanRequest(
 				ctx.FromAddress.Bytes(),
-				gigabytes,
-				hours,
+				bytes,
+				duration,
 				prices,
 			)
 			if err := msg.ValidateBasic(); err != nil {

x/plan/keeper/msg_handler.go

@@ -29,8 +29,8 @@ func (k *Keeper) HandleMsgCreatePlan(ctx sdk.Context, msg *v3.MsgCreatePlanReque
 	plan := v3.Plan{
 		ID:          count + 1,
 		ProvAddress: provAddr.String(),
-		Gigabytes:   msg.Gigabytes,
-		Hours:       msg.Hours,
+		Bytes:       msg.Bytes,
+		Duration:    msg.Duration,
 		Prices:      msg.Prices,
 		Status:      v1base.StatusInactive,
 		StatusAt:    ctx.BlockTime(),
@@ -46,8 +46,8 @@ func (k *Keeper) HandleMsgCreatePlan(ctx sdk.Context, msg *v3.MsgCreatePlanReque
 		&v3.EventCreate{
 			PlanID:      plan.ID,
 			ProvAddress: plan.ProvAddress,
-			Gigabytes:   plan.Gigabytes,
-			Hours:       plan.Hours,
+			Bytes:       plan.Bytes.String(),
+			Duration:    plan.Duration.String(),
 			Prices:      plan.GetPrices().String(),
 		},
 	)

x/plan/migrations/migrator.go

@@ -2,7 +2,6 @@ package migrations
 
 import (
 	"fmt"
-	"time"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/store/prefix"
@@ -75,8 +74,8 @@ func (k *Migrator) migratePlans(ctx sdk.Context) {
 		plan := v3.Plan{
 			ID:          item.ID,
 			ProvAddress: item.ProviderAddress,
-			Gigabytes:   item.Gigabytes,
-			Hours:       int64(item.Duration / time.Hour),
+			Bytes:       base.Gigabyte.MulRaw(item.Gigabytes),
+			Duration:    item.Duration,
 			Prices:      prices,
 			Status:      item.Status,
 			StatusAt:    item.StatusAt,

x/plan/types/v3/events.pb.go

@@ -2,7 +2,9 @@ package v3
 
 import (
 	"fmt"
+	"time"
 
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	base "github.com/sentinel-official/sentinelhub/v12/types"
@@ -20,12 +22,12 @@ var (
 )
 
 // NewMsgCreatePlanRequest creates a new MsgCreatePlanRequest instance.
-func NewMsgCreatePlanRequest(from base.ProvAddress, gigabytes, hours int64, prices v1base.Prices) *MsgCreatePlanRequest {
+func NewMsgCreatePlanRequest(from base.ProvAddress, bytes sdkmath.Int, duration time.Duration, prices v1base.Prices) *MsgCreatePlanRequest {
 	return &MsgCreatePlanRequest{
-		From:      from.String(),
-		Gigabytes: gigabytes,
-		Hours:     hours,
-		Prices:    prices,
+		From:     from.String(),
+		Bytes:    bytes,
+		Duration: duration,
+		Prices:   prices,
 	}
 }
 
@@ -44,20 +46,24 @@ func (m *MsgCreatePlanRequest) ValidateBasic() error {
 		return types.NewErrorInvalidMessage(fmt.Errorf("invalid from: %w", err))
 	}
 
-	if m.Gigabytes == 0 {
-		return types.NewErrorInvalidMessage("gigabytes cannot be zero")
+	if m.Bytes.IsNil() {
+		return types.NewErrorInvalidMessage("bytes cannot be nil")
 	}
 
-	if m.Gigabytes < 0 {
-		return types.NewErrorInvalidMessage("gigabytes cannot be negative")
+	if m.Bytes.IsZero() {
+		return types.NewErrorInvalidMessage("bytes cannot be zero")
 	}
 
-	if m.Hours == 0 {
-		return types.NewErrorInvalidMessage("hours cannot be zero")
+	if m.Bytes.IsNegative() {
+		return types.NewErrorInvalidMessage("bytes cannot be negative")
 	}
 
-	if m.Hours < 0 {
-		return types.NewErrorInvalidMessage("hours cannot be negative")
+	if m.Duration == 0 {
+		return types.NewErrorInvalidMessage("duration cannot be zero")
+	}
+
+	if m.Duration < 0 {
+		return types.NewErrorInvalidMessage("duration cannot be negative")
 	}
 
 	if prices := m.GetPrices(); !prices.IsValid() {