feat: more strict redemptionDelayBlocks

Resolves: sherlock-audit/2023-12-ubiquity-judging#33
ubiquity · Feb 25, 2024 · 1ef1ab9 · 1ef1ab9
1 parent 38c3656
commit 1ef1ab9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/contracts/src/dollar/libraries/LibUbiquityPool.sol b/packages/contracts/src/dollar/libraries/LibUbiquityPool.sol
@@ -487,7 +487,7 @@ library LibUbiquityPool {
                 poolStorage.lastRedeemedBlock[msg.sender].add(
                     poolStorage.redemptionDelayBlocks
                 )
-            ) <= block.number,
+            ) < block.number,
             "Too soon to collect redemption"
         );
 
@@ -533,10 +533,9 @@ library LibUbiquityPool {
             // roundId
             int256 answer, // startedAt
             ,
-            uint256 updatedAt,
+            uint256 updatedAt, // answeredInRound
 
-        ) = // answeredInRound
-            priceFeed.latestRoundData();
+        ) = priceFeed.latestRoundData();
 
         // fetch number of decimals in chainlink feed
         uint256 priceFeedDecimals = priceFeed.decimals();

diff --git a/packages/contracts/test/diamond/facets/UbiquityPoolFacet.t.sol b/packages/contracts/test/diamond/facets/UbiquityPoolFacet.t.sol
@@ -516,7 +516,7 @@ contract UbiquityPoolFacetTest is DiamondTestSetup {
         );
 
         // wait 3 blocks for collecting redemption to become active
-        vm.roll(3);
+        vm.roll(block.number + 3);
 
         // balances before
         assertEq(collateralToken.balanceOf(address(ubiquityPoolFacet)), 100e18);