Merge pull request #29 from euler-xyz/cantina-and-yAudit-code-competi…

…tion Cantina code competition and yAudit fixes
euler-xyz · Nov 29, 2024 · 7eb6e3f · 7eb6e3f
2 parents a90cf55 + 101136f
commit 7eb6e3f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -34,7 +34,7 @@ jobs:
                 submodules: recursive
           - uses: foundry-rs/foundry-toolchain@v1
             with:
-                version: nightly
+                version: nightly-c99854277c346fa6de7a8f9837230b36fd85850e
 
           - name: Run foundry fmt check
             run: |
@@ -54,7 +54,7 @@ jobs:
           - name: Run foundry tests
             # --ast tests enables inline configs to work https://github.com/foundry-rs/foundry/issues/7310#issuecomment-1978088200
             run: |
-                forge test -vvv --gas-report --ast 
+                forge test -vvv --ast 
             id: test
 
   coverage:

diff --git a/audits/Euler Cantina Code Competition report.pdf b/audits/Euler Cantina Code Competition report.pdf
diff --git a/audits/Euler yAudit Code Competition Fixes report.pdf b/audits/Euler yAudit Code Competition Fixes report.pdf
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/test/unit/Scenarios.t.sol b/test/unit/Scenarios.t.sol
@@ -2366,10 +2366,9 @@ contract ScenarioTest is Test {
         address _receiver,
         bool _forfeitRecentReward
     ) external {
-        _rewarded = boundAddr(_rewarded);
-        _reward = boundAddr(_reward);
-        _receiver = boundAddr(_receiver);
-        vm.assume(uint160(_receiver) > 256);
+        _rewarded = boundAddr(address(uint160(bound(uint160(_rewarded), 257, type(uint160).max))));
+        _reward = boundAddr(address(uint160(bound(uint160(_reward), 257, type(uint160).max))));
+        _receiver = boundAddr(address(uint160(bound(uint160(_receiver), 257, type(uint160).max))));
 
         vm.etch(_reward, address(reward).code);
         MockERC20(_reward).mint(address(stakingDistributor), 100e18);

diff --git a/test/unit/Staking.t.sol b/test/unit/Staking.t.sol
@@ -107,19 +107,19 @@ contract StakingTest is Test {
         }
 
         // but if owner is the recipient, it should work
-        uint256 snapshot = vm.snapshot();
+        uint256 snapshot = vm.snapshotState();
         preBalanceRecipient = MockERC20(rewarded).balanceOf(recipient);
         preBalanceDistributor = MockERC20(rewarded).balanceOf(address(distributor));
         distributor.unstake(rewarded, type(uint256).max, recipient, false);
         assertEq(MockERC20(rewarded).balanceOf(recipient), preBalanceRecipient + preBalanceDistributor);
         assertEq(MockERC20(rewarded).balanceOf(address(distributor)), 0);
 
         // it should also work if the rewarded token is EVC-compatible
-        vm.revertTo(snapshot);
+        vm.revertToState(snapshot);
         vm.mockCall(rewarded, abi.encodeWithSignature("EVC()"), abi.encode(address(evc)));
 
         for (uint160 i = 1; i < 256; ++i) {
-            snapshot = vm.snapshot();
+            snapshot = vm.snapshotState();
 
             address _recipient = address(uint160(recipient) ^ i);
 
@@ -130,7 +130,7 @@ contract StakingTest is Test {
             assertEq(MockERC20(rewarded).balanceOf(_recipient), preBalanceRecipient + preBalanceDistributor);
             assertEq(MockERC20(rewarded).balanceOf(address(distributor)), 0);
 
-            vm.revertTo(snapshot);
+            vm.revertToState(snapshot);
         }
 
         vm.stopPrank();
+193 −0		CONTRIBUTING.md
+17 −1		README.md
+1 −1		package.json
+12 −1		scripts/vm.py
+12 −1		src/StdChains.sol
+3 −3		src/StdCheats.sol
+9 −0		src/StdInvariant.sol
+104 −0		src/StdJson.sol
+1 −1		src/StdStorage.sol
+104 −0		src/StdToml.sol
+527 −76		src/Vm.sol
+635 −608		src/console.sol
+1 −1,555		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+693 −4		src/safeconsole.sol
+1 −1		test/StdAssertions.t.sol
+19 −15		test/StdChains.t.sol
+10 −10		test/StdCheats.t.sol
+12 −12		test/StdError.t.sol
+1 −1		test/StdJson.t.sol
+4 −14		test/StdMath.t.sol
+13 −5		test/StdStorage.t.sol
+1 −1		test/StdStyle.t.sol
+1 −1		test/StdToml.t.sol
+12 −12		test/StdUtils.t.sol
+9 −6		test/Vm.t.sol