Closes #223 remove unnecessary code (#275)

Author: rmeissner

.github/workflows/ci.yml

@@ -22,6 +22,16 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
   benchmarks:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        solidity: ["0.7.6", "0.8.2"]
+        include:
+        - solidity: "0.8.2"
+          settings: '{"viaIR":true,"optimizer":{"enabled":true,"runs":10000}}'
+    env:
+      SOLIDITY_VERSION: ${{ matrix.solidity }}
+      SOLIDITY_SETTINGS: ${{ matrix.settings }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -33,4 +43,5 @@ jobs:
           key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
       - run: yarn
       - run: yarn build
+      - run: yarn hardhat codesize --contractname GnosisSafe
       - run: yarn benchmark

contracts/GnosisSafe.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 import "./base/ModuleManager.sol";
 import "./base/OwnerManager.sol";
 import "./base/FallbackManager.sol";
 import "./common/EtherPaymentFallback.sol";
-import "./common/MasterCopy.sol";
+import "./common/Singleton.sol";
 import "./common/SignatureDecoder.sol";
 import "./common/SecuredTokenTransfer.sol";
 import "./common/StorageAccessible.sol";
@@ -16,7 +16,7 @@ import "./external/GnosisSafeMath.sol";
 /// @author Stefan George - <stefan@gnosis.io>
 /// @author Richard Meissner - <richard@gnosis.io>
 contract GnosisSafe
-    is EtherPaymentFallback, MasterCopy, ModuleManager, OwnerManager, SignatureDecoder, SecuredTokenTransfer, ISignatureValidatorConstants, FallbackManager, StorageAccessible {
+    is EtherPaymentFallback, Singleton, ModuleManager, OwnerManager, SignatureDecoder, SecuredTokenTransfer, ISignatureValidatorConstants, FallbackManager, StorageAccessible {
 
     using GnosisSafeMath for uint256;
 
@@ -63,7 +63,7 @@ contract GnosisSafe
     constructor() {
         // By setting the threshold it is not possible to call setup anymore,
         // so we create a Safe with 0 owners and threshold 1.
-        // This is an unusable Safe, perfect for the mastercopy
+        // This is an unusable Safe, perfect for the singleton
         threshold = 1;
     }
 
@@ -116,16 +116,16 @@ contract GnosisSafe
     function execTransaction(
         address to,
         uint256 value,
-        bytes calldata data,
+        bytes memory data,
         Enum.Operation operation,
         uint256 safeTxGas,
         uint256 baseGas,
         uint256 gasPrice,
         address gasToken,
         address payable refundReceiver,
-        bytes calldata signatures
+        bytes memory signatures
     )
-        external
+        public
         payable
         returns (bool success)
     {
@@ -307,29 +307,6 @@ contract GnosisSafe
         signedMessages[msgHash] = 1;
         emit SignMsg(msgHash);
     }
-
-    /**
-    * Implementation of ISignatureValidator (see `interfaces/ISignatureValidator.sol`)
-    * @dev Should return whether the signature provided is valid for the provided data.
-    *       The save does not implement the interface since `checkSignatures` is not a view method.
-    *       The method will not perform any state changes (see parameters of `checkSignatures`)
-    * @param _data Arbitrary length data signed on the behalf of address(this)
-    * @param _signature Signature byte array associated with _data
-    * @return a bool upon valid or invalid signature with corresponding _data
-    */
-    function isValidSignature(bytes calldata _data, bytes calldata _signature)
-        external
-        view
-        returns (bytes4)
-    {
-        bytes32 messageHash = getMessageHash(_data);
-        if (_signature.length == 0) {
-            require(signedMessages[messageHash] != 0, "Hash not approved");
-        } else {
-            checkSignatures(messageHash, _data, _signature);
-        }
-        return EIP1271_MAGIC_VALUE;
-    }
 
     /// @dev Returns the chain id used by this contract.
     function getChainId() public view returns (uint256) {

contracts/accessors/SimulateTxAccessor.sol

@@ -1,4 +1,4 @@
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 import "../base/Executor.sol";
 

contracts/base/Executor.sol

@@ -1,41 +1,42 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 import "../common/Enum.sol";
 
-
 /// @title Executor - A contract that can execute transactions
 /// @author Richard Meissner - <richard@gnosis.pm>
 contract Executor {
-
-    function execute(address to, uint256 value, bytes memory data, Enum.Operation operation, uint256 txGas)
-        internal
-        returns (bool success)
-    {
-        if (operation == Enum.Operation.Call)
-            success = executeCall(to, value, data, txGas);
-        else if (operation == Enum.Operation.DelegateCall)
-            success = executeDelegateCall(to, data, txGas);
-        else
-            success = false;
-    }
-
-    function executeCall(address to, uint256 value, bytes memory data, uint256 txGas)
-        internal
-        returns (bool success)
-    {
-        // solium-disable-next-line security/no-inline-assembly
-        assembly {
-            success := call(txGas, to, value, add(data, 0x20), mload(data), 0, 0)
-        }
-    }
-
-    function executeDelegateCall(address to, bytes memory data, uint256 txGas)
-        internal
-        returns (bool success)
-    {
-        // solium-disable-next-line security/no-inline-assembly
-        assembly {
-            success := delegatecall(txGas, to, add(data, 0x20), mload(data), 0, 0)
+    function execute(
+        address to,
+        uint256 value,
+        bytes memory data,
+        Enum.Operation operation,
+        uint256 txGas
+    ) internal returns (bool success) {
+        if (operation == Enum.Operation.DelegateCall) {
+            // solium-disable-next-line security/no-inline-assembly
+            assembly {
+                success := delegatecall(
+                    txGas,
+                    to,
+                    add(data, 0x20),
+                    mload(data),
+                    0,
+                    0
+                )
+            }
+        } else {
+            // solium-disable-next-line security/no-inline-assembly
+            assembly {
+                success := call(
+                    txGas,
+                    to,
+                    value,
+                    add(data, 0x20),
+                    mload(data),
+                    0,
+                    0
+                )
+            }
         }
     }
 }

contracts/base/FallbackManager.sol

@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 import "../common/SelfAuthorized.sol";
 
 /// @title Fallback Manager - A contract that manages fallback calls made to this contract
 /// @author Richard Meissner - <richard@gnosis.pm>
 contract FallbackManager is SelfAuthorized {
-
     // keccak256("fallback_manager.handler.address")
-    bytes32 internal constant FALLBACK_HANDLER_STORAGE_SLOT = 0x6c9a6c4a39284e37ed1cf53d337577d14212a4870fb976a4366c693b939918d5;
+    bytes32 internal constant FALLBACK_HANDLER_STORAGE_SLOT =
+        0x6c9a6c4a39284e37ed1cf53d337577d14212a4870fb976a4366c693b939918d5;
 
     function internalSetFallbackHandler(address handler) internal {
         bytes32 slot = FALLBACK_HANDLER_STORAGE_SLOT;
@@ -22,36 +22,37 @@ contract FallbackManager is SelfAuthorized {
     ///      Only fallback calls without value and with data will be forwarded.
     ///      This can only be done via a Safe transaction.
     /// @param handler contract to handle fallbacks calls.
-    function setFallbackHandler(address handler)
-        public
-        authorized
-    {
+    function setFallbackHandler(address handler) public authorized {
         internalSetFallbackHandler(handler);
     }
 
-    fallback()
-        external
-    {
+    fallback() external {
         bytes32 slot = FALLBACK_HANDLER_STORAGE_SLOT;
-        address handler;
         // solium-disable-next-line security/no-inline-assembly
         assembly {
-            handler := sload(slot)
-        }
-
-        if (handler != address(0)) {
-            // solium-disable-next-line security/no-inline-assembly
-            assembly {
-                calldatacopy(0, 0, calldatasize())
-                // The msg.sender address is shifted to the left by 12 bytes to remove the padding
-                // Then the address without padding is stored right after the calldata
-                mstore(calldatasize(), shl(96, caller()))
-                // Add 20 bytes for the address appended add the end
-                let success := call(gas(), handler, 0, 0, add(calldatasize(), 20), 0, 0)
-                returndatacopy(0, 0, returndatasize())
-                if eq(success, 0) { revert(0, returndatasize()) }
-                return(0, returndatasize())
+            let handler := sload(slot)
+            if iszero(handler) {
+                return(0, 0)
+            }
+            calldatacopy(0, 0, calldatasize())
+            // The msg.sender address is shifted to the left by 12 bytes to remove the padding
+            // Then the address without padding is stored right after the calldata
+            mstore(calldatasize(), shl(96, caller()))
+            // Add 20 bytes for the address appended add the end
+            let success := call(
+                gas(),
+                handler,
+                0,
+                0,
+                add(calldatasize(), 20),
+                0,
+                0
+            )
+            returndatacopy(0, 0, returndatasize())
+            if iszero(success) {
+                revert(0, returndatasize())
             }
+            return(0, returndatasize())
         }
     }
-}
+}

contracts/base/ModuleManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 import "../common/Enum.sol";
 import "../common/SelfAuthorized.sol";
 import "./Executor.sol";
@@ -26,7 +26,7 @@ contract ModuleManager is SelfAuthorized, Executor {
         modules[SENTINEL_MODULES] = SENTINEL_MODULES;
         if (to != address(0))
             // Setup has to complete successfully or transaction fails.
-            require(executeDelegateCall(to, data, gasleft()), "Could not finish initialization");
+            require(execute(to, 0, data, Enum.Operation.DelegateCall, gasleft()), "Could not finish initialization");
     }
 
     /// @dev Allows to add a module to the whitelist.
@@ -116,24 +116,13 @@ contract ModuleManager is SelfAuthorized, Executor {
         return SENTINEL_MODULES != module && modules[module] != address(0);
     }
 
-    /// @dev Returns array of first 10 modules.
-    /// @return Array of modules.
-    function getModules()
-        public
-        view
-        returns (address[] memory)
-    {
-        (address[] memory array,) = getModulesPaginated(SENTINEL_MODULES, 10);
-        return array;
-    }
-
     /// @dev Returns array of modules.
     /// @param start Start of the page.
     /// @param pageSize Maximum number of modules that should be returned.
     /// @return array Array of modules.
     /// @return next Start of the next page.
     function getModulesPaginated(address start, uint256 pageSize)
-        public
+        external
         view
         returns (address[] memory array, address next)
     {

contracts/base/OwnerManager.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 import "../common/SelfAuthorized.sol";
 
 /// @title OwnerManager - Manages a set of owners and a threshold to perform actions.

contracts/common/Enum.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 
 /// @title Enum - Collection of enums

contracts/common/EtherPaymentFallback.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.0 <0.8.0;
+pragma solidity >=0.7.0 <0.9.0;
 
 
 /// @title EtherPaymentFallback - A contract that has a fallback to accept ether payments