Merge branch 'runtime-fv' into discount-rate-not-cached

term-finance · Sep 9, 2024 · 0fec2dd · 0fec2dd
2 parents 0dad113 + 47bb445
commit 0fec2dd
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/Strategy.sol b/src/Strategy.sol
@@ -762,8 +762,8 @@ contract Strategy is BaseStrategy, Pausable, ReentrancyGuard {
             termAuction.termAuctionOfferLocker()
         );
         require(
-            block.timestamp > offerLocker.auctionStartTime() ||
-                block.timestamp < termAuction.auctionEndTime(),
+            block.timestamp > offerLocker.auctionStartTime() &&
+                block.timestamp < offerLocker.revealTime(),
             "Auction not open"
         );
 
@@ -925,12 +925,8 @@ contract Strategy is BaseStrategy, Pausable, ReentrancyGuard {
             );
         } else {
             // Edit offer, overwrite existing
-            termAuctionListData.offers[offerIds[0]] = PendingOffer({
-                repoToken: repoToken,
-                offerAmount: offer.amount,
-                termAuction: auction,
-                offerLocker: offerLocker
-            });
+            PendingOffer storage pendingOffer = termAuctionListData.offers[offerIds[0]];
+            pendingOffer.offerAmount = offer.amount;
         }
     }