Merge pull request #126 from gnosis/contract-v1.2.0

Contract v1.2.0

Author: germartinez

contracts/CPKFactory.sol

@@ -1,14 +1,14 @@
 pragma solidity >=0.5.0 <0.7.0;
 
 import { Enum } from "@gnosis.pm/safe-contracts/contracts/common/Enum.sol";
-import { Proxy } from "@gnosis.pm/safe-contracts/contracts/proxies/Proxy.sol";
+import { GnosisSafeProxy } from "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxy.sol";
 import { GnosisSafe } from "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol";
 
 contract CPKFactory {
-    event ProxyCreation(Proxy proxy);
+    event ProxyCreation(GnosisSafeProxy proxy);
 
     function proxyCreationCode() external pure returns (bytes memory) {
-        return type(Proxy).creationCode;
+        return type(GnosisSafeProxy).creationCode;
     }
 
     function createProxyAndExecTransaction(
@@ -24,7 +24,7 @@ contract CPKFactory {
         returns (bool execTransactionSuccess)
     {
         GnosisSafe proxy;
-        bytes memory deploymentData = abi.encodePacked(type(Proxy).creationCode, abi.encode(masterCopy));
+        bytes memory deploymentData = abi.encodePacked(type(GnosisSafeProxy).creationCode, abi.encode(masterCopy));
         bytes32 salt = keccak256(abi.encode(msg.sender, saltNonce));
         // solium-disable-next-line security/no-inline-assembly
         assembly {
@@ -49,6 +49,6 @@ contract CPKFactory {
             abi.encodePacked(uint(address(this)), uint(0), uint8(1))
         );
 
-        emit ProxyCreation(Proxy(address(proxy)));
+        emit ProxyCreation(GnosisSafeProxy(address(proxy)));
    }
 }

contracts/Deps.sol

@@ -1,9 +1,11 @@
 pragma solidity >=0.5.0 <0.7.0;
 
-import { ProxyFactory } from "@gnosis.pm/safe-contracts/contracts/proxies/ProxyFactory.sol";
+import { GnosisSafeProxyFactory } from "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxyFactory.sol";
 import { MultiSend } from "@gnosis.pm/safe-contracts/contracts/libraries/MultiSend.sol";
 import { GnosisSafe } from "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol";
 import { DefaultCallbackHandler } from "@gnosis.pm/safe-contracts/contracts/handler/DefaultCallbackHandler.sol";
 import { DailyLimitModule } from "@gnosis.pm/safe-contracts/contracts/modules/DailyLimitModule.sol";
 import { ConditionalTokens } from "@gnosis.pm/conditional-tokens-contracts/contracts/ConditionalTokens.sol";
 import { ERC20Mintable } from "openzeppelin-solidity/contracts/token/ERC20/ERC20Mintable.sol";
+
+contract GnosisSafe2 is GnosisSafe {}

migrations-ts/1-deploy-contracts.ts

@@ -6,7 +6,8 @@ module.exports = function (deployer: Truffle.Deployer, network: string) {
   if (network === 'test' || network === 'local') {
     ;[
       'GnosisSafe',
-      'ProxyFactory',
+      'GnosisSafe2',
+      'GnosisSafeProxyFactory',
       'MultiSend',
       'DefaultCallbackHandler',
       'Multistep',

package.json

@@ -44,48 +44,48 @@
   "homepage": "https://github.com/gnosis/contract-proxy-kit#readme",
   "dependencies": {
     "@gnosis.pm/safe-apps-sdk": "^0.4.2",
-    "@truffle/contract": "^4.2.26",
+    "@truffle/contract": "^4.3.4",
     "@types/uuid": "^8.3.0",
     "bignumber.js": "^9.0.1",
     "node-fetch": "^2.6.1",
-    "uuid": "^8.3.1"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@gnosis.pm/conditional-tokens-contracts": "^0.5.4",
-    "@gnosis.pm/safe-contracts": "1.1.1",
-    "@truffle/hdwallet-provider": "^1.1.1",
+    "@gnosis.pm/safe-contracts": "1.2.0",
+    "@truffle/hdwallet-provider": "^1.2.1",
     "@typechain/truffle-v5": "^2.0.2",
     "@types/chai": "^4.2.14",
     "@types/chai-as-promised": "^7.1.3",
-    "@types/mocha": "^8.0.3",
+    "@types/mocha": "^8.2.0",
     "@types/node-fetch": "^2.5.7",
-    "@typescript-eslint/eslint-plugin": "^4.5.0",
-    "@typescript-eslint/parser": "^4.5.0",
+    "@typescript-eslint/eslint-plugin": "^4.12.0",
+    "@typescript-eslint/parser": "^4.12.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "coveralls": "^3.1.0",
     "dotenv": "^8.2.0",
-    "eslint": "^7.11.0",
-    "eslint-config-prettier": "^6.13.0",
-    "eslint-plugin-prettier": "^3.1.4",
+    "eslint": "^7.17.0",
+    "eslint-config-prettier": "^7.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "ethers-4": "npm:ethers@^4.0.45",
-    "ethers-5": "npm:ethers@^5.0.18",
-    "ganache-cli": "^6.12.0",
-    "geth-dev-assistant": "^0.1.7",
+    "ethers-5": "npm:ethers@^5.0.24",
+    "ganache-cli": "^6.12.1",
+    "geth-dev-assistant": "^0.1.8",
     "jsdom": "^16.4.0",
     "jsdom-global": "^3.0.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.1.2",
+    "prettier": "^2.2.1",
     "prettier-eslint-cli": "^5.0.0",
     "run-with-testrpc": "^0.3.1",
     "should": "^13.2.3",
-    "truffle": "^5.1.49",
+    "truffle": "^5.1.60",
     "truffle-typings": "^1.0.8",
-    "ts-node": "^9.0.0",
+    "ts-node": "^9.1.1",
     "typechain": "^3.0.0",
-    "typescript": "^4.0.3",
+    "typescript": "^4.1.3",
     "wait-port": "^0.2.9",
-    "web3-1-3": "npm:web3@^1.3.0",
+    "web3-1-3": "npm:web3@^1.3.1",
     "web3-2-alpha": "npm:web3@^2.0.0-alpha.1"
   }
 }