Merge branch 'master' into feat/memory-fixed-size-stack

Author: waelsy123

contracts/utils/FixedSizeMemoryStack.sol

@@ -49,9 +49,7 @@ library FixedSizeMemoryStack {
         uint256 t = stack._top;
         if (t >= stack._data.length) revert StackOverflow(stack._data.length);
         stack._data[t] = value;
-        unchecked {
-            stack._top = t + 1;
-        }
+        stack._top = t + 1;
     }
 
     /// @notice Pop the top value from the stack.
@@ -60,9 +58,7 @@ library FixedSizeMemoryStack {
     function pop(Stack memory stack) internal pure returns (bytes32 value) {
         uint256 t = stack._top;
         if (t == 0) revert StackUnderflow();
-        unchecked {
-            t -= 1;
-        }
+        t -= 1;
         value = stack._data[t];
         stack._top = t;
     }

test/utils/Blockhash.t.sol

@@ -67,6 +67,7 @@ contract BlockhashTest is Test {
     function testFuzzFutureBlocks(uint256 offset, uint256 currentBlock) public {
         // Future blocks
         offset = bound(offset, 1, type(uint256).max);
+        currentBlock = bound(currentBlock, 0, type(uint256).max - offset);
         vm.roll(currentBlock);
 
         unchecked {

test/utils/FixedSizeMemoryStack.t.sol

@@ -36,12 +36,16 @@ contract FixedSizeMemoryStackTest is Test, SymTest {
     }
 
     /// forge-config: default.allow_internal_expect_revert = true
-    function testPeek() public {
+    function testPeekStackUnderflow() public {
         FixedSizeMemoryStack.Stack memory stack = FixedSizeMemoryStack.init(10);
 
         vm.expectRevert(abi.encodeWithSelector(FixedSizeMemoryStack.StackUnderflow.selector));
         stack.peek();
         assertEq(stack._top, 0);
+    }
+
+    function testPeek() public {
+        FixedSizeMemoryStack.Stack memory stack = FixedSizeMemoryStack.init(10);
 
         stack.push(bytes32(uint256(1)));
         stack.push(bytes32(uint256(2)));