Adapt to last app changes

- Registry: must be initialized - Staking: can overlock and defer locks - Curation: changed redistribution method (see PR #13)
aragon · Jul 26, 2018 · 90bdd69 · 90bdd69
1 parent fb7fce1
commit 90bdd69
Show file tree

Hide file tree

Showing 5 changed files with 3,917 additions and 202 deletions.
diff --git a/kits/tcr/contracts/TCRKit.sol b/kits/tcr/contracts/TCRKit.sol
@@ -38,9 +38,9 @@ contract TCRKit is KitBase {
 
         deployApps(dao);
 
-        //registry.initialize();
-        staking.initialize(stakingToken, new bytes(0), new bytes(0), new bytes(0));
-        voteStaking.initialize(stakingToken, new bytes(0), new bytes(0), new bytes(0));
+        registry.initialize();
+        staking.initialize(false, stakingToken, new bytes(0), new bytes(0), new bytes(0));
+        voteStaking.initialize(true, stakingToken, new bytes(0), new bytes(0), new bytes(0));
         plcr.initialize(voteStaking, voteQuorum, minorityBlocSlash, commitDuration, revealDuration);
 
         // ACLs

diff --git a/kits/tcr/migrations/2_deploy.js b/kits/tcr/migrations/2_deploy.js
@@ -15,42 +15,44 @@ const newRepo = async (apm, name, acc, contract, contentURI = "ipfs:") => {
   return await apm.newRepoWithVersion(name, acc, [1, 0, 0], c.address, contentURI)
 }
 
-module.exports = async (deployer, network, accounts) => {
-  let indexFileName
-  if (network != 'rpc' && network != 'devnet') {
-    indexFileName = 'index.js'
-  } else {
-    indexFileName = 'index_local.js'
-  }
-  let indexObj = require('../' + indexFileName)
-
-  console.log('ens', indexObj.networks[network].ens)
-  const ens = ENS.at(indexObj.networks[network].ens)
-
-  const apmAddr = await artifacts.require('PublicResolver').at(await ens.resolver(namehash('aragonpm.eth'))).addr(namehash('aragonpm.eth'))
-  console.log('APM address', apmAddr)
-
-  if (network == 'rpc' || network == 'devnet') { // Useful for testing to avoid manual deploys with aragon-dev-cli
-    if (await ens.owner(curationAppId) == '0x0000000000000000000000000000000000000000') {
-      const apm = artifacts.require('APMRegistry').at(apmAddr)
-
-      await newRepo(apm, 'registry', accounts[0], 'RegistryApp')
-      await newRepo(apm, 'staking', accounts[0], 'Staking')
-      await newRepo(apm, 'plcr', accounts[0], 'PLCR')
-      await newRepo(apm, 'tcr', accounts[0], 'Curation')
+module.exports = function (deployer, network, accounts) {
+  deployer.then(async () => {
+    let indexFileName
+    if (network != 'rpc' && network != 'devnet') {
+      indexFileName = 'index.js'
+    } else {
+      indexFileName = 'index_local.js'
     }
-  }
+    let indexObj = require('../' + indexFileName)
 
-  const { daoFact } = await daoFactoryMigration(deployer, network, accounts, artifacts)
+    console.log('ens', indexObj.networks[network].ens)
+    const ens = ENS.at(indexObj.networks[network].ens)
 
-  const kit = await TCRKit.new(daoFact.address, ens.address)
-  console.log('TCRKit:', kit.address)
+    const apmAddr = await artifacts.require('PublicResolver').at(await ens.resolver(namehash('aragonpm.eth'))).addr(namehash('aragonpm.eth'))
+    console.log('APM address', apmAddr)
 
-  if (indexObj.networks[network] === undefined)
-    indexObj.networks[network] = {}
-  indexObj.networks[network].ens = ens.address
-  indexObj.networks[network].tcr_kit = kit.address
-  const indexFile = 'module.exports = ' + JSON.stringify(indexObj, null, 2)
-  fs.writeFileSync(indexFileName, indexFile)
-  console.log('Settings saved to ' + indexFileName)
+    if (network == 'rpc' || network == 'devnet') { // Useful for testing to avoid manual deploys with aragon-dev-cli
+      if (await ens.owner(curationAppId) == '0x0000000000000000000000000000000000000000') {
+        const apm = artifacts.require('APMRegistry').at(apmAddr)
+
+        await newRepo(apm, 'registry', accounts[0], 'RegistryApp')
+        await newRepo(apm, 'staking', accounts[0], 'Staking')
+        await newRepo(apm, 'plcr', accounts[0], 'PLCR')
+        await newRepo(apm, 'tcr', accounts[0], 'Curation')
+      }
+    }
+
+    const { daoFact } = await daoFactoryMigration(deployer, network, accounts, artifacts)
+
+    const kit = await TCRKit.new(daoFact.address, ens.address)
+    console.log('TCRKit:', kit.address)
+
+    if (indexObj.networks[network] === undefined)
+      indexObj.networks[network] = {}
+    indexObj.networks[network].ens = ens.address
+    indexObj.networks[network].tcr_kit = kit.address
+    const indexFile = 'module.exports = ' + JSON.stringify(indexObj, null, 2)
+    fs.writeFileSync(indexFileName, indexFile)
+    console.log('Settings saved to ' + indexFileName)
+  })
 }