From 6222fe8be779d17102f53fe3844291e458e312a3 Mon Sep 17 00:00:00 2001 From: Rayerleier <1045643889@qq.com> Date: Thu, 5 Dec 2024 16:11:04 +0800 Subject: [PATCH] clean up --- src/iBTC_NetworkMiddleware.sol | 56 +++++++++------------------------- 1 file changed, 14 insertions(+), 42 deletions(-) diff --git a/src/iBTC_NetworkMiddleware.sol b/src/iBTC_NetworkMiddleware.sol index e53ea43..f06f605 100644 --- a/src/iBTC_NetworkMiddleware.sol +++ b/src/iBTC_NetworkMiddleware.sol @@ -72,9 +72,7 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { EnumerableMap.AddressToUintMap private operators; EnumerableMap.AddressToUintMap private vaults; - modifier updateStakeCache( - uint48 epoch - ) { + modifier updateStakeCache(uint48 epoch) { if (!totalStakeCached[epoch]) { calcAndCacheStakes(epoch); } @@ -109,15 +107,11 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { subnetworksCnt = 1; } - function getEpochStartTs( - uint48 epoch - ) public view returns (uint48 timestamp) { + function getEpochStartTs(uint48 epoch) public view returns (uint48 timestamp) { return START_TIME + epoch * EPOCH_DURATION; } - function getEpochAtTs( - uint48 timestamp - ) public view returns (uint48 epoch) { + function getEpochAtTs(uint48 timestamp) public view returns (uint48 epoch) { return (timestamp - START_TIME) / EPOCH_DURATION; } @@ -177,21 +171,15 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { updateKey(operator, key); } - function pauseOperator( - address operator - ) external onlyOwner { + function pauseOperator(address operator) external onlyOwner { operators.disable(operator); } - function unpauseOperator( - address operator - ) external onlyOwner { + function unpauseOperator(address operator) external onlyOwner { operators.enable(operator); } - function unregisterOperator( - address operator - ) external onlyOwner { + function unregisterOperator(address operator) external onlyOwner { (, uint48 disabledTime) = operators.getTimes(operator); if (disabledTime == 0 || disabledTime + SLASHING_WINDOW > Time.timestamp()) { @@ -201,9 +189,7 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { operators.remove(operator); } - function registerVault( - address vault - ) external onlyOwner { + function registerVault(address vault) external onlyOwner { if (vaults.contains(vault)) { revert VaultAlreadyRegistred(); } @@ -227,21 +213,15 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { vaults.enable(vault); } - function pauseVault( - address vault - ) external onlyOwner { + function pauseVault(address vault) external onlyOwner { vaults.disable(vault); } - function unpauseVault( - address vault - ) external onlyOwner { + function unpauseVault(address vault) external onlyOwner { vaults.enable(vault); } - function unregisterVault( - address vault - ) external onlyOwner { + function unregisterVault(address vault) external onlyOwner { (, uint48 disabledTime) = vaults.getTimes(vault); if (disabledTime == 0 || disabledTime + SLASHING_WINDOW > Time.timestamp()) { @@ -286,18 +266,14 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { return stake; } - function getTotalStake( - uint48 epoch - ) public view returns (uint256) { + function getTotalStake(uint48 epoch) public view returns (uint256) { if (totalStakeCached[epoch]) { return totalStakeCache[epoch]; } return _calcTotalStake(epoch); } - function getValidatorSet( - uint48 epoch - ) public view returns (ValidatorData[] memory validatorsData) { + function getValidatorSet(uint48 epoch) public view returns (ValidatorData[] memory validatorsData) { uint48 epochStartTs = getEpochStartTs(epoch); validatorsData = new ValidatorData[](operators.length()); @@ -364,9 +340,7 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { } } - function calcAndCacheStakes( - uint48 epoch - ) public returns (uint256 totalStake) { + function calcAndCacheStakes(uint48 epoch) public returns (uint256 totalStake) { uint48 epochStartTs = getEpochStartTs(epoch); // for epoch older than SLASHING_WINDOW total stake can be invalidated (use cache) @@ -396,9 +370,7 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable { totalStakeCache[epoch] = totalStake; } - function _calcTotalStake( - uint48 epoch - ) private view returns (uint256 totalStake) { + function _calcTotalStake(uint48 epoch) private view returns (uint256 totalStake) { uint48 epochStartTs = getEpochStartTs(epoch); // for epoch older than SLASHING_WINDOW total stake can be invalidated (use cache)