Merge pull request #190 from KiiChain/fix/change-time

Change time.now to ctx.BlockTime and remove genesis time validations

Author: jhelison

CHANGELOG.md

@@ -5,6 +5,7 @@
 ## Fixed
 
 - Disable EVM mempool due to bug on public nodes broadcast
+- Remove references to time.Now() on release schedule validation
 - Remove unsafe math.Sqrt usage in oracle ballot standard deviation calculation
 
 ## v6.0.0 - 2025-11-25

x/rewards/keeper/msg_server.go

@@ -67,24 +67,27 @@ func (k msgServer) FundPool(ctx context.Context, msg *types.MsgFundPool) (*types
 
 // ChangeSchedule validates changes to the release scheduler
 func (k msgServer) ChangeSchedule(ctx context.Context, msg *types.MsgChangeSchedule) (*types.MsgChangeScheduleResponse, error) {
+	// Get cosmos sdk context from golang context
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+
 	// Authority validation
 	if err := k.validateAuthority(msg.Authority); err != nil {
 		return nil, err
 	}
 
 	// Check if schedule is sound
 	schedule := msg.Schedule
-	if err := k.validateSchedule(ctx, schedule); err != nil {
+	if err := k.validateSchedule(sdkCtx, schedule); err != nil {
 		return nil, fmt.Errorf("invalid schedule: %w", err)
 	}
 
 	// Check available funds
-	if err := k.fundsAvailable(ctx, schedule.TotalAmount); err != nil {
+	if err := k.fundsAvailable(sdkCtx, schedule.TotalAmount); err != nil {
 		return nil, fmt.Errorf("insufficient funds: %w", err)
 	}
 
 	// Save the new schedule
-	if err := k.Keeper.ReleaseSchedule.Set(ctx, schedule); err != nil {
+	if err := k.Keeper.ReleaseSchedule.Set(sdkCtx, schedule); err != nil {
 		return nil, fmt.Errorf("failed to set release schedule: %w", err)
 	}
 

x/rewards/keeper/validation.go

@@ -37,8 +37,8 @@ func validateAmount(amount sdk.Coin) error {
 }
 
 // validateEndTime checks if time is in the past
-func validateEndTime(endTime time.Time) error {
-	if endTime.Before(time.Now()) {
+func validateEndTime(ctx sdk.Context, endTime time.Time) error {
+	if endTime.Before(ctx.BlockTime()) {
 		return fmt.Errorf("end time %s is not in the future", endTime)
 	}
 
@@ -63,7 +63,7 @@ func (k Keeper) fundsAvailable(ctx context.Context, amount sdk.Coin) error {
 }
 
 // validateSchedule checks if the asked funds are available in the pool
-func (k Keeper) validateSchedule(ctx context.Context, schedule types.ReleaseSchedule) error {
+func (k Keeper) validateSchedule(ctx sdk.Context, schedule types.ReleaseSchedule) error {
 	// Validate TotalAmount
 	if err := validateAmount(schedule.TotalAmount); err != nil {
 		return fmt.Errorf("invalid total amount: %w", err)
@@ -95,14 +95,14 @@ func (k Keeper) validateSchedule(ctx context.Context, schedule types.ReleaseSche
 	}
 
 	// Time validations
-	currentTime := time.Now()
 	if schedule.EndTime.IsZero() {
 		return fmt.Errorf("end time cannot be zero")
 	}
-	if err = validateEndTime(schedule.EndTime); err != nil {
+	if err = validateEndTime(ctx, schedule.EndTime); err != nil {
 		return err
 	}
 
+	currentTime := ctx.BlockTime()
 	if !schedule.LastReleaseTime.IsZero() {
 		if schedule.LastReleaseTime.After(currentTime) {
 			return fmt.Errorf("last release time %s cannot be in the future",

x/rewards/types/release_schedule.go

@@ -20,16 +20,6 @@ func InitialReleaseSchedule() ReleaseSchedule {
 
 // ValidateGenesis validates the release schedule for a genesis state
 func (rr ReleaseSchedule) ValidateGenesis() error {
-	// Validate EndTime (zero time is allowed for genesis)
-	if !rr.EndTime.IsZero() && rr.EndTime.Before(time.Now()) {
-		return fmt.Errorf("end time %s cannot be in the past", rr.EndTime.String())
-	}
-
-	// Validate LastReleaseTime
-	if rr.LastReleaseTime.After(time.Now()) {
-		return fmt.Errorf("last release time %s cannot be in the future", rr.EndTime.String())
-	}
-
 	// Some validations just make sense if active
 	if rr.Active {
 		// Validate TotalAmount

x/rewards/types/release_schedule_test.go

@@ -88,30 +88,6 @@ func TestRewardReleaserValidateGenesis(t *testing.T) {
 			wantErr: true,
 			errMsg:  "cannot be greater than total amount",
 		},
-		{
-			name: "end time in past",
-			schedule: types.ReleaseSchedule{
-				TotalAmount:     validCoin,
-				ReleasedAmount:  sdk.Coin{},
-				EndTime:         now.Add(-time.Hour * 24),
-				LastReleaseTime: time.Time{},
-				Active:          false,
-			},
-			wantErr: true,
-			errMsg:  "cannot be in the past",
-		},
-		{
-			name: "last release in future",
-			schedule: types.ReleaseSchedule{
-				TotalAmount:     validCoin,
-				ReleasedAmount:  sdk.Coin{},
-				EndTime:         time.Time{},
-				LastReleaseTime: now.Add(time.Hour * 24),
-				Active:          false,
-			},
-			wantErr: true,
-			errMsg:  "cannot be in the future",
-		},
 		{
 			name: "active with zero total",
 			schedule: types.ReleaseSchedule{