diff --git a/README.md b/README.md index 210b811..6f51f85 100644 --- a/README.md +++ b/README.md @@ -63,21 +63,26 @@ if you want to increase the block time to 10 seconds you can add $ npm run devchain $ ipfs daemon -2. Deploy each app to the devchain +2. Compile contracts + + (compiled contracts will be in `/build`) + $ npm run compile-contracts + +3. Deploy each app to the devchain (make sure you've run `npm install` for every app - see installation) $ npm run deploy:apps -3. Deploy a new KreditsKit and create a new DAO with the latest app versions +4. Deploy a new KreditsKit and create a new DAO with the latest app versions $ npm run deploy:kit $ npm run deploy:dao -4. Execute seeds to create demo contributors, contributions, etc. (optional) +5. Execute seeds to create demo contributors, contributions, etc. (optional) $ npm run seeds -**Step 2-4 is also summarized in `npm run bootstrap`** +**Step 2-5 is also summarized in `npm run bootstrap`** If you want to reset your local setup: diff --git a/package.json b/package.json index ceaffcc..bbb783e 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "compile-contracts": "truffle compile --all", "bootstrap": "npm run reset:hard && npm run seeds", "reset": "npm run deploy:kit && npm run deploy:dao", - "reset:hard": "npm run deploy:apps && npm run reset", - "deploy:kit": "aragon contracts exec scripts/deploy-kit.js", - "deploy:dao": "aragon contracts exec scripts/new-dao.js", + "reset:hard": "npm run compile-contracts && npm run deploy:apps && npm run reset", + "deploy:kit": "truffle exec scripts/deploy-kit.js", + "deploy:dao": "truffle exec scripts/new-dao.js", "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major --propagate-content=false --build=false --prepublish=false --skip-confirmation\"", "devchain": "aragon devchain --port 7545", "dao:address": "truffle exec scripts/current-address.js", diff --git a/scripts/deploy-kit.js b/scripts/deploy-kit.js index 4515e9f..bff6c68 100644 --- a/scripts/deploy-kit.js +++ b/scripts/deploy-kit.js @@ -13,7 +13,7 @@ const KreditsKit = artifacts.require('KreditsKit') const arapp = require('../arapp.json') const environment = argv['network'] || argv['environment'] || 'development' -const apm = arapp.environments[environment].apm +const apm = arapp.environments[environment].apm || 'open.aragonpm.eth' const ensAddr = arapp.environments[environment].registry || process.env.ENS const daoFactoryAddress = arapp.environments[environment].daoFactory || process.env.DAO_FACTORY