Skip to content

Fix QuantStamp Audit ENS-3: Inconsistent Use of the force in MSVBase.… #22

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
gnarvaja merged 2 commits into from
Mar 11, 2025
Merged

Fix QuantStamp Audit ENS-3: Inconsistent Use of the force in MSVBase.… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
574f45d
Fix QuantStamp Audit ENS-3: Inconsistent Use of the force in MSVBase.…
gnarvaja Mar 10, 2025
7386601
Merge branch 'main' of github.com:ensuro/vaults into fix-qs-ens-3
gnarvaja Mar 10, 2025
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
2 changes: 1 addition & 1 deletion contracts/MSVBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ abstract contract MSVBase is IExposeStorage {
if (strategyIndex >= MAX_STRATEGIES) revert InvalidStrategy();
IInvestStrategy strategy = _strategies[strategyIndex];
if (address(strategy) == address(0)) revert InvalidStrategy();
if (strategy.totalAssets() != 0) revert CannotRemoveStrategyWithAssets();
if (!force && strategy.totalAssets() != 0) revert CannotRemoveStrategyWithAssets();
// Check isn't removing the last one
if (strategyIndex == 0 && address(_strategies[1]) == address(0)) revert InvalidStrategiesLength();
// Shift the following strategies in the array
Expand Down
38 changes: 38 additions & 0 deletions test/test-multi-strategy-erc4626.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,44 @@ variants.forEach((variant) => {
await invariantChecks(vault);
});

variant.tagit("It can removeStrategy only if doesn't have funds unless forced", async () => {
const { deployVault, lp, lp2, currency, grantRole, grantForwardToStrategy, strategies } =
await helpers.loadFixture(variant.fixture);
const vault = await deployVault(3, undefined, [1, 0, 2], [2, 0, 1]);
await currency.connect(lp).approve(vault, MaxUint256);
await grantRole(vault, "LP_ROLE", lp);
await expect(vault.connect(lp).mint(_A(100), lp)).not.to.be.reverted;
await invariantChecks(vault);

expect(await vault.totalAssets()).to.be.equal(_A(100));
// Check money went to strategy[3]
expect(await currency.balanceOf(await strategies[1].other())).to.be.equal(_A(100));

await expect(vault.connect(lp2).removeStrategy(0, false)).to.be[variant.accessError](
vault,
lp2,
"STRATEGY_ADMIN_ROLE"
);

await grantRole(vault, "STRATEGY_ADMIN_ROLE", lp2);

await expect(vault.connect(lp2).removeStrategy(33, false)).to.be.revertedWithCustomError(
vault,
"InvalidStrategy"
);
await expect(vault.connect(lp2).removeStrategy(5, false)).to.be.revertedWithCustomError(vault, "InvalidStrategy");
await expect(vault.connect(lp2).removeStrategy(1, false)).to.be.revertedWithCustomError(
vault,
"CannotRemoveStrategyWithAssets"
);

// When forced, it can remove the strategy
await expect(vault.connect(lp2).removeStrategy(1, true))
.to.emit(vault, "StrategyRemoved")
.withArgs(strategies[1], 1);
await invariantChecks(vault);
});

variant.tagit("It can removeStrategy only if doesn't have funds", async () => {
const { deployVault, lp, lp2, currency, grantRole, grantForwardToStrategy, strategies } =
await helpers.loadFixture(variant.fixture);
Expand Down
Loading