style: include automatically formatted solidity files

rsksmart · Nov 23, 2022 · 76ee863 · 76ee863
1 parent f846647
commit 76ee863
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 159 deletions.
diff --git a/contracts/Collector.sol b/contracts/Collector.sol
@@ -54,12 +54,9 @@ contract Collector is ICollector {
         return _partners;
     }
 
-    function updateShares(RevenuePartner[] memory partners)
-        external
-        validShares(partners)
-        onlyOwner
-        noBalanceToShare
-    {
+    function updateShares(
+        RevenuePartner[] memory partners
+    ) external validShares(partners) onlyOwner noBalanceToShare {
         delete _partners;
 
         for (uint256 i = 0; i < partners.length; i++)
@@ -68,11 +65,9 @@ contract Collector is ICollector {
 
     //@notice Withdraw the actual remainder and then update the remainder's address
     //for a new one. This function is the only way to withdraw the remainder.
-    function updateRemainderAddress(address remainderAddress)
-        external
-        onlyOwner
-        noBalanceToShare
-    {
+    function updateRemainderAddress(
+        address remainderAddress
+    ) external onlyOwner noBalanceToShare {
         uint256 balance = token.balanceOf(address(this));
 
         if (balance != 0) {

diff --git a/contracts/Penalizer.sol b/contracts/Penalizer.sol
@@ -17,11 +17,9 @@ contract Penalizer is IPenalizer {
 
     using ECDSA for bytes32;
 
-    function _decodeTransaction(bytes memory rawTransaction)
-        private
-        pure
-        returns (Transaction memory transaction)
-    {
+    function _decodeTransaction(
+        bytes memory rawTransaction
+    ) private pure returns (Transaction memory transaction) {
         (
             transaction.nonce,
             transaction.gasPrice,

diff --git a/contracts/RelayHub.sol b/contracts/RelayHub.sol
@@ -68,10 +68,9 @@ contract RelayHub is IRelayHub {
         emit RelayServerRegistered(msg.sender, url);
     }
 
-    function disableRelayWorkers(address[] calldata relayWorkers)
-        external
-        override
-    {
+    function disableRelayWorkers(
+        address[] calldata relayWorkers
+    ) external override {
         //relay manager is msg.sender
         uint256 actualWorkerCount = workerCount[msg.sender];
         require(
@@ -107,10 +106,9 @@ contract RelayHub is IRelayHub {
     /**
     New relay worker addresses can be added (as enabled workers) as long as they don't have a relay manager aldeady assigned.
      */
-    function addRelayWorkers(address[] calldata newRelayWorkers)
-        external
-        override
-    {
+    function addRelayWorkers(
+        address[] calldata newRelayWorkers
+    ) external override {
         address relayManager = msg.sender;
         workerCount[relayManager] =
             workerCount[relayManager] +
@@ -245,11 +243,10 @@ contract RelayHub is IRelayHub {
     /// Slash the stake of the relay relayManager. In order to prevent stake kidnapping, burns half of stake on the way.
     /// @param relayWorker - worker whose manager will be penalized
     /// @param beneficiary - address that receives half of the penalty amount
-    function penalize(address relayWorker, address payable beneficiary)
-        external
-        override
-        penalizerOnly
-    {
+    function penalize(
+        address relayWorker,
+        address payable beneficiary
+    ) external override penalizerOnly {
         //Relay worker might be enabled or disabled
         address relayManager = address(
             uint160(uint256(workerToManager[relayWorker] >> 4))
@@ -277,7 +274,9 @@ contract RelayHub is IRelayHub {
         emit StakePenalized(relayManager, beneficiary, reward);
     }
 
-    function getRelayInfo(address relayManager)
+    function getRelayInfo(
+        address relayManager
+    )
         external
         view
         override
@@ -286,12 +285,9 @@ contract RelayHub is IRelayHub {
         return relayData[relayManager];
     }
 
-    function getStakeInfo(address relayManager)
-        external
-        view
-        override
-        returns (StakeInfo memory stakeInfo)
-    {
+    function getStakeInfo(
+        address relayManager
+    ) external view override returns (StakeInfo memory stakeInfo) {
         return stakes[relayManager];
     }
 
@@ -300,11 +296,10 @@ contract RelayHub is IRelayHub {
     // If the entry already exists, only the owner can call this function.
     // @param relayManager - address that represents a stake entry and controls relay registrations on relay hubs
     // @param unstakeDelay - number of blocks to elapse before the owner can retrieve the stake after calling 'unlock'
-    function stakeForAddress(address relayManager, uint256 unstakeDelay)
-        external
-        payable
-        override
-    {
+    function stakeForAddress(
+        address relayManager,
+        uint256 unstakeDelay
+    ) external payable override {
         StakeInfo storage stakeInfo = stakes[relayManager];
 
         require(
@@ -385,12 +380,9 @@ contract RelayHub is IRelayHub {
         );
     }
 
-    function isRelayManagerStaked(address relayManager)
-        external
-        view
-        override
-        returns (bool)
-    {
+    function isRelayManagerStaked(
+        address relayManager
+    ) external view override returns (bool) {
         StakeInfo storage info = stakes[relayManager];
         return
             info.stake >= minimumStake && //isAmountSufficient

diff --git a/contracts/interfaces/IForwarder.sol b/contracts/interfaces/IForwarder.sol
@@ -61,8 +61,8 @@ interface IForwarder {
         bytes calldata signature
     ) external payable returns (bool success, bytes memory ret);
 
-    function directExecute(address to, bytes calldata data)
-        external
-        payable
-        returns (bool success, bytes memory ret);
+    function directExecute(
+        address to,
+        bytes calldata data
+    ) external payable returns (bool success, bytes memory ret);
 }
diff --git a/contracts/interfaces/IRelayHub.sol b/contracts/interfaces/IRelayHub.sol
@@ -84,8 +84,10 @@ interface IRelayHub {
         bytes calldata signature
     ) external;
 
-    function penalize(address relayWorker, address payable beneficiary)
-        external;
+    function penalize(
+        address relayWorker,
+        address payable beneficiary
+    ) external;
 
     /* getters */
     function penalizer() external view returns (address);
@@ -103,16 +105,14 @@ interface IRelayHub {
 
     function workerCount(address manager) external view returns (uint256);
 
-    function isRelayManagerStaked(address relayManager)
-        external
-        view
-        returns (bool);
+    function isRelayManagerStaked(
+        address relayManager
+    ) external view returns (bool);
 
     // get the relay info from the manager address
-    function getRelayInfo(address relayManager)
-        external
-        view
-        returns (RelayManagerData memory relayManagerData);
+    function getRelayInfo(
+        address relayManager
+    ) external view returns (RelayManagerData memory relayManagerData);
 
     // Represents the relay data for a particular relay manager
     struct RelayManagerData {
@@ -169,18 +169,18 @@ interface IRelayHub {
     // If the entry already exists, only the owner can call this function.
     // @param relayManager - address that represents a stake entry and controls relay registrations on relay hubs
     // @param unstakeDelay - number of blocks to elapse before the owner can retrieve the stake after calling 'unlock'
-    function stakeForAddress(address relayManager, uint256 unstakeDelay)
-        external
-        payable;
+    function stakeForAddress(
+        address relayManager,
+        uint256 unstakeDelay
+    ) external payable;
 
     function unlockStake(address relayManager) external;
 
     function withdrawStake(address relayManager) external;
 
-    function getStakeInfo(address relayManager)
-        external
-        view
-        returns (StakeInfo memory stakeInfo);
+    function getStakeInfo(
+        address relayManager
+    ) external view returns (StakeInfo memory stakeInfo);
 
     //For initial stakes, this is the minimum stake value allowed for taking ownership of this address' stake
     function minimumEntryDepositValue() external view returns (uint256);

diff --git a/contracts/interfaces/IWalletCustomLogic.sol b/contracts/interfaces/IWalletCustomLogic.sol
@@ -30,8 +30,8 @@ interface IWalletCustomLogic {
      * @param to Target contract address
      * @param data Destination function
      */
-    function directExecute(address to, bytes calldata data)
-        external
-        payable
-        returns (bytes memory ret);
+    function directExecute(
+        address to,
+        bytes calldata data
+    ) external payable returns (bytes memory ret);
 }
diff --git a/contracts/smartwallet/CustomSmartWallet.sol b/contracts/smartwallet/CustomSmartWallet.sol
@@ -119,12 +119,10 @@ contract CustomSmartWallet is IForwarder {
         }
     }
 
-    function directExecute(address to, bytes calldata data)
-        external
-        payable
-        override
-        returns (bool success, bytes memory ret)
-    {
+    function directExecute(
+        address to,
+        bytes calldata data
+    ) external payable override returns (bool success, bytes memory ret) {
         //Verify Owner
         require(
             _getOwner() == keccak256(abi.encodePacked(msg.sender)),
@@ -254,11 +252,10 @@ contract CustomSmartWallet is IForwarder {
         );
     }
 
-    function _getEncoded(bytes32 suffixData, ForwardRequest memory req)
-        private
-        pure
-        returns (bytes memory)
-    {
+    function _getEncoded(
+        bytes32 suffixData,
+        ForwardRequest memory req
+    ) private pure returns (bytes memory) {
         return
             abi.encodePacked(
                 keccak256(

diff --git a/contracts/smartwallet/SmartWallet.sol b/contracts/smartwallet/SmartWallet.sol
@@ -111,12 +111,10 @@ contract SmartWallet is IForwarder {
         }
     }
 
-    function directExecute(address to, bytes calldata data)
-        external
-        payable
-        override
-        returns (bool success, bytes memory ret)
-    {
+    function directExecute(
+        address to,
+        bytes calldata data
+    ) external payable override returns (bool success, bytes memory ret) {
         //Verify Owner
         require(
             _getOwner() == keccak256(abi.encodePacked(msg.sender)),
@@ -215,11 +213,10 @@ contract SmartWallet is IForwarder {
         );
     }
 
-    function _getEncoded(bytes32 suffixData, ForwardRequest memory req)
-        private
-        pure
-        returns (bytes memory)
-    {
+    function _getEncoded(
+        bytes32 suffixData,
+        ForwardRequest memory req
+    ) private pure returns (bytes memory) {
         return
             abi.encodePacked(
                 keccak256(

diff --git a/contracts/utils/Eip712Library.sol b/contracts/utils/Eip712Library.sol
@@ -40,11 +40,7 @@ library Eip712Library {
         bytes calldata signature
     )
         internal
-        returns (
-            bool forwarderSuccess,
-            bool relaySuccess,
-            bytes memory ret
-        )
+        returns (bool forwarderSuccess, bool relaySuccess, bytes memory ret)
     {
         /* solhint-disable-next-line avoid-low-level-calls */
         (forwarderSuccess, ret) = relayRequest.relayData.callForwarder.call(
@@ -64,11 +60,9 @@ library Eip712Library {
         MinLibBytes.truncateInPlace(ret, 1024); // maximum length of return value/revert reason for 'execute' method. Will truncate result if exceeded.
     }
 
-    function hashRelayData(EnvelopingTypes.RelayData calldata req)
-        internal
-        pure
-        returns (bytes32)
-    {
+    function hashRelayData(
+        EnvelopingTypes.RelayData calldata req
+    ) internal pure returns (bytes32) {
         return
             keccak256(
                 abi.encode(

diff --git a/contracts/utils/MinLibBytes.sol b/contracts/utils/MinLibBytes.sol
@@ -20,11 +20,10 @@ library MinLibBytes {
     /// @param b Byte array containing an address.
     /// @param index Index in byte array of address.
     /// @return result address from byte array.
-    function readAddress(bytes memory b, uint256 index)
-        internal
-        pure
-        returns (address result)
-    {
+    function readAddress(
+        bytes memory b,
+        uint256 index
+    ) internal pure returns (address result) {
         require(b.length >= index + 20, "readAddress: data too short");
 
         // Add offset to index:
@@ -45,11 +44,10 @@ library MinLibBytes {
         return result;
     }
 
-    function readBytes32(bytes memory b, uint256 index)
-        internal
-        pure
-        returns (bytes32 result)
-    {
+    function readBytes32(
+        bytes memory b,
+        uint256 index
+    ) internal pure returns (bytes32 result) {
         require(b.length >= index + 32, "readBytes32: data too short");
 
         // Read the bytes32 from array memory
@@ -63,20 +61,18 @@ library MinLibBytes {
     /// @param b Byte array containing a uint256 value.
     /// @param index Index in byte array of uint256 value.
     /// @return result uint256 value from byte array.
-    function readUint256(bytes memory b, uint256 index)
-        internal
-        pure
-        returns (uint256 result)
-    {
+    function readUint256(
+        bytes memory b,
+        uint256 index
+    ) internal pure returns (uint256 result) {
         result = uint256(readBytes32(b, index));
         return result;
     }
 
-    function readBytes4(bytes memory b, uint256 index)
-        internal
-        pure
-        returns (bytes4 result)
-    {
+    function readBytes4(
+        bytes memory b,
+        uint256 index
+    ) internal pure returns (bytes4 result) {
         require(b.length >= index + 4, "readBytes4: data too short");
 
         // Read the bytes4 from array memory