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

L-10 Fix [PAG] #101

Merged
merged 1 commit into from
May 16, 2024
Merged

L-10 Fix [PAG] #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/vault/Vault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,12 @@ contract Vault is ERC4626, Multicall, AccessControlDefaultAdminRules, Reentrancy
(feeShares, newTotalAssets) = _accruedFeeShares();
newTotalSupply = totalSupply() + feeShares;

assets = _convertToAssetsWithTotals(balanceOf(owner), newTotalSupply, newTotalAssets, Math.Rounding.Floor);
uint256 shareBalances = balanceOf(owner);
if (owner == feeRecipient) {
shareBalances += feeShares;
}

assets = _convertToAssetsWithTotals(shareBalances, newTotalSupply, newTotalAssets, Math.Rounding.Floor);

assets -= _simulateWithdrawIon(assets);
}
Expand Down
5 changes: 3 additions & 2 deletions test/unit/fuzz/vault/Vault.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ contract VaultWithYieldAndFee_Fuzz is VaultSharedSetup {
// expected resulting state

uint256 expectedFeeAssets = interestAccrued.mulDiv(feePerc, RAY);
uint256 expectedFeeShares =
expectedFeeAssets.mulDiv(vault.totalSupply(), newTotalAssets - expectedFeeAssets, Math.Rounding.Floor);
uint256 expectedFeeShares = expectedFeeAssets.mulDiv(
vault.totalSupply() + 1, newTotalAssets - expectedFeeAssets + 1, Math.Rounding.Floor
);

uint256 expectedUserAssets = prevUserAssets + interestAccrued.mulDiv(RAY - feePerc, RAY);

Expand Down
Loading