Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cantina code competition and yAudit fixes #29

Merged
merged 6 commits into from
Nov 29, 2024
Merged

Cantina code competition and yAudit fixes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c30ff8
Cantina code competition and yAudit fixes
erik1o6 Nov 25, 2024
383c27f
chore: fix foundry version for lint check
kasperpawlowski Nov 27, 2024
8bb35ef
test: fix
kasperpawlowski Nov 28, 2024
82e7b43
test: fix
kasperpawlowski Nov 29, 2024
a196246
test: fix
kasperpawlowski Nov 29, 2024
101136f
test: fix
kasperpawlowski Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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:
Expand Down
Binary file added audits/Euler Cantina Code Competition report.pdf
View file
Open in desktop
Binary file not shown.
Binary file added audits/Euler yAudit Code Competition Fixes report.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 26 files
+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
7 changes: 3 additions & 4 deletions test/unit/Scenarios.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions test/unit/Staking.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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();
Expand Down