Implement #13: EIP-897 interface on Proxy

safe-global · Apr 16, 2018 · cd5f25c · cd5f25c
1 parent b14eb2c
commit cd5f25c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 29 deletions.
diff --git a/contracts/GnosisSafe.sol b/contracts/GnosisSafe.sol
@@ -13,7 +13,7 @@ contract GnosisSafe {
 
     // masterCopy always needs to be first declared variable, to ensure that it is at the same location as in the Proxy contract.
     // It should also always be ensured that the address is stored alone (uses a full word)
-    GnosisSafe public masterCopy;
+    GnosisSafe masterCopy;
 
     uint256 public nonce;
     uint8 public threshold;

diff --git a/contracts/Proxy.sol b/contracts/Proxy.sol
@@ -6,7 +6,7 @@ pragma solidity 0.4.21;
 contract Proxy {
 
     // masterCopy always needs to be first declared variable, to ensure that it is at the same location in the contracts to which calls are delegated.
-    address public masterCopy;
+    address masterCopy;
 
     /// @dev Constructor function sets address of master copy contract.
     /// @param _masterCopy Master copy address.
@@ -32,4 +32,20 @@ contract Proxy {
             default { return(0, returndatasize()) }
         }
     }
+
+    function implementation()
+        public
+        view
+        returns (address)
+    {
+        return masterCopy;
+    }
+
+    function proxyType()
+        public
+        pure
+        returns (uint256)
+    {
+        return 2;
+    }
 }
diff --git a/contracts/extensions/DailyLimitExtension.sol b/contracts/extensions/DailyLimitExtension.sol
@@ -28,16 +28,6 @@ contract DailyLimitExtension is Extension {
         _;
     }
 
-    /// @dev Constructor function triggers setup function.
-    /// @param tokens List of token addresses. Ether is represented with address 0x0.
-    /// @param _dailyLimits List of daily limits in smallest unit (e.g. Wei for Ether).
-    ///        First entry of array corresponds to first entry in token address array.
-    function DailyLimitExtension(address[] tokens, uint256[] _dailyLimits)
-        public
-    {
-        setup(tokens, _dailyLimits);
-    }
-
     /// @dev Setup function sets initial storage of contract.
     /// @param tokens List of token addresses. Ether is represented with address 0x0.
     /// @param _dailyLimits List of daily limits in smalles units (e.g. Wei for Ether).

diff --git a/contracts/extensions/SocialRecoveryExtension.sol b/contracts/extensions/SocialRecoveryExtension.sol
@@ -33,15 +33,6 @@ contract SocialRecoveryExtension is Extension {
         _;
     }
 
-    /// @dev Constructor function triggers setup function.
-    /// @param _friends List of friends' addresses.
-    /// @param _threshold Required number of friends to confirm replacement.
-    function SocialRecoveryExtension(address[] _friends, uint8 _threshold)
-        public
-    {
-        setup(_friends, _threshold);
-    }
-
     /// @dev Setup function sets initial storage of contract.
     /// @param _friends List of friends' addresses.
     /// @param _threshold Required number of friends to confirm replacement.

diff --git a/contracts/extensions/WhitelistExtension.sol b/contracts/extensions/WhitelistExtension.sol
@@ -21,14 +21,6 @@ contract WhitelistExtension is Extension {
         _;
     }
 
-    /// @dev Constructor function triggers setup function.
-    /// @param accounts List of whitelisted accounts.
-    function WhitelistExtension(address[] accounts)
-        public
-    {
-        setup(accounts);
-    }
-
     /// @dev Setup function sets initial storage of contract.
     /// @param accounts List of whitelisted accounts.
     function setup(address[] accounts)