Skip to content

Fix checkBalance bug in new OETHVaultCore #2162

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

Merged
merged 3 commits into from
Aug 2, 2024
Merged

Fix checkBalance bug in new OETHVaultCore #2162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f8011
Added unit test for checkBalance when balance is less than the outsta…
naddison36 Aug 2, 2024
0f8e25b
Fix _checkBalance so it returns 0 when the amount of WETH in the vaul…
naddison36 Aug 2, 2024
19c20e6
Moved asset check to top of _checkBalance
naddison36 Aug 2, 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
18 changes: 12 additions & 6 deletions contracts/contracts/vault/OETHVaultCore.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,21 @@ contract OETHVaultCore is VaultCore {
override
returns (uint256 balance)
{
if (_asset != weth) {
return 0;
}

balance = super._checkBalance(_asset);

if (_asset == weth) {
WithdrawalQueueMetadata memory queue = withdrawalQueueMetadata;
// Need to remove WETH that is reserved for the withdrawal queue
if (balance + queue.claimed >= queue.queued) {
return balance + queue.claimed - queue.queued;
}
WithdrawalQueueMetadata memory queue = withdrawalQueueMetadata;
// If there is not enough WETH in the vault and strategies to cover the outstanding withdrawals.
// It can happen if more than half of the users have requested a withdrawal but have not claimed.
if (balance + queue.claimed < queue.queued) {
return 0;
}

// Need to remove WETH that is reserved for the withdrawal queue
return balance + queue.claimed - queue.queued;
}

/**
Expand Down
5 changes: 5 additions & 0 deletions contracts/test/vault/oeth-vault.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2149,6 +2149,11 @@ describe("OETH Vault", function () {
// 100 from mints - 99 outstanding withdrawals - 2 from slashing = -1 value which is rounder up to zero
expect(await fixture.oethVault.totalValue()).to.equal(0);
});
it("Should have check balance of zero", async () => {
const { oethVault, weth } = fixture;
// 100 from mints - 99 outstanding withdrawals - 2 from slashing = -1 value which is rounder up to zero
expect(await oethVault.checkBalance(weth.address)).to.equal(0);
});
it("Fail to allow user to create a new request due to too many outstanding requests", async () => {
const { oethVault, matt } = fixture;

Expand Down