diff --git a/README.md b/README.md index b6971b8..af4357a 100644 --- a/README.md +++ b/README.md @@ -79,9 +79,9 @@ Kredits DAO independently. ![](docs/kredits-diagram.png) -A DAO can be deployed using the `scripts/deploy-kit.js` script or with the `npm -run deploy:dao` command. This deploys a new Kredits DAO, installs the latest -app versions and sets the required permissions. +A DAO can be deployed using the `scripts/deploy-kit.js` script or with the +`npm run deploy:dao` command. This deploys a new Kredits DAO, installs the +latest app versions and sets the required permissions. See each app in `/apps/*` for details. @@ -115,11 +115,11 @@ Script to add a new entries to the contracts using the JS wrapper $ truffle exec scripts/add-{contributor, contribution, proposal}.js -### list-{contributor, contribution, proposal}.js +### list-{contributors, contributions, proposals}.js List contract entries - $ truffle exec scripts/list-{contributor, contribution, proposal}.js + $ truffle exec scripts/list-{contributors, contributions, proposals}.js ### send-funds.js @@ -152,7 +152,7 @@ Deploys a new KreditsKit that allows to create a new DAO or $ npm run deploy:kit -`ENS` address is required as environment variable. +`ENS` address is required as environment variable. `DAO_FACTORY` can optionally be set as environment variable. (see aragon) ### new-dao.js diff --git a/apps/contribution/package.json b/apps/contribution/package.json index 6bb6ff7..bdf9497 100644 --- a/apps/contribution/package.json +++ b/apps/contribution/package.json @@ -11,10 +11,10 @@ "start": "npm run start:aragon:ipfs", "start:aragon:ipfs": "aragon run", "start:aragon:http": "aragon run --http localhost:8001 --http-served-from ./dist", - "start:app": "npm run sync-assets && npm run build:script -- --no-minify && parcel serve app/index.html -p 8001 --out-dir dist/ --no-cache", + "start:app": "", "test": "aragon contracts test", "compile": "aragon contracts compile", - "sync-assets": "copy-aragon-ui-assets -n aragon-ui ./dist", + "sync-assets": "", "build:app": "", "build:script": "", "build": "", diff --git a/apps/contribution/test/app.js b/apps/contribution/test/app.js index a4a7d11..24e551b 100644 --- a/apps/contribution/test/app.js +++ b/apps/contribution/test/app.js @@ -1,4 +1,4 @@ -const CounterApp = artifacts.require('Contribution.sol') +const Contribution = artifacts.require('Contribution.sol') contract('Contribution', (accounts) => { it('should be tested') diff --git a/apps/contributor/test/app.js b/apps/contributor/test/app.js index 7affa11..9b95efa 100644 --- a/apps/contributor/test/app.js +++ b/apps/contributor/test/app.js @@ -1,5 +1,5 @@ -const CounterApp = artifacts.require('CounterApp.sol') +const Contributor = artifacts.require('Contributor.sol') -contract('CounterApp', (accounts) => { +contract('Contributor', (accounts) => { it('should be tested') }) diff --git a/apps/proposal/manifest.json b/apps/proposal/manifest.json index 8ed7e0b..135453c 100644 --- a/apps/proposal/manifest.json +++ b/apps/proposal/manifest.json @@ -1,4 +1,4 @@ { "name": "Proposal", - "description": "Kredits proposal app" + "description": "Kredits Proposal app" } diff --git a/apps/proposal/test/app.js b/apps/proposal/test/app.js new file mode 100644 index 0000000..b35a6df --- /dev/null +++ b/apps/proposal/test/app.js @@ -0,0 +1,5 @@ +const Proposal = artifacts.require('Proposal.sol') + +contract('Proposal', (accounts) => { + it('should be tested') +}) diff --git a/apps/token/manifest.json b/apps/token/manifest.json index 5f8627b..9af8526 100644 --- a/apps/token/manifest.json +++ b/apps/token/manifest.json @@ -1,4 +1,4 @@ { "name": "Token", - "description": "Kredits token app" + "description": "Kredits Token app" } diff --git a/apps/token/test/app.js b/apps/token/test/app.js index 7affa11..3e01ace 100644 --- a/apps/token/test/app.js +++ b/apps/token/test/app.js @@ -1,5 +1,5 @@ -const CounterApp = artifacts.require('CounterApp.sol') +const Token = artifacts.require('Token.sol') -contract('CounterApp', (accounts) => { +contract('Token', (accounts) => { it('should be tested') }) diff --git a/lib/contracts/base.js b/lib/contracts/base.js index dec9f5b..2dc82c8 100644 --- a/lib/contracts/base.js +++ b/lib/contracts/base.js @@ -20,4 +20,5 @@ class Base { return this.contract.on(type, callback); } } + module.exports = Base; diff --git a/lib/contracts/contributor.js b/lib/contracts/contributor.js index cc2c698..d207773 100644 --- a/lib/contracts/contributor.js +++ b/lib/contracts/contributor.js @@ -1,4 +1,3 @@ -const ethers = require('ethers'); const RSVP = require('rsvp'); const ContributorSerializer = require('../serializers/contributor'); @@ -20,7 +19,6 @@ class Contributor extends Base { getById(id) { return this.functions.getContributorById(id) - // Fetch IPFS data if available .then((data) => { return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize); }); diff --git a/lib/contracts/proposal.js b/lib/contracts/proposal.js index 896b72f..3d93943 100644 --- a/lib/contracts/proposal.js +++ b/lib/contracts/proposal.js @@ -1,4 +1,3 @@ -const ethers = require('ethers'); const RSVP = require('rsvp'); const ContributionSerializer = require('../serializers/contribution'); diff --git a/lib/contracts/token.js b/lib/contracts/token.js index effbaaa..4dfaa96 100644 --- a/lib/contracts/token.js +++ b/lib/contracts/token.js @@ -4,4 +4,3 @@ class Token extends Base { } module.exports = Token; -