Upgrade modules and wallet contracts to solidity 0.6.10

.circleci/config.yml

@@ -43,6 +43,9 @@ jobs:
       - run:
           name: "Compiling external library contracts"
           command: npm run compile:lib
+      - run:
+          name: "Compiling legacy contracts"
+          command: npm run compile:legacy
       - run:
           name: "Compiling contracts"
           command: npm run compile

.gitignore

@@ -1,5 +1,6 @@
 node_modules
 build
+build-legacy
 tmp
 bin
 .outputParameter

.soliumignore

@@ -3,4 +3,6 @@ migrations
 openzeppelin-solidity
 lib
 contracts-test
-contracts/legacy/LegacyBaseWallet.sol
+contracts-legacy
+contracts/modules
+contracts/wallet

contracts-legacy/v1.3.0/BaseModule.sol

@@ -0,0 +1,158 @@
+// Copyright (C) 2018  Argent Labs Ltd. <https://argent.xyz>
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pragma solidity ^0.5.4;
+import "./SafeMath.sol";
+import "./BaseWallet.sol";
+import "../../contracts/infrastructure/ModuleRegistry.sol";
+import "./GuardianStorage.sol";
+import "./Module.sol";
+
+/**
+ * @title BaseModule
+ * @dev Basic module that contains some methods common to all modules.
+ * @author Julien Niset - <julien@argent.im>
+ */
+contract BaseModule is Module {
+
+    // Empty calldata
+    bytes constant internal EMPTY_BYTES = "";
+
+    // The adddress of the module registry.
+    ModuleRegistry internal registry;
+    // The address of the Guardian storage
+    GuardianStorage internal guardianStorage;
+
+    /**
+     * @dev Throws if the wallet is locked.
+     */
+    modifier onlyWhenUnlocked(BaseWallet _wallet) {
+        verifyUnlocked(_wallet);
+        _;
+    }
+
+    event ModuleCreated(bytes32 name);
+    event ModuleInitialised(address wallet);
+
+    constructor(ModuleRegistry _registry, GuardianStorage _guardianStorage, bytes32 _name) public {
+        registry = _registry;
+        guardianStorage = _guardianStorage;
+        emit ModuleCreated(_name);
+    }
+
+    /**
+     * @dev Throws if the sender is not the target wallet of the call.
+     */
+    modifier onlyWallet(BaseWallet _wallet) {
+        require(msg.sender == address(_wallet), "BM: caller must be wallet");
+        _;
+    }
+
+    /**
+     * @dev Throws if the sender is not the owner of the target wallet or the module itself.
+     */
+    modifier onlyWalletOwner(BaseWallet _wallet) {
+        // Wrapping in an internal method reduces deployment cost by avoiding duplication of inlined code
+        verifyWalletOwner(_wallet);
+        _;
+    }
+
+    /**
+     * @dev Throws if the sender is not the owner of the target wallet.
+     */
+    modifier strictOnlyWalletOwner(BaseWallet _wallet) {
+        require(isOwner(_wallet, msg.sender), "BM: msg.sender must be an owner for the wallet");
+        _;
+    }
+
+    /**
+     * @dev Inits the module for a wallet by logging an event.
+     * The method can only be called by the wallet itself.
+     * @param _wallet The wallet.
+     */
+    function init(BaseWallet _wallet) public onlyWallet(_wallet) {
+        emit ModuleInitialised(address(_wallet));
+    }
+
+    /**
+     * @dev Adds a module to a wallet. First checks that the module is registered.
+     * @param _wallet The target wallet.
+     * @param _module The modules to authorise.
+     */
+    function addModule(BaseWallet _wallet, Module _module) external strictOnlyWalletOwner(_wallet) {
+        require(registry.isRegisteredModule(address(_module)), "BM: module is not registered");
+        _wallet.authoriseModule(address(_module), true);
+    }
+
+    /**
+    * @dev Utility method enbaling anyone to recover ERC20 token sent to the
+    * module by mistake and transfer them to the Module Registry.
+    * @param _token The token to recover.
+    */
+    function recoverToken(address _token) external {
+        uint total = ERC20(_token).balanceOf(address(this));
+        bool success = ERC20(_token).transfer(address(registry), total);
+        require(success, "BM: recover token transfer failed");
+    }
+
+    /**
+     * @dev Verify that the wallet is unlocked.
+     * @param _wallet The target wallet.
+     */
+    function verifyUnlocked(BaseWallet _wallet) internal view {
+        require(!guardianStorage.isLocked(_wallet), "BM: wallet locked");
+    }
+
+     /**
+     * @dev Verify that the caller is the module or the wallet owner.
+     * @param _wallet The target wallet.
+     */
+    function verifyWalletOwner(BaseWallet _wallet) internal view {
+        require(msg.sender == address(this) || isOwner(_wallet, msg.sender), "BM: must be wallet owner");
+    }
+
+    /**
+     * @dev Helper method to check if an address is the owner of a target wallet.
+     * @param _wallet The target wallet.
+     * @param _addr The address.
+     */
+    function isOwner(BaseWallet _wallet, address _addr) internal view returns (bool) {
+        return _wallet.owner() == _addr;
+    }
+
+    /**
+     * @dev Helper method to invoke a wallet.
+     * @param _wallet The target wallet.
+     * @param _to The target address for the transaction.
+     * @param _value The value of the transaction.
+     * @param _data The data of the transaction.
+     */
+    function invokeWallet(address _wallet, address _to, uint256 _value, bytes memory _data) internal returns (bytes memory _res) {
+        bool success;
+        // solium-disable-next-line security/no-call-value
+        (success, _res) = _wallet.call(abi.encodeWithSignature("invoke(address,uint256,bytes)", _to, _value, _data));
+        if (success && _res.length > 0) { //_res is empty if _wallet is an "old" BaseWallet that can't return output values
+            (_res) = abi.decode(_res, (bytes));
+        } else if (_res.length > 0) {
+            // solium-disable-next-line security/no-inline-assembly
+            assembly {
+                returndatacopy(0, 0, returndatasize)
+                revert(0, returndatasize)
+            }
+        } else if (!success) {
+            revert("BM: wallet invoke reverted");
+        }
+    }
+}

