From c2195a332872bd0071a5259f0007481a5e52a4e8 Mon Sep 17 00:00:00 2001
From: Marcin Chrzanowski <martin@clabs.co>
Date: Tue, 9 Jul 2024 17:54:02 +0200
Subject: [PATCH] fix: revert when first every timestamp is expired

---
 contracts/oracles/ChainlinkRelayerV1.sol |  6 +++---
 test/oracles/ChainlinkRelayer.t.sol      | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/contracts/oracles/ChainlinkRelayerV1.sol b/contracts/oracles/ChainlinkRelayerV1.sol
index 1068e24..1230d7d 100644
--- a/contracts/oracles/ChainlinkRelayerV1.sol
+++ b/contracts/oracles/ChainlinkRelayerV1.sol
@@ -103,10 +103,10 @@ contract ChainlinkRelayerV1 is IChainlinkRelayer {
       if (timestamp <= lastTimestamp) {
         revert TimestampNotNew();
       }
+    }
 
-      if (isTimestampExpired(timestamp)) {
-        revert ExpiredTimestamp();
-      }
+    if (isTimestampExpired(timestamp)) {
+      revert ExpiredTimestamp();
     }
 
     if (price < 0) {
diff --git a/test/oracles/ChainlinkRelayer.t.sol b/test/oracles/ChainlinkRelayer.t.sol
index de60997..5abf292 100644
--- a/test/oracles/ChainlinkRelayer.t.sol
+++ b/test/oracles/ChainlinkRelayer.t.sol
@@ -20,6 +20,7 @@ contract ChainlinkRelayerTest is BaseTest {
   int256 aPrice = 420000000;
   uint256 expectedReport = 4200000000000000000000000;
   uint256 aReport = 4100000000000000000000000;
+  uint256 expirySeconds = 600;
 
   function setUp() public {
     sortedOracles = new SortedOracles(true);
@@ -31,6 +32,7 @@ contract ChainlinkRelayerTest is BaseTest {
       )
     );
     sortedOracles.addOracle(rateFeedId, address(relayer));
+    sortedOracles.setTokenReportExpiry(rateFeedId, expirySeconds);
   }
 }
 
@@ -73,7 +75,7 @@ contract ChainlinkRelayerTest_relay is ChainlinkRelayerTest {
   }
 
   function test_revertsOnNegativePrice() public {
-    chainlinkAggregator.setRoundData(-1 * aPrice, uint256(1337));
+    chainlinkAggregator.setRoundData(-1 * aPrice, block.timestamp);
     vm.expectRevert(NEGATIVE_PRICE_ERROR);
     relayer.relay();
   }
@@ -99,9 +101,15 @@ contract ChainlinkRelayerTest_relay is ChainlinkRelayerTest {
   function test_revertsOnExpiredTimestamp() public {
     vm.prank(address(relayer));
     sortedOracles.report(rateFeedId, aReport, address(0), address(0));
-    uint256 expiry = sortedOracles.getTokenReportExpirySeconds(rateFeedId);
     chainlinkAggregator.setRoundData(aPrice, block.timestamp + 1);
-    vm.warp(block.timestamp + expiry + 1);
+    vm.warp(block.timestamp + expirySeconds + 1);
+    vm.expectRevert(EXPIRED_TIMESTAMP_ERROR);
+    relayer.relay();
+  }
+
+  function test_revertsWhenFirstTimestampIsExpired() public {
+    chainlinkAggregator.setRoundData(aPrice, block.timestamp);
+    vm.warp(block.timestamp + expirySeconds);
     vm.expectRevert(EXPIRED_TIMESTAMP_ERROR);
     relayer.relay();
   }