nit: move timestamp check into helper + document

reserve-protocol · Jul 18, 2024 · ab69c4c · ab69c4c
1 parent 1616b12
commit ab69c4c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol
@@ -406,9 +406,10 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler {
         return _quantity(erc20, ICollateral(address(asset)), false, CEIL);
     }
 
+    /// @param coll A collateral that has had refresh() called on it this timestamp
     /// @return {1} The multiplier to charge on issuance quantities for a collateral
     function issuancePremium(ICollateral coll) public view returns (uint192) {
-        if (skipIssuancePremium) return FIX_ONE;
+        if (skipIssuancePremium || coll.lastSave() != block.timestamp) return FIX_ONE;
 
         try coll.savedPegPrice() returns (uint192 pegPrice) {
             uint192 targetPerRef = coll.targetPerRef(); // {target/ref}
@@ -442,7 +443,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler {
         q = basket.refAmts[erc20].div(refPerTok, rounding);
 
         // Prevent toxic issuance by charging more when collateral is under peg
-        if (applyIssuancePremium && coll.lastSave() == block.timestamp) {
+        if (applyIssuancePremium) {
             uint192 premium = issuancePremium(coll); // {1} CEIL
 
             // {tok/BU} = {tok/BU} * {1}

diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol
@@ -366,10 +366,11 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
         return _quantity(erc20, ICollateral(address(asset)), false, CEIL);
     }
 
+    /// @param coll A collateral that has had refresh() called on it this timestamp
     /// @return {1} The multiplier to charge on issuance quantities for a collateral
     function issuancePremium(ICollateral coll) public view returns (uint192) {
         // `coll` does not need validation
-        if (skipIssuancePremium) return FIX_ONE;
+        if (skipIssuancePremium || coll.lastSave() != block.timestamp) return FIX_ONE;
 
         // Use try-catch for safety since `savedPegPrice()` was only added in 4.0.0 to ICollateral
         try coll.savedPegPrice() returns (uint192 pegPrice) {
@@ -406,7 +407,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler {
         q = basket.refAmts[erc20].div(refPerTok, rounding);
 
         // Prevent toxic issuance by charging more when collateral is under peg
-        if (applyIssuancePremium && coll.lastSave() == block.timestamp) {
+        if (applyIssuancePremium) {
             uint192 premium = issuancePremium(coll); // {1} CEIL
 
             // {tok/BU} = {tok/BU} * {1}