contracts/legacy/LegacyBaseWallet.sol → contracts-legacy/v1.3.0/BaseWallet.sol

@@ -1,36 +1,14 @@
 pragma solidity ^0.5.4;
 
+import "./Module.sol";
+
 /**
- * @title LegacyBaseWallet
+ * @title BaseWallet
  * @dev Simple modular wallet that authorises modules to call its invoke() method.
  * Based on https://gist.github.com/Arachnid/a619d31f6d32757a4328a428286da186 by
  * @author Julien Niset - <julien@argent.im>
  */
-
- interface LegacyModule {
-
-    /**
-     * @dev Inits a module for a wallet by e.g. setting some wallet specific parameters in storage.
-     * @param _wallet The wallet.
-     */
-    function init(LegacyBaseWallet _wallet) external;
-
-    /**
-     * @dev Adds a module to a wallet.
-     * @param _wallet The target wallet.
-     * @param _module The modules to authorise.
-     */
-    function addModule(LegacyBaseWallet _wallet, LegacyModule _module) external;
-
-    /**
-    * @dev Utility method to recover any ERC20 token that was sent to the
-    * module by mistake. 
-    * @param _token The token to recover.
-    */
-    function recoverToken(address _token) external;
-}
-
-contract LegacyBaseWallet {
+contract BaseWallet {
 
     // The implementation of the proxy
     address public implementation;
@@ -70,7 +48,7 @@ contract LegacyBaseWallet {
         for(uint256 i = 0; i < _modules.length; i++) {
             require(authorised[_modules[i]] == false, "BW: module is already added");
             authorised[_modules[i]] = true;
-            LegacyModule(_modules[i]).init(this);
+            Module(_modules[i]).init(this);
             emit AuthorisedModule(_modules[i], true);
         }
     }
@@ -85,7 +63,7 @@ contract LegacyBaseWallet {
             if(_value == true) {
                 modules += 1;
                 authorised[_module] = true;
-                LegacyModule(_module).init(this);
+                Module(_module).init(this);
             }
             else {
                 modules -= 1;

contracts-legacy/v1.3.0/ERC20.sol

@@ -0,0 +1,14 @@
+pragma solidity ^0.5.4;
+
+/**
+ * ERC20 contract interface.
+ */
+contract ERC20 {
+    function totalSupply() public view returns (uint);
+    function decimals() public view returns (uint);
+    function balanceOf(address tokenOwner) public view returns (uint balance);
+    function allowance(address tokenOwner, address spender) public view returns (uint remaining);
+    function transfer(address to, uint tokens) public returns (bool success);
+    function approve(address spender, uint tokens) public returns (bool success);
+    function transferFrom(address from, address to, uint tokens) public returns (bool success);
+}

contracts/modules/storage/GuardianStorage.sol → contracts-legacy/v1.3.0/GuardianStorage.sol

@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../wallet/BaseWallet.sol";
+import "./BaseWallet.sol";
 import "./Storage.sol";
 import "./IGuardianStorage.sol";
 

contracts-legacy/v1.3.0/GuardianUtils.sol

@@ -0,0 +1,88 @@
+// Copyright (C) 2018  Argent Labs Ltd. <https://argent.xyz>
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pragma solidity ^0.5.4;
+
+library GuardianUtils {
+
+    /**
+    * @dev Checks if an address is an account guardian or an account authorised to sign on behalf of a smart-contract guardian
+    * given a list of guardians.
+    * @param _guardians the list of guardians
+    * @param _guardian the address to test
+    * @return true and the list of guardians minus the found guardian upon success, false and the original list of guardians if not found.
+    */
+    function isGuardian(address[] memory _guardians, address _guardian) internal view returns (bool, address[] memory) {
+        if (_guardians.length == 0 || _guardian == address(0)) {
+            return (false, _guardians);
+        }
+        bool isFound = false;
+        address[] memory updatedGuardians = new address[](_guardians.length - 1);
+        uint256 index = 0;
+        for (uint256 i = 0; i < _guardians.length; i++) {
+            if (!isFound) {
+                // check if _guardian is an account guardian
+                if (_guardian == _guardians[i]) {
+                    isFound = true;
+                    continue;
+                }
+                // check if _guardian is the owner of a smart contract guardian
+                if (isContract(_guardians[i]) && isGuardianOwner(_guardians[i], _guardian)) {
+                    isFound = true;
+                    continue;
+                }
+            }
+            if (index < updatedGuardians.length) {
+                updatedGuardians[index] = _guardians[i];
+                index++;
+            }
+        }
+        return isFound ? (true, updatedGuardians) : (false, _guardians);
+    }
+
+   /**
+    * @dev Checks if an address is a contract.
+    * @param _addr The address.
+    */
+    function isContract(address _addr) internal view returns (bool) {
+        uint32 size;
+        // solium-disable-next-line security/no-inline-assembly
+        assembly {
+            size := extcodesize(_addr)
+        }
+        return (size > 0);
+    }
+
+    /**
+    * @dev Checks if an address is the owner of a guardian contract.
+    * The method does not revert if the call to the owner() method consumes more then 5000 gas.
+    * @param _guardian The guardian contract
+    * @param _owner The owner to verify.
+    */
+    function isGuardianOwner(address _guardian, address _owner) internal view returns (bool) {
+        address owner = address(0);
+        bytes4 sig = bytes4(keccak256("owner()"));
+        // solium-disable-next-line security/no-inline-assembly
+        assembly {
+            let ptr := mload(0x40)
+            mstore(ptr,sig)
+            let result := staticcall(5000, _guardian, ptr, 0x20, ptr, 0x20)
+            if eq(result, 1) {
+                owner := mload(ptr)
+            }
+        }
+        return owner == _owner;
+    }
+}

contracts/modules/storage/IGuardianStorage.sol → contracts-legacy/v1.3.0/IGuardianStorage.sol

@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../wallet/BaseWallet.sol";
+import "./BaseWallet.sol";
 
 interface IGuardianStorage{
 

contracts/modules/common/Module.sol → contracts-legacy/v1.3.0/Module.sol

@@ -14,7 +14,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 pragma solidity ^0.5.4;
-import "../../wallet/BaseWallet.sol";
+import "./BaseWallet.sol";
 
 /**
  * @title Module