fmt

DLC-link · Nov 26, 2024 · 640125d · 640125d
1 parent 6594d32
commit 640125d
Show file tree

Hide file tree

Showing 14 changed files with 276 additions and 95 deletions.
diff --git a/src/dlc-core/DLCManager.sol b/src/dlc-core/DLCManager.sol
@@ -124,7 +124,9 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
         _;
     }
 
-    modifier onlyVaultCreator(bytes32 _uuid) {
+    modifier onlyVaultCreator(
+        bytes32 _uuid
+    ) {
         if (dlcs[dlcIDsByUUID[_uuid]].creator != msg.sender) revert NotOwner();
         _;
     }
@@ -267,7 +269,9 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
      * @param   proposedTotalValueMinted  proposed total minted value in all vaults on this chain.
      * @return  bool  whether the proposed total value minted is within bounds.
      */
-    function _checkPoR(uint256 proposedTotalValueMinted) internal view returns (bool) {
+    function _checkPoR(
+        uint256 proposedTotalValueMinted
+    ) internal view returns (bool) {
         if (!porEnabled) {
             return true;
         }
@@ -442,14 +446,18 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
     //                      VIEW FUNCTIONS                        //
     ////////////////////////////////////////////////////////////////
 
-    function getDLC(bytes32 uuid) public view returns (DLCLink.DLC memory) {
+    function getDLC(
+        bytes32 uuid
+    ) public view returns (DLCLink.DLC memory) {
         DLCLink.DLC memory _dlc = dlcs[dlcIDsByUUID[uuid]];
         if (_dlc.uuid == bytes32(0)) revert DLCNotFound();
         if (_dlc.uuid != uuid) revert DLCNotFound();
         return _dlc;
     }
 
-    function getDLCByIndex(uint256 index) external view returns (DLCLink.DLC memory) {
+    function getDLCByIndex(
+        uint256 index
+    ) external view returns (DLCLink.DLC memory) {
         return dlcs[index];
     }
 
@@ -472,15 +480,21 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
         return dlcSubset;
     }
 
-    function getVault(bytes32 uuid) public view returns (DLCLink.DLC memory) {
+    function getVault(
+        bytes32 uuid
+    ) public view returns (DLCLink.DLC memory) {
         return getDLC(uuid);
     }
 
-    function getAllVaultUUIDsForAddress(address owner) public view returns (bytes32[] memory) {
+    function getAllVaultUUIDsForAddress(
+        address owner
+    ) public view returns (bytes32[] memory) {
         return userVaults[owner];
     }
 
-    function getAllVaultsForAddress(address owner) public view returns (DLCLink.DLC[] memory) {
+    function getAllVaultsForAddress(
+        address owner
+    ) public view returns (DLCLink.DLC[] memory) {
         bytes32[] memory uuids = getAllVaultUUIDsForAddress(owner);
         DLCLink.DLC[] memory vaults = new DLCLink.DLC[](uuids.length);
         for (uint256 i = 0; i < uuids.length; i++) {
@@ -489,7 +503,9 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
         return vaults;
     }
 
-    function isWhitelisted(address account) external view returns (bool) {
+    function isWhitelisted(
+        address account
+    ) external view returns (bool) {
         return _whitelistedAddresses[account];
     }
 
@@ -509,7 +525,9 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
     //                      ADMIN FUNCTIONS                       //
     ////////////////////////////////////////////////////////////////
 
-    function _hasAnyRole(address account) internal view returns (bool) {
+    function _hasAnyRole(
+        address account
+    ) internal view returns (bool) {
         return hasRole(DLC_ADMIN_ROLE, account) || hasRole(WHITELISTED_CONTRACT, account)
             || hasRole(APPROVED_SIGNER, account);
     }
@@ -548,56 +566,76 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
         _unpause();
     }
 
-    function setThreshold(uint16 newThreshold) external onlyAdmin {
+    function setThreshold(
+        uint16 newThreshold
+    ) external onlyAdmin {
         if (newThreshold < _minimumThreshold) {
             revert ThresholdTooLow(_minimumThreshold);
         }
         _threshold = newThreshold;
         emit SetThreshold(newThreshold);
     }
 
-    function setTSSCommitment(bytes32 commitment) external onlyAdmin {
+    function setTSSCommitment(
+        bytes32 commitment
+    ) external onlyAdmin {
         tssCommitment = commitment;
     }
 
-    function setAttestorGroupPubKey(string calldata pubKey) external onlyAdmin {
+    function setAttestorGroupPubKey(
+        string calldata pubKey
+    ) external onlyAdmin {
         attestorGroupPubKey = pubKey;
     }
 
-    function whitelistAddress(address addressToWhitelist) external onlyAdmin {
+    function whitelistAddress(
+        address addressToWhitelist
+    ) external onlyAdmin {
         _whitelistedAddresses[addressToWhitelist] = true;
         emit WhitelistAddress(addressToWhitelist);
     }
 
-    function unwhitelistAddress(address addressToUnWhitelist) external onlyAdmin {
+    function unwhitelistAddress(
+        address addressToUnWhitelist
+    ) external onlyAdmin {
         _whitelistedAddresses[addressToUnWhitelist] = false;
         emit UnwhitelistAddress(addressToUnWhitelist);
     }
 
-    function setMinimumDeposit(uint256 newMinimumDeposit) external onlyAdmin {
+    function setMinimumDeposit(
+        uint256 newMinimumDeposit
+    ) external onlyAdmin {
         minimumDeposit = newMinimumDeposit;
         emit SetMinimumDeposit(newMinimumDeposit);
     }
 
-    function setMaximumDeposit(uint256 newMaximumDeposit) external onlyAdmin {
+    function setMaximumDeposit(
+        uint256 newMaximumDeposit
+    ) external onlyAdmin {
         maximumDeposit = newMaximumDeposit;
         emit SetMaximumDeposit(newMaximumDeposit);
     }
 
-    function setBtcMintFeeRate(uint256 newBtcMintFeeRate) external onlyAdmin {
+    function setBtcMintFeeRate(
+        uint256 newBtcMintFeeRate
+    ) external onlyAdmin {
         if (newBtcMintFeeRate > 10_000) {
             revert FeeRateOutOfBounds(newBtcMintFeeRate);
         }
         btcMintFeeRate = newBtcMintFeeRate;
         emit SetBtcMintFeeRate(newBtcMintFeeRate);
     }
 
-    function setBtcRedeemFeeRate(uint256 newBtcRedeemFeeRate) external onlyAdmin {
+    function setBtcRedeemFeeRate(
+        uint256 newBtcRedeemFeeRate
+    ) external onlyAdmin {
         btcRedeemFeeRate = newBtcRedeemFeeRate;
         emit SetBtcRedeemFeeRate(newBtcRedeemFeeRate);
     }
 
-    function setBtcFeeRecipient(string calldata btcFeeRecipientToSet) external onlyAdmin {
+    function setBtcFeeRecipient(
+        string calldata btcFeeRecipientToSet
+    ) external onlyAdmin {
         btcFeeRecipient = btcFeeRecipientToSet;
         emit SetBtcFeeRecipient(btcFeeRecipient);
     }
@@ -607,30 +645,42 @@ contract DLCManager is Initializable, AccessControlDefaultAdminRulesUpgradeable,
         dlc.btcFeeRecipient = btcFeeRecipientToSet;
     }
 
-    function setWhitelistingEnabled(bool isWhitelistingEnabled) external onlyAdmin {
+    function setWhitelistingEnabled(
+        bool isWhitelistingEnabled
+    ) external onlyAdmin {
         whitelistingEnabled = isWhitelistingEnabled;
         emit SetWhitelistingEnabled(isWhitelistingEnabled);
     }
 
-    function transferTokenContractOwnership(address newOwner) external onlyAdmin {
+    function transferTokenContractOwnership(
+        address newOwner
+    ) external onlyAdmin {
         dlcBTC.transferOwnership(newOwner);
         emit TransferTokenContractOwnership(newOwner);
     }
 
-    function setMinterOnTokenContract(address minter) external onlyAdmin {
+    function setMinterOnTokenContract(
+        address minter
+    ) external onlyAdmin {
         dlcBTC.setMinter(minter);
     }
 
-    function setBurnerOnTokenContract(address burner) external onlyAdmin {
+    function setBurnerOnTokenContract(
+        address burner
+    ) external onlyAdmin {
         dlcBTC.setBurner(burner);
     }
 
-    function setPorEnabled(bool enabled) external onlyAdmin {
+    function setPorEnabled(
+        bool enabled
+    ) external onlyAdmin {
         porEnabled = enabled;
         emit SetPorEnabled(enabled);
     }
 
-    function setDlcBTCPoRFeed(AggregatorV3Interface feed) external onlyAdmin {
+    function setDlcBTCPoRFeed(
+        AggregatorV3Interface feed
+    ) external onlyAdmin {
         dlcBTCPoRFeed = feed;
         emit SetDlcBTCPoRFeed(feed);
     }

diff --git a/src/dlc-core/IBTC.sol b/src/dlc-core/IBTC.sol
@@ -85,16 +85,22 @@ contract IBTC is Initializable, ERC20Upgradeable, ERC20PermitUpgradeable, Ownabl
         _burn(from, amount);
     }
 
-    function burn(uint256 amount) external onlyCCIPBurner {
+    function burn(
+        uint256 amount
+    ) external onlyCCIPBurner {
         _burn(msg.sender, amount);
     }
 
-    function setMinter(address minter) external onlyOwner {
+    function setMinter(
+        address minter
+    ) external onlyOwner {
         _minter = minter;
         emit MinterSet(minter);
     }
 
-    function setBurner(address burner) external onlyOwner {
+    function setBurner(
+        address burner
+    ) external onlyOwner {
         _burner = burner;
         emit BurnerSet(burner);
     }

diff --git a/src/iBTC_Burner.sol b/src/iBTC_Burner.sol
@@ -30,7 +30,9 @@ contract iBTC_Burner is UintRequests, IiBTC_Burner, IERC721Receiver {
      * This function triggers a withdrawal by creating one or more withdrawal requests.
      * It splits the total collateral balance into multiple requests based on the maximum withdrawal limit.
      */
-    function triggerWithdrawal(uint256 maxRequests) external returns (uint256 firstRequestId, uint256 lastRequestId) {
+    function triggerWithdrawal(
+        uint256 maxRequests
+    ) external returns (uint256 firstRequestId, uint256 lastRequestId) {
         // Get the current balance of the COLLATERAL token held by this contract
         uint256 amount = IERC20(Collateral).balanceOf(address(this));
 

diff --git a/src/iBTC_NetworkMiddleware.sol b/src/iBTC_NetworkMiddleware.sol
@@ -66,7 +66,9 @@ 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);
         }
@@ -96,11 +98,15 @@ contract NetworkMiddleware is SimpleKeyRegistry32, Ownable {
         SLASHING_WINDOW = _slashingWindow;
     }
 
-    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;
     }
 
@@ -135,15 +141,21 @@ 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()) {
@@ -153,7 +165,9 @@ 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();
         }
@@ -177,15 +191,21 @@ 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()) {
@@ -217,14 +237,18 @@ 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());
@@ -291,7 +315,9 @@ 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)
@@ -321,7 +347,9 @@ 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)