Skip to content

Commit f82d904

Browse files
committed
Add current network contract modifier for improved revert messages
1 parent 69bbd8a commit f82d904

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

contracts/contract/deposit/RocketDepositPool.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ contract RocketDepositPool is RocketBase, RocketDepositPoolInterface, RocketVaul
472472
/// @param _validatorId The megapool-managed ID of the validator requesting funds
473473
/// @param _amount The amount of ETH requested by the node operator
474474
/// @param _expressQueue Whether to consume an express ticket to be placed in the express queue
475-
function requestFunds(uint256 _bondAmount, uint32 _validatorId, uint256 _amount, bool _expressQueue) external onlyRegisteredMegapool(msg.sender) {
475+
function requestFunds(uint256 _bondAmount, uint32 _validatorId, uint256 _amount, bool _expressQueue) external onlyRegisteredMegapool(msg.sender) onlyThisLatestContract {
476476
// Validate arguments
477477
require(_bondAmount % milliToWei == 0, "Invalid supplied amount");
478478
require(_amount % milliToWei == 0, "Invalid requested amount");
@@ -520,7 +520,7 @@ contract RocketDepositPool is RocketBase, RocketDepositPoolInterface, RocketVaul
520520
/// @dev Called from a megapool to remove an entry in the validator queue and returns funds to node by credit mechanism
521521
/// @param _validatorId Internal ID of the validator to be removed
522522
/// @param _expressQueue Whether the entry is in the express queue or not
523-
function exitQueue(address _nodeAddress, uint32 _validatorId, bool _expressQueue) external onlyRegisteredMegapool(msg.sender) {
523+
function exitQueue(address _nodeAddress, uint32 _validatorId, bool _expressQueue) external onlyRegisteredMegapool(msg.sender) onlyThisLatestContract {
524524
LinkedListStorageInterface linkedListStorage = LinkedListStorageInterface(getContractAddress("linkedListStorage"));
525525
LinkedListStorageInterface.DepositQueueKey memory key = LinkedListStorageInterface.DepositQueueKey({
526526
receiver: msg.sender,
@@ -555,14 +555,14 @@ contract RocketDepositPool is RocketBase, RocketDepositPoolInterface, RocketVaul
555555
}
556556

557557
/// @dev Called from megapool to increase a node operator's credit
558-
function applyCredit(address _nodeAddress, uint256 _amount) override external onlyRegisteredMegapool(msg.sender) {
558+
function applyCredit(address _nodeAddress, uint256 _amount) override external onlyRegisteredMegapool(msg.sender) onlyThisLatestContract {
559559
// Add to node's credit for the amount supplied
560560
addUint(keccak256(abi.encodePacked("node.deposit.credit.balance", _nodeAddress)), _amount);
561561
}
562562

563563
/// @notice Allows node operator to withdraw any ETH credit they have as rETH
564564
/// @param _amount Amount in ETH to withdraw
565-
function withdrawCredit(uint256 _amount) override external onlyRegisteredNode(msg.sender) {
565+
function withdrawCredit(uint256 _amount) override external onlyRegisteredNode(msg.sender) onlyThisLatestContract {
566566
// Check deposits are enabled
567567
RocketDAOProtocolSettingsDepositInterface rocketDAOProtocolSettingsDeposit = RocketDAOProtocolSettingsDepositInterface(getContractAddress("rocketDAOProtocolSettingsDeposit"));
568568
require(rocketDAOProtocolSettingsDeposit.getDepositEnabled(), "Deposits into Rocket Pool are currently disabled");
@@ -681,14 +681,14 @@ contract RocketDepositPool is RocketBase, RocketDepositPoolInterface, RocketVaul
681681
}
682682

683683
/// @dev Called by a megapool during a bond reduction to adjust its capital ratio
684-
function reduceBond(address _nodeAddress, uint256 _amount) override external onlyRegisteredMegapool(msg.sender) {
684+
function reduceBond(address _nodeAddress, uint256 _amount) override external onlyRegisteredMegapool(msg.sender) onlyThisLatestContract {
685685
// Update collateral balances
686686
_increaseETHBorrowed(_nodeAddress, _amount);
687687
_decreaseETHBonded(_nodeAddress, _amount);
688688
}
689689

690690
/// @dev Called by a megapool when exiting to handle change in capital ratio
691-
function fundsReturned(address _nodeAddress, uint256 _nodeAmount, uint256 _userAmount) override external onlyRegisteredMegapool(msg.sender) {
691+
function fundsReturned(address _nodeAddress, uint256 _nodeAmount, uint256 _userAmount) override external onlyRegisteredMegapool(msg.sender) onlyThisLatestContract {
692692
// Update collateral balances
693693
_decreaseETHBonded(_nodeAddress, _nodeAmount);
694694
_decreaseETHBorrowed(_nodeAddress, _userAmount);

0 commit comments

Comments
 (0)