Add proxy runtime code and extcodehash accessors to factory

Author: cag

contracts/CPKFactory.sol

@@ -11,6 +11,14 @@ contract CPKFactory {
         return type(Proxy).creationCode;
     }
 
+    function proxyRuntimeCode() external pure returns (bytes memory) {
+        return type(Proxy).runtimeCode;
+    }
+
+    function proxyRuntimeCodeHash() external pure returns (bytes32 digest) {
+        return keccak256(type(Proxy).runtimeCode);
+    }
+
     function createProxyAndExecTransaction(
         address masterCopy,
         uint256 saltNonce,

test/contract-proxy-kit.js

@@ -38,6 +38,8 @@ function shouldSupportDifferentTransactions({
   fromWei,
   getTransactionCount,
   getBalance,
+  getCode,
+  keccak256,
   getGasUsed,
   testedTxObjProps,
   checkTxObj,
@@ -323,6 +325,24 @@ function shouldSupportDifferentTransactions({
 
       gasCosts.should.be.equal(gasPrice * gasUsed);
     });
+
+    if (!ownerIsRecognizedContract) {
+      it('deploys proxy which matches factory specs', async () => {
+        const cpkFactory = await CPKFactory.deployed();
+        const idPrecompile = `0x${'0'.repeat(39)}4`;
+        await cpk.execTransactions([{
+          operation: CPK.CALL,
+          to: idPrecompile,
+          value: 0,
+          data: '0x',
+        }], { gasLimit: defaultGasLimit });
+        const proxyRuntimeCode = await getCode(cpk.address);
+        await cpkFactory.proxyRuntimeCode()
+          .should.eventually.equal(proxyRuntimeCode);
+        await cpkFactory.proxyRuntimeCodeHash()
+          .should.eventually.equal(keccak256(proxyRuntimeCode));
+      });
+    }
   });
 }
 
@@ -340,6 +360,8 @@ function shouldWorkWithWeb3(Web3, defaultAccount, safeOwner, gnosisSafeProviderB
       testedTxObjProps: 'the PromiEvent for the transaction and the hash',
       getBalance: (address) => web3Box[0].eth.getBalance(address)
         .then((balance) => web3Box[0].utils.toBN(balance)),
+      getCode: (address) => web3Box[0].eth.getCode(address),
+      keccak256: (hex) => web3Box[0].utils.keccak256(hex),
       getGasUsed: ({ promiEvent }) => new Promise(
         (resolve, reject) => promiEvent
           .on('confirmation', (confNumber, receipt) => resolve(receipt.gasUsed))
@@ -462,6 +484,8 @@ function shouldWorkWithEthers(ethers, defaultAccount, safeOwner, gnosisSafeProvi
       getGasUsed: async ({ transactionResponse }) => (
         await transactionResponse.wait()
       ).gasUsed.toNumber(),
+      getCode: (address) => signer.provider.getCode(address),
+      keccak256: (hex) => ethers.utils.keccak256(hex),
       testedTxObjProps: 'the TransactionResponse and the hash',
       checkTxObj: ({ transactionResponse, hash }) => {
         should.exist(transactionResponse);