Split APM creation transaction

To fix gas issues and on deployment and `npm run test`, `newAPM` is
now split into 2 transactions to avoid passing the transaction gas
limit. The first one just creates the DAO, which currently consumes
~1.5M gas.

contracts/factory/APMRegistryFactory.sol

@@ -16,6 +16,7 @@ contract APMRegistryFactory is APMRegistryConstants {
     ENSSubdomainRegistrar public ensSubdomainRegistrarBase;
     ENS public ens;
 
+    event DeployAPMDao(bytes32 indexed node, address dao);
     event DeployAPM(bytes32 indexed node, address apm);
 
     // Needs either one ENS or ENSFactory
@@ -39,7 +40,14 @@ contract APMRegistryFactory is APMRegistryConstants {
         ens = _ens != address(0) ? _ens : _ensFactory.newENS(this);
     }
 
-    function newAPM(bytes32 _tld, bytes32 _label, address _root) public returns (APMRegistry) {
+    function newAPMDao(bytes32 _tld, bytes32 _label) public returns (Kernel) {
+        bytes32 node = keccak256(_tld, _label);
+        Kernel dao = daoFactory.newDAO(this);
+        DeployAPMDao(node, dao);
+        return dao;
+    }
+
+    function newAPM(bytes32 _tld, bytes32 _label, address _root, address _dao) public returns (APMRegistry) {
         bytes32 node = keccak256(_tld, _label);
 
         // Assume it is the test ENS
@@ -48,7 +56,7 @@ contract APMRegistryFactory is APMRegistryConstants {
             ens.setSubnodeOwner(_tld, _label, this);
         }
 
-        Kernel dao = daoFactory.newDAO(this);
+        Kernel dao = Kernel(_dao);
         ACL acl = ACL(dao.acl());
 
         acl.createPermission(this, dao, dao.APP_MANAGER_ROLE(), this);

migrations/2_apm.js

@@ -1,6 +1,8 @@
 const namehash = require('eth-ens-namehash').hash
 const keccak256 = require('js-sha3').keccak_256
 
+const getEvent = (receipt, event, arg) => { return receipt.logs.filter(l => l.event == event)[0].args[arg] }
+
 module.exports = async (deployer, network, accounts, arts = null) => {
   if (arts != null) artifacts = arts // allow running outside
 
@@ -30,8 +32,10 @@ module.exports = async (deployer, network, accounts, arts = null) => {
 
   console.log('Deploying APM...')
   const root = '0xffffffffffffffffffffffffffffffffffffffff' // public
-  const receipt = await factory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), root)
-  const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+  const receiptDao = await factory.newAPMDao(namehash('eth'), '0x'+keccak256('aragonpm'))
+  const daoAddr = getEvent(receiptDao, 'DeployAPMDao', 'dao')
+  const receipt = await factory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), root, daoAddr)
+  const apmAddr = getEvent(receipt, 'DeployAPM', 'apm')
   console.log('Deployed APM at:', apmAddr)
 
   const apm = getContract('APMRegistry').at(apmAddr)

test/apm_registry.js

@@ -10,6 +10,7 @@ const Kernel = artifacts.require('Kernel')
 const ACL = artifacts.require('ACL')
 
 const getContract = name => artifacts.require(name)
+const getEvent = (receipt, event, arg) => { return receipt.logs.filter(l => l.event == event)[0].args[arg] }
 
 contract('APMRegistry', accounts => {
     let ensFactory, ens, apmFactory, apmFactoryMock, registry, baseDeployed, baseAddrs, dao, acl, daoFactory = {}
@@ -38,8 +39,10 @@ contract('APMRegistry', accounts => {
         apmFactoryMock = await getContract('APMRegistryFactoryMock').new(daoFactory.address, ...baseAddrs, '0x0', ensFactory.address)
         ens = ENS.at(await apmFactory.ens())
 
-        const receipt = await apmFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner)
-        const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+        const receiptDao = await apmFactory.newAPMDao(namehash('eth'), '0x'+keccak256('aragonpm'))
+        const daoAddr = getEvent(receiptDao, 'DeployAPMDao', 'dao')
+        const receipt = await apmFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner, daoAddr)
+        const apmAddr = getEvent(receipt, 'DeployAPM', 'apm')
         registry = APMRegistry.at(apmAddr)
 
         dao = Kernel.at(await registry.kernel())
@@ -84,8 +87,10 @@ contract('APMRegistry', accounts => {
         const newFactory = await getContract('APMRegistryFactory').new(daoFactory.address, ...baseAddrs, ens2.address, '0x00')
 
         await ens2.setSubnodeOwner(namehash('eth'), '0x'+keccak256('aragonpm'), newFactory.address)
-        const receipt2 = await newFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner)
-        const apmAddr = receipt2.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+        const receiptDao = await newFactory.newAPMDao(namehash('eth'), '0x'+keccak256('aragonpm'))
+        const daoAddr = getEvent(receiptDao, 'DeployAPMDao', 'dao')
+        const receipt2 = await newFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner, daoAddr)
+        const apmAddr = getEvent(receipt2, 'DeployAPM', 'apm')
         const resolver = PublicResolver.at(await ens2.resolver(rootNode))
 
         assert.equal(await resolver.addr(rootNode), apmAddr, 'rootnode should be resolve')

test/ens_subdomains.js

@@ -11,6 +11,7 @@ const ACL = artifacts.require('ACL')
 const ENSSubdomainRegistrar = artifacts.require('ENSSubdomainRegistrar')
 
 const getContract = name => artifacts.require(name)
+const getEvent = (receipt, event, arg) => { return receipt.logs.filter(l => l.event == event)[0].args[arg] }
 
 // Using APMFactory in order to reuse it
 contract('ENSSubdomainRegistrar', accounts => {
@@ -41,8 +42,10 @@ contract('ENSSubdomainRegistrar', accounts => {
         const baseAddrs = baseDeployed.map(c => c.address)
         apmFactory = await getContract('APMRegistryFactory').new(daoFactory.address, ...baseAddrs, '0x0', ensFactory.address)
         ens = ENS.at(await apmFactory.ens())
-        const receipt = await apmFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner)
-        const apmAddr = receipt.logs.filter(l => l.event == 'DeployAPM')[0].args.apm
+        const receiptDao = await apmFactory.newAPMDao(namehash('eth'), '0x'+keccak256('aragonpm'))
+        const daoAddr = getEvent(receiptDao, 'DeployAPMDao', 'dao')
+        const receipt = await apmFactory.newAPM(namehash('eth'), '0x'+keccak256('aragonpm'), apmOwner, daoAddr)
+        const apmAddr = getEvent(receipt, 'DeployAPM', 'apm')
         registry = APMRegistry.at(apmAddr)
 
         dao = Kernel.at(await registry.kernel())

test/mocks/APMRegistryFactoryMock.sol

@@ -16,7 +16,7 @@ contract APMRegistryFactoryMock is APMRegistryFactory {
     )
     APMRegistryFactory(_daoFactory, _registryBase, _repoBase, _ensSubBase, _ens, _ensFactory) public {}
 
-    function newAPM(bytes32 tld, bytes32 label, address _root) public returns (APMRegistry) {}
+    function newAPM(bytes32 tld, bytes32 label, address _root, address _dao) public returns (APMRegistry) {}
 
     function newBadAPM(bytes32 tld, bytes32 label, address _root, bool withoutACL) public returns (APMRegistry) {
         bytes32 node = keccak256(tld, label);