Add proxy runtime code and extcodehash accessors to factory

5afe · Mar 24, 2020 · 7556ff0 · 7556ff0
1 parent 0d74c39
commit 7556ff0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 0 deletions.
diff --git a/contracts/CPKFactory.sol b/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,

diff --git a/test/ethers/shouldWorkWithEthers.js b/test/ethers/shouldWorkWithEthers.js
@@ -19,6 +19,8 @@ function shouldWorkWithEthers(ethers, defaultAccount, safeOwner, gnosisSafeProvi
       fromWei: (amount) => Number(ethers.utils.formatUnits(amount.toString(), 'ether')),
       getTransactionCount: signer.provider.getTransactionCount.bind(signer.provider),
       getBalance: signer.provider.getBalance.bind(signer.provider),
+      getCode: (address) => signer.provider.getCode(address),
+      keccak256: (hex) => ethers.utils.keccak256(hex),
       getGasUsed: async ({ transactionResponse }) => (
         await transactionResponse.wait()
       ).gasUsed.toNumber(),

diff --git a/test/transactions/shouldSupportDifferentTransactions.js b/test/transactions/shouldSupportDifferentTransactions.js
@@ -2,6 +2,7 @@ const makeConditionalTokensIdHelpers = require('@gnosis.pm/conditional-tokens-co
 const Multistep = artifacts.require('Multistep');
 const ConditionalTokens = artifacts.require('ConditionalTokens');
 const ERC20Mintable = artifacts.require('ERC20Mintable');
+const CPKFactory = artifacts.require('CPKFactory');
 
 const CPK = require('../..');
 
@@ -15,6 +16,8 @@ function shouldSupportDifferentTransactions({
   fromWei,
   getTransactionCount,
   getBalance,
+  getCode,
+  keccak256,
   getGasUsed,
   testedTxObjProps,
   checkTxObj,
@@ -300,6 +303,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));
+      });
+    }
   });
 }
 

diff --git a/test/web3/shouldWorkWithWeb3.js b/test/web3/shouldWorkWithWeb3.js
@@ -20,6 +20,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))