Fix tests to reflect potential real config with V1 factory as well

contracts/solc-0.5/CPKFactoryV1.sol

@@ -0,0 +1,54 @@
+pragma solidity >=0.5.0 <0.7.0;
+
+import { Enum } from "@gnosis.pm/safe-contracts/contracts/common/Enum.sol";
+import { GnosisSafeProxy } from "@gnosis.pm/safe-contracts/contracts/proxies/GnosisSafeProxy.sol";
+import { GnosisSafe } from "@gnosis.pm/safe-contracts/contracts/GnosisSafe.sol";
+
+contract CPKFactoryV1 {
+    event ProxyCreation(GnosisSafeProxy proxy);
+
+    function proxyCreationCode() external pure returns (bytes memory) {
+        return type(GnosisSafeProxy).creationCode;
+    }
+
+    function createProxyAndExecTransaction(
+        address masterCopy,
+        uint256 saltNonce,
+        address fallbackHandler,
+        address to,
+        uint256 value,
+        bytes calldata data,
+        Enum.Operation operation
+    )
+        external
+        returns (bool execTransactionSuccess)
+    {
+        GnosisSafe proxy;
+        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 {
+            proxy := create2(0x0, add(0x20, deploymentData), mload(deploymentData), salt)
+        }
+        require(address(proxy) != address(0), "create2 call failed");
+
+        {
+            address[] memory tmp = new address[](1);
+            tmp[0] = address(this);
+            proxy.setup(tmp, 1, address(0), "", fallbackHandler, address(0), 0, address(0));
+        }
+
+        execTransactionSuccess = proxy.execTransaction(to, value, data, operation, 0, 0, 0, address(0), address(0),
+            abi.encodePacked(uint(address(this)), uint(0), uint8(1)));
+
+        proxy.execTransaction(
+            address(proxy), 0,
+            abi.encodeWithSignature("swapOwner(address,address,address)", address(1), address(this), msg.sender),
+            Enum.Operation.Call,
+            0, 0, 0, address(0), address(0),
+            abi.encodePacked(uint(address(this)), uint(0), uint8(1))
+        );
+
+        emit ProxyCreation(GnosisSafeProxy(address(proxy)));
+   }
+}

migrations-ts/1-deploy-contracts.ts

@@ -17,6 +17,8 @@ module.exports = async function(deployer: Truffle.Deployer, network: string) {
     ].map(deploy));
   }
 
+  await deployer.deploy(artifacts.require('CPKFactoryV1'));
+
   await deployer.deploy(
     artifacts.require('CPKFactory'),
     artifacts.require('GnosisSafeProxyFactory').address,

test/ethers/shouldWorkWithEthers.ts

@@ -126,7 +126,7 @@ export function shouldWorkWithEthers({
       let networks: NetworksConfig
 
       before('obtain addresses from artifacts', async () => {
-        const { gnosisSafe, gnosisSafe2, cpkFactory, multiSend, defaultCallbackHandler } = contracts
+        const { gnosisSafe, gnosisSafe2, cpkFactory, cpkFactoryV1, multiSend, defaultCallbackHandler } = contracts
 
         networks = {
           [(await signer.provider.getNetwork()).chainId]: {
@@ -136,12 +136,11 @@ export function shouldWorkWithEthers({
                 initialImplAddress: await cpkFactory.proxyImplSetter(),
               },
               {
-                // TODO: Use v1 addr
-                proxyFactoryAddress: cpkFactory.address,
+                proxyFactoryAddress: cpkFactoryV1.address,
                 initialImplAddress: gnosisSafe.address,
               },
               {
-                proxyFactoryAddress: cpkFactory.address,
+                proxyFactoryAddress: cpkFactoryV1.address,
                 initialImplAddress: gnosisSafe2.address,
               },
             ],

test/utils/contracts.ts

@@ -2,6 +2,7 @@ const TruffleContract = require('@truffle/contract')
 import Web3Maj1Min3 from 'web3-1-3'
 import ConditionalTokensJson from '../../build/contracts/ConditionalTokens.json'
 import CPKFactoryJson from '../../build/contracts/CPKFactory.json'
+import CPKFactoryV1Json from '../../build/contracts/CPKFactoryV1.json'
 import DailyLimitModuleJson from '../../build/contracts/DailyLimitModule.json'
 import DefaultCallbackHandlerJson from '../../build/contracts/DefaultCallbackHandler.json'
 import ERC20MintableJson from '../../build/contracts/ERC20Mintable.json'
@@ -13,6 +14,7 @@ import MultistepJson from '../../build/contracts/Multistep.json'
 import { Address } from '../../src/utils/basicTypes'
 
 let CPKFactory: any
+let CPKFactoryV1: any
 let GnosisSafe: any
 let GnosisSafe2: any
 let GnosisSafeProxyFactory: any
@@ -24,6 +26,7 @@ let ConditionalTokens: any
 let DailyLimitModule: any
 
 let cpkFactory: any
+let cpkFactoryV1: any
 let gnosisSafe: any
 let gnosisSafe2: any
 let gnosisSafeProxyFactory: any
@@ -36,6 +39,7 @@ let dailyLimitModule: any
 
 export interface TestContractInstances {
   cpkFactory: any
+  cpkFactoryV1: any
   gnosisSafe: any
   gnosisSafe2: any
   gnosisSafeProxyFactory: any
@@ -49,6 +53,7 @@ export interface TestContractInstances {
 
 export interface TestContracts {
   CPKFactory: any
+  CPKFactoryV1: any
   GnosisSafe: any
   GnosisSafe2: any
   GnosisSafeProxyFactory: any
@@ -68,6 +73,11 @@ export const initializeContracts = async (safeOwner: Address): Promise<void> =>
   CPKFactory.defaults({ from: safeOwner })
   cpkFactory = await CPKFactory.deployed()
 
+  CPKFactoryV1 = TruffleContract(CPKFactoryV1Json)
+  CPKFactoryV1.setProvider(provider)
+  CPKFactoryV1.defaults({ from: safeOwner })
+  cpkFactoryV1 = await CPKFactoryV1.deployed()
+
   GnosisSafe = TruffleContract(GnosisSafeJson)
   GnosisSafe.setProvider(provider)
   GnosisSafe.defaults({ from: safeOwner })
@@ -116,6 +126,7 @@ export const initializeContracts = async (safeOwner: Address): Promise<void> =>
 
 export const getContracts = (): TestContracts => ({
   CPKFactory,
+  CPKFactoryV1,
   GnosisSafe,
   GnosisSafe2,
   GnosisSafeProxyFactory,
@@ -129,6 +140,7 @@ export const getContracts = (): TestContracts => ({
 
 export const getContractInstances = (): TestContractInstances => ({
   cpkFactory,
+  cpkFactoryV1,
   gnosisSafe,
   gnosisSafe2,
   gnosisSafeProxyFactory,

test/web3/shouldWorkWithWeb3.ts

@@ -114,7 +114,7 @@ export function shouldWorkWithWeb3({
       let networks: NetworksConfig
 
       before('obtain addresses from artifacts', async () => {
-        const { gnosisSafe, gnosisSafe2, cpkFactory, multiSend, defaultCallbackHandler } = contracts
+        const { gnosisSafe, gnosisSafe2, cpkFactory, cpkFactoryV1, multiSend, defaultCallbackHandler } = contracts
 
         networks = {
           [await ueb3.eth.net.getId()]: {
@@ -124,12 +124,11 @@ export function shouldWorkWithWeb3({
                 initialImplAddress: await cpkFactory.proxyImplSetter(),
               },
               {
-                // TODO: Use v1 addr
-                proxyFactoryAddress: cpkFactory.address,
+                proxyFactoryAddress: cpkFactoryV1.address,
                 initialImplAddress: gnosisSafe.address,
               },
               {
-                proxyFactoryAddress: cpkFactory.address,
+                proxyFactoryAddress: cpkFactoryV1.address,
                 initialImplAddress: gnosisSafe2.address,
               },
             ],