diff --git a/contracts/contracts/harvest/FixedRateDripper.sol b/contracts/contracts/harvest/FixedRateDripper.sol index a4159dca94..02b936b9ee 100644 --- a/contracts/contracts/harvest/FixedRateDripper.sol +++ b/contracts/contracts/harvest/FixedRateDripper.sol @@ -58,7 +58,7 @@ contract FixedRateDripper is Dripper { * @param _perSecond Rate of WETH to drip per second */ function setDripRate(uint192 _perSecond) external onlyGovernorOrStrategist { - emit DripRateUpdated(_perSecond, drip.perSecond); + emit DripRateUpdated(drip.perSecond, _perSecond); /** * Note: It's important to call `_collect` before updating diff --git a/contracts/contracts/poolBooster/PoolBoostCentralRegistry.sol b/contracts/contracts/poolBooster/PoolBoostCentralRegistry.sol index ffe149000b..45261fb75b 100644 --- a/contracts/contracts/poolBooster/PoolBoostCentralRegistry.sol +++ b/contracts/contracts/poolBooster/PoolBoostCentralRegistry.sol @@ -57,7 +57,6 @@ contract PoolBoostCentralRegistry is Governable, IPoolBoostCentralRegistry { factories[i] = factories[length - 1]; factories.pop(); - emit FactoryRemoved(_factoryAddress); factoryRemoved = true; break; } diff --git a/contracts/contracts/strategies/BaseCurveAMOStrategy.sol b/contracts/contracts/strategies/BaseCurveAMOStrategy.sol index 0b473c93db..02fad7a0bb 100644 --- a/contracts/contracts/strategies/BaseCurveAMOStrategy.sol +++ b/contracts/contracts/strategies/BaseCurveAMOStrategy.sol @@ -616,7 +616,7 @@ contract BaseCurveAMOStrategy is InitializableAbstractStrategy { } function _setMaxSlippage(uint256 _maxSlippage) internal { - require(_maxSlippage <= 5e16, "Slippage must be less than 100%"); + require(_maxSlippage <= 5e16, "Slippage must be less than 5%"); maxSlippage = _maxSlippage; emit MaxSlippageUpdated(_maxSlippage); } diff --git a/contracts/contracts/strategies/CurveAMOStrategy.sol b/contracts/contracts/strategies/CurveAMOStrategy.sol index f00ddb49d6..f9b872b174 100644 --- a/contracts/contracts/strategies/CurveAMOStrategy.sol +++ b/contracts/contracts/strategies/CurveAMOStrategy.sol @@ -650,7 +650,7 @@ contract CurveAMOStrategy is InitializableAbstractStrategy { } function _setMaxSlippage(uint256 _maxSlippage) internal { - require(_maxSlippage <= 5e16, "Slippage must be less than 100%"); + require(_maxSlippage <= 5e16, "Slippage must be less than 5%"); maxSlippage = _maxSlippage; emit MaxSlippageUpdated(_maxSlippage); } diff --git a/contracts/contracts/vault/OETHPlumeVault.sol b/contracts/contracts/vault/OETHPlumeVault.sol index 5a4e8e81a8..aee117bdd5 100644 --- a/contracts/contracts/vault/OETHPlumeVault.sol +++ b/contracts/contracts/vault/OETHPlumeVault.sol @@ -11,11 +11,7 @@ contract OETHPlumeVault is VaultAdmin { constructor(address _weth) VaultAdmin(_weth) {} // @inheritdoc VaultAdmin - function _mint( - address, - uint256 _amount, - uint256 - ) internal virtual { + function _mint(uint256 _amount) internal override { // Only Strategist or Governor can mint using the Vault for now. // This allows the strateigst to fund the Vault with WETH when // removing liquidi from wOETH strategy. diff --git a/contracts/test/strategies/base/curve-amo.base.fork-test.js b/contracts/test/strategies/base/curve-amo.base.fork-test.js index edd065f38c..121c65c3e5 100644 --- a/contracts/test/strategies/base/curve-amo.base.fork-test.js +++ b/contracts/test/strategies/base/curve-amo.base.fork-test.js @@ -714,7 +714,7 @@ describe("Base Fork Test: Curve AMO strategy", function () { curveAMOStrategy .connect(impersonatedAMOGovernor) .setMaxSlippage(oethUnits("0.51")) - ).to.be.revertedWith("Slippage must be less than 100%"); + ).to.be.revertedWith("Slippage must be less than 5%"); }); }); diff --git a/contracts/test/strategies/curve-amo-oeth.mainnet.fork-test.js b/contracts/test/strategies/curve-amo-oeth.mainnet.fork-test.js index 09b428b5de..1f86d9b4a8 100644 --- a/contracts/test/strategies/curve-amo-oeth.mainnet.fork-test.js +++ b/contracts/test/strategies/curve-amo-oeth.mainnet.fork-test.js @@ -937,7 +937,7 @@ describe("Curve AMO OETH strategy", function () { curveAMOStrategy .connect(impersonatedAMOGovernor) .setMaxSlippage(ousdUnits("0.51")) - ).to.be.revertedWith("Slippage must be less than 100%"); + ).to.be.revertedWith("Slippage must be less than 5%"); }); }); diff --git a/contracts/test/strategies/curve-amo-ousd.mainnet.fork-test.js b/contracts/test/strategies/curve-amo-ousd.mainnet.fork-test.js index 4e326ab235..86fbe82c63 100644 --- a/contracts/test/strategies/curve-amo-ousd.mainnet.fork-test.js +++ b/contracts/test/strategies/curve-amo-ousd.mainnet.fork-test.js @@ -941,7 +941,7 @@ describe("Fork Test: Curve AMO OUSD strategy", function () { curveAMOStrategy .connect(impersonatedAMOGovernor) .setMaxSlippage(ousdUnits("0.51")) - ).to.be.revertedWith("Slippage must be less than 100%"); + ).to.be.revertedWith("Slippage must be less than 5%"); }); });