From 377560805fe52da43c498a48b9ac84e745a064a4 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 9 Apr 2019 08:43:13 +0200 Subject: [PATCH 1/2] Fix contributor ID in seeds We have one contributor less, after having removed the initial dummy account recently. --- config/seeds.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/seeds.js b/config/seeds.js index 49654bc..fde92f9 100644 --- a/config/seeds.js +++ b/config/seeds.js @@ -1,12 +1,12 @@ const contractCalls = [ ['Contributor', 'add', [{ account: '0x7e8f313c56f809188313aa274fa67ee58c31515d', name: 'bumi', isCore: true, kind: 'person', url: '', github_username: 'bumi', github_uid: 318, wiki_username: 'bumi' }, { gasLimit: 200000 }]], ['Contributor', 'add', [{ account: '0x49575f3DD9a0d60aE661BC992f72D837A77f05Bc', name: 'raucao', isCore: true, kind: 'person', url: '', github_username: 'skddc', github_uid: 842, wiki_username: 'raucau' }, { gasLimit: 200000 }]], + ['Proposal', 'addProposal', [{ contributorId: 1, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]], ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]], - ['Proposal', 'addProposal', [{ contributorId: 3, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Ran the seeds', url: '' }, { gasLimit: 350000 }]], - ['Proposal', 'addProposal', [{ contributorId: 3, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]], + ['Proposal', 'addProposal', [{ contributorId: 2, amount: 500, kind: 'code', description: '[67P/kredits-contracts] Hacked on kredits', url: '' }, { gasLimit: 350000 }]], ['Proposal', 'vote', [1, { gasLimit: 550000 }]], - ['Contribution', 'addContribution', [{ contributorId: 2, amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]], - ['Contribution', 'addContribution', [{ contributorId: 3, amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]], + ['Contribution', 'addContribution', [{ contributorId: 1, amount: 5000, kind: 'dev', description: '[67P/kredits-contracts] Introduce contribution token', url: '' }, { gasLimit: 350000 }]], + ['Contribution', 'addContribution', [{ contributorId: 2, amount: 1500, kind: 'dev', description: '[67P/kredits-web] Reviewed stuff', url: '' }, { gasLimit: 350000 }]], ['Contribution', 'claim', [1, { gasLimit: 300000 }]] ]; const funds = [ From dfe38e7d2104275cf301a5a927274c674e298590 Mon Sep 17 00:00:00 2001 From: Sebastian Kippe Date: Tue, 9 Apr 2019 08:44:56 +0200 Subject: [PATCH 2/2] Don't run `npm install` on bootstrap When one wants to install, they can install. When one wants to bootstrap, they should be able to only bootstrap. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 078d906..a7b98d4 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "repl": "truffle exec scripts/repl.js", "seeds": "truffle exec scripts/seeds.js", "compile-contracts": "aragon contracts compile --all", - "bootstrap": "./scripts/every-app.sh \"npm install \" && npm run reset:hard && npm run seeds", + "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": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",