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.

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

add rate limit to calling manually fix accounting #2057

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { IWETH9 } from "../../interfaces/IWETH9.sol";
/// Full withdrawals are from exited validators.
/// @author Origin Protocol Inc
abstract contract ValidatorAccountant is ValidatorRegistrator {
/// @notice The minimum amount of blocks that need to pass between two calls to manuallyFixAccounting
uint256 public constant MIN_FIX_ACCOUNTING_CADENCE = 7200; // 1 day
/// @notice The maximum amount of ETH that can be staked by a validator
/// @dev this can change in the future with EIP-7251, Increase the MAX_EFFECTIVE_BALANCE
uint256 public constant MAX_STAKE = 32 ether;
Expand All @@ -21,8 +23,10 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
uint256 public fuseIntervalStart;
/// @notice end of fuse interval
uint256 public fuseIntervalEnd;
/// @notice last block number manuallyFixAccounting has been called
uint256 public lastFixAccountingBlockNumber;

uint256[50] private __gap;
uint256[49] private __gap;

event FuseIntervalUpdated(uint256 start, uint256 end);
event AccountingFullyWithdrawnValidator(
Expand Down Expand Up @@ -186,6 +190,11 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
int256 _validatorsDelta,
int256 _consensusRewardsDelta
) external onlyStrategist whenPaused {
require(
lastFixAccountingBlockNumber + MIN_FIX_ACCOUNTING_CADENCE <
block.number,
"manuallyFixAccounting called too soon"
);
require(
_validatorsDelta >= -3 &&
_validatorsDelta <= 3 &&
Expand All @@ -210,6 +219,8 @@ abstract contract ValidatorAccountant is ValidatorRegistrator {
int256(consensusRewards) + _consensusRewardsDelta
);

lastFixAccountingBlockNumber = block.number;

// rerun the accounting to see if it has now been fixed.
// Do not pause the accounting on failure as it is already paused
require(_doAccounting(false), "fuse still blown");
Expand Down
51 changes: 51 additions & 0 deletions contracts/test/strategies/nativeSSVStaking.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
const {
setBalance,
setStorageAt,
mine,
} = require("@nomicfoundation/hardhat-network-helpers");

const { isCI } = require("../helpers");
Expand All @@ -12,6 +13,7 @@
const { shouldBehaveLikeStrategy } = require("../behaviour/strategy");
const { MAX_UINT256 } = require("../../utils/constants");
const { impersonateAndFund } = require("../../utils/signers");
const minFixAccountingCadence = 7200 + 1;

const {
createFixtureLoader,
Expand Down Expand Up @@ -543,6 +545,7 @@
const { nativeStakingSSVStrategy, strategist } = fixture;

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);

await expect(
nativeStakingSSVStrategy.connect(strategist).manuallyFixAccounting(
Expand All @@ -563,6 +566,7 @@
const { nativeStakingSSVStrategy, strategist } = fixture;

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);

await expect(
nativeStakingSSVStrategy.connect(strategist).manuallyFixAccounting(
Expand All @@ -587,6 +591,7 @@
await setActiveDepositedValidators(10, nativeStakingSSVStrategy);

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
const activeDepositedValidatorsBefore =
await nativeStakingSSVStrategy.activeDepositedValidators();

Expand Down Expand Up @@ -619,6 +624,7 @@
await setActiveDepositedValidators(10000, nativeStakingSSVStrategy);

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
const consensusRewardsDelta = parseEther(delta.toString());

const tx = await nativeStakingSSVStrategy
Expand Down Expand Up @@ -647,6 +653,7 @@
.transfer(nativeStakingSSVStrategy.address, parseEther("5"));

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
// unit test fixture sets OUSD governor as accounting governor
const tx = await nativeStakingSSVStrategy
.connect(strategist)
Expand All @@ -662,6 +669,50 @@
parseEther("2.3") // consensusRewards
);
});

it("Calling manually fix accounting too often should result in an error", async () => {
const { nativeStakingSSVStrategy, strategist, governor } = fixture;

Check failure on line 674 in contracts/test/strategies/nativeSSVStaking.js

View workflow job for this annotation

GitHub Actions / Contracts Linter

'governor' is assigned a value but never used

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
await nativeStakingSSVStrategy
.connect(strategist)
.manuallyFixAccounting(
0, //_validatorsDelta
parseEther("0") //_consensusRewardsDelta
);

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence - 4);
await expect(
nativeStakingSSVStrategy.connect(strategist).manuallyFixAccounting(
0, //_validatorsDelta
parseEther("0") //_consensusRewardsDelta
)
).to.be.revertedWith("manuallyFixAccounting called too soon");
});

it("Calling manually fix accounting twice with enough blocks in between should pass", async () => {
const { nativeStakingSSVStrategy, strategist, governor } = fixture;

Check failure on line 696 in contracts/test/strategies/nativeSSVStaking.js

View workflow job for this annotation

GitHub Actions / Contracts Linter

'governor' is assigned a value but never used

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
await nativeStakingSSVStrategy
.connect(strategist)
.manuallyFixAccounting(
0, //_validatorsDelta
parseEther("0") //_consensusRewardsDelta
);

await nativeStakingSSVStrategy.connect(strategist).pause();
await mine(minFixAccountingCadence);
await nativeStakingSSVStrategy
.connect(strategist)
.manuallyFixAccounting(
0, //_validatorsDelta
parseEther("0") //_consensusRewardsDelta
);
});
});
});

Expand Down
Loading