Compare Timeout timestamps in seconds instead of nanoseconds (#7857)

* compare seconds instead of nanoseconds

* remove unnecessary helper func

* improve naming

modules/core/04-channel/v2/keeper/packet.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"strconv"
+	"time"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -53,16 +54,17 @@ func (k *Keeper) sendPacket(
 		return 0, "", errorsmod.Wrapf(clienttypes.ErrInvalidHeight, "cannot send packet using client (%s) with zero height", sourceClient)
 	}
 
-	latestTimestamp, err := k.ClientKeeper.GetClientTimestampAtHeight(ctx, sourceClient, latestHeight)
+	// client timestamps are in nanoseconds while packet timeouts are in seconds
+	// thus to compare them, we convert the client timestamp to seconds in uint64
+	// to be consistent with IBC V2 specified timeout behaviour
+	latestTimestampNano, err := k.ClientKeeper.GetClientTimestampAtHeight(ctx, sourceClient, latestHeight)
 	if err != nil {
 		return 0, "", err
 	}
+	latestTimestamp := uint64(time.Unix(0, int64(latestTimestampNano)).Unix())
 
-	// client timestamps are in nanoseconds while packet timeouts are in seconds
-	// thus to compare them, we convert the packet timeout to nanoseconds
-	timeoutTimestamp = types.TimeoutTimestampToNanos(packet.TimeoutTimestamp)
-	if latestTimestamp >= timeoutTimestamp {
-		return 0, "", errorsmod.Wrapf(types.ErrTimeoutElapsed, "latest timestamp: %d, timeout timestamp: %d", latestTimestamp, timeoutTimestamp)
+	if latestTimestamp >= packet.TimeoutTimestamp {
+		return 0, "", errorsmod.Wrapf(types.ErrTimeoutElapsed, "latest timestamp: %d, timeout timestamp: %d", latestTimestamp, packet.TimeoutTimestamp)
 	}
 
 	commitment := types.CommitPacket(packet)
@@ -264,15 +266,18 @@ func (k *Keeper) timeoutPacket(
 		return errorsmod.Wrapf(clienttypes.ErrInvalidCounterparty, "counterparty id (%s) does not match packet destination id (%s)", counterparty.ClientId, packet.DestinationClient)
 	}
 
-	// check that timeout height or timeout timestamp has passed on the other end
-	proofTimestamp, err := k.ClientKeeper.GetClientTimestampAtHeight(ctx, packet.SourceClient, proofHeight)
+	// check that timeout timestamp has passed on the other end
+	// client timestamps are in nanoseconds while packet timeouts are in seconds
+	// so we convert client timestamp to seconds in uint64 to be consistent
+	// with IBC V2 timeout behaviour
+	proofTimestampNano, err := k.ClientKeeper.GetClientTimestampAtHeight(ctx, packet.SourceClient, proofHeight)
 	if err != nil {
 		return err
 	}
+	proofTimestamp := uint64(time.Unix(0, int64(proofTimestampNano)).Unix())
 
-	timeoutTimestamp := types.TimeoutTimestampToNanos(packet.TimeoutTimestamp)
-	if proofTimestamp < timeoutTimestamp {
-		return errorsmod.Wrapf(types.ErrTimeoutNotReached, "proof timestamp: %d, timeout timestamp: %d", proofTimestamp, timeoutTimestamp)
+	if proofTimestamp < packet.TimeoutTimestamp {
+		return errorsmod.Wrapf(types.ErrTimeoutNotReached, "proof timestamp: %d, timeout timestamp: %d", proofTimestamp, packet.TimeoutTimestamp)
 	}
 
 	// check that the commitment has not been cleared and that it matches the packet sent by relayer

modules/core/04-channel/v2/types/packet.go

@@ -2,7 +2,6 @@ package types
 
 import (
 	"strings"
-	"time"
 
 	errorsmod "cosmossdk.io/errors"
 
@@ -79,8 +78,3 @@ func (p Payload) ValidateBasic() error {
 	}
 	return nil
 }
-
-// TimeoutTimestampToNanos takes seconds as a uint64 and returns Unix nanoseconds as uint64.
-func TimeoutTimestampToNanos(seconds uint64) uint64 {
-	return uint64(time.Unix(int64(seconds), 0).UnixNano())
-}