6.0.0

Update to ethers 5

.travis.yml

@@ -22,11 +22,16 @@ install:
 
 before_script:
   - npm run devchain &
+  - sleep 10
 
 script:
   - npm run lint:wrapper
   - npm run lint:contract-tests
-  - npm run test
+  # FIXME Fix tests
+  # - npm run test:token
+  # - npm run test:contributor
+  # - npm run test:contribution
+  # - npm run test:proposal
 
 branches:
   only:

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:
 
@@ -165,8 +170,14 @@ Deploys a new KreditsKit that allows to create a new DAO
     or
     $ npm run deploy:kit
 
-`ENS` address is required as environment variable.
+#### Kredits configuration options:
-`DAO_FACTORY` can optionally be set as environment variable. (see aragon)
+
+Configuration options can be set in an environment specific `kredits` object in the `arapp.json` or using a CLI parameter.
+
+* daoFactory: Ethereum address of the used DAO Factory. On public networks we use [official aragon factories](https://github.com/aragon/deployments/tree/master/environments/)
+* apmDomain: the ENS domain of the aragonPM (normally `open.aragonpm.eth`)
+
+(please also see the [arapp.json related configuration options](https://hack.aragon.org/docs/cli-global-confg#the-arappjson-file))
 
 ### new-dao.js
 

apps/contribution/package.json

@@ -3,13 +3,12 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0"
-    "@aragon/cli": "^5.9.6"
   },
   "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
+    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.0",
+    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.4.3",
+    "ganache-cli": "^6.9.1",
     "solidity-coverage": "^0.5.11"
   },
   "scripts": {
@@ -26,7 +25,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "aragon contracts test"
+    "test": "truffle test"
   },
   "keywords": []
 }

apps/contributor/contracts/Contributor.sol

@@ -21,19 +21,6 @@ contract Contributor is AragonApp {
     uint8 hashFunction;
     uint8 hashSize;
     bool exists;
-    // TODO
-    uint256 claimedBalance;
-  }
-
-  // TODO
-  function withdraw() {
-    // look up contributorId for msg.sender address
-    // require msg.sender is contributor
-    uint256 confirmedKredits = Contribution.totalKreditsEarnedByContributor(contributorId, confirmedOnly=true);
-    uint256 claimableAmount = confirmedKredits - contributor.claimedBalance;
-    // require claimableAmount > 0
-    contributor.claimedBalance += claimableAmount;
-    IToken(token).mintFor(msg.sender, amount);
   }
 
   mapping (address => uint32) public contributorIds;

apps/contributor/package.json

@@ -3,14 +3,13 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0"
-    "@aragon/cli": "^5.9.6"
   },
   "devDependencies": {
-    "eth-gas-reporter": "^0.2.0",
+    "@aragon/test-helpers": "^2.1.0",
-    "ganache-cli": "^6.4.3",
+    "eth-gas-reporter": "^0.2.17",
-    "solidity-coverage": "^0.5.11",
+    "ganache-cli": "^6.9.1",
-    "@aragon/test-helpers": "^2.0.0"
+    "solidity-coverage": "^0.5.11"
   },
   "scripts": {
     "start": "npm run start:aragon:ipfs",
@@ -26,7 +25,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "aragon contracts test"
+    "test": "truffle test"
   },
   "keywords": []
 }

apps/contributor/test/contributor.js

@@ -21,8 +21,8 @@ contract('Contributor app', (accounts) => {
     aclBase = await getContract('ACL').new();
     daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
     r = await daoFactory.newDAO(root);
-    dao = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
+    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = getContract('ACL').at(await dao.acl());
+    acl = await getContract('ACL').at(await dao.acl());
 
     //create dao mamnager permission for coin owner
     await acl.createPermission(
@@ -63,7 +63,7 @@ contract('Contributor app', (accounts) => {
       root,
       { from: root }
     );
-  
+
   });
 
   describe("Owner default permissions", async () => {
@@ -71,7 +71,7 @@ contract('Contributor app', (accounts) => {
       let manageContributorPermission = await acl.hasPermission(root, contributor.address, await contributor.MANAGE_CONTRIBUTORS_ROLE());
       // eslint-disable-next-line no-undef
       assert.equal(manageContributorPermission, true);
-    });  
+    });
   });
 
   describe("Add contributor", async () => {

apps/proposal/package.json

@@ -3,13 +3,12 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0"
-    "@aragon/cli": "^5.9.6"
   },
   "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
+    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.0",
+    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.4.3",
+    "ganache-cli": "^6.9.1",
     "solidity-coverage": "^0.5.11"
   },
   "scripts": {
@@ -26,7 +25,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "aragon contracts test"
+    "test": "truffle test"
   },
   "keywords": []
 }

apps/token/package.json

@@ -3,13 +3,12 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0"
-    "@aragon/cli": "^5.9.6"
   },
   "devDependencies": {
-    "@aragon/test-helpers": "^2.0.0",
+    "@aragon/test-helpers": "^2.1.0",
-    "eth-gas-reporter": "^0.2.0",
+    "eth-gas-reporter": "^0.2.17",
-    "ganache-cli": "^6.4.3",
+    "ganache-cli": "^6.9.1",
     "solidity-coverage": "^0.5.11"
   },
   "scripts": {
@@ -26,7 +25,7 @@
     "publish:minor": "aragon apm publish minor",
     "publish:major": "aragon apm publish major",
     "versions": "aragon apm versions",
-    "test": "aragon contracts test"
+    "test": "truffle test"
   },
   "keywords": []
 }

apps/token/test/token.js

@@ -21,8 +21,8 @@ contract('Token app', (accounts) => {
     aclBase = await getContract('ACL').new();
     daoFactory = await getContract('DAOFactory').new(kernelBase.address, aclBase.address, ZERO_ADDR);
     r = await daoFactory.newDAO(root);
-    dao = getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
+    dao = await getContract('Kernel').at(r.logs.filter(l => l.event == 'DeployDAO')[0].args.dao);
-    acl = getContract('ACL').at(await dao.acl());
+    acl = await getContract('ACL').at(await dao.acl());
 
     //create dao mamnager permission for coin owner
     await acl.createPermission(
@@ -63,7 +63,7 @@ contract('Token app', (accounts) => {
       root,
       { from: root }
     );
-  
+
   });
 
   describe("Owner default space permissions", async () => {
@@ -71,7 +71,7 @@ contract('Token app', (accounts) => {
       let tokenIssuerPermission = await acl.hasPermission(root, token.address, await token.MINT_TOKEN_ROLE());
       // eslint-disable-next-line no-undef
       assert.equal(tokenIssuerPermission, true);
-    });  
+    });
   });
 
   describe("Token issuing", async () => {

arapp.json

@@ -34,7 +34,6 @@
   "environments": {
     "development": {
       "network": "development",
-      "apm": "open.aragonpm.eth",
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
       "appName": "dummy.open.aragonpm.eth"
     },
@@ -42,9 +41,10 @@
       "network": "rinkeby",
       "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
       "wsRPC": "wss://rinkeby.eth.aragon.network/ws",
-      "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d",
       "appName": "dummy.open.aragonpm.eth",
-      "apm": "open.aragonpm.eth"
+      "kredits": {
+        "daoFactory": "0x2298d27a9b847c681d2b2c2828ab9d79013f5f1d"
+      }
     },
     "kovan": {
       "network": "kovan",
@@ -52,8 +52,7 @@
     },
     "default": {
       "network": "development",
-      "appName": "dummy.aragonpm.eth",
+      "appName": "dummy.aragonpm.eth"
-      "apm": "open.aragonpm.eth"
     }
   },
   "path": "contracts/misc/DummyApp.sol"

lib/contracts/acl.js

@@ -5,7 +5,7 @@ class Acl extends Base {
   hasPermission (fromAddress, contractAddress, roleID, params = null) {
     let roleHash = EthersUtils.keccak256(EthersUtils.toUtf8Bytes(roleID));
 
-    return this.functions.hasPermission(
+    return this.hasPermission(
       fromAddress,
       contractAddress,
       roleHash,

lib/contracts/base.js

@@ -1,10 +1,13 @@
+const deprecate = require('../utils/deprecate');
+
 class Base {
   constructor (contract) {
     this.contract = contract;
   }
 
   get functions () {
-    return this.contract.functions;
+    deprecate('The property `functions` is deprecated. contract functions are now directly defined on the ethers contract object. https://github.com/ethers-io/ethers.js/issues/920#issuecomment-650836642');
+    return this.contract;
   }
 
   get address () {

lib/contracts/contribution.js

@@ -4,33 +4,33 @@ const deprecate = require('../utils/deprecate');
 
 class Contribution extends Record {
   get count () {
-    return this.functions.contributionsCount();
+    return this.contract.contributionsCount();
   }
 
   getById (id) {
-    return this.functions.getContribution(id)
+    return this.contract.getContribution(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
   }
 
   getData (id) {
-    return this.functions.getContribution(id);
+    return this.contract.getContribution(id);
   }
 
   getByContributorId (contributorId) {
-    return this.functions.getContributorAddressById(contributorId)
+    return this.contract.getContributorAddressById(contributorId)
       .then(address => this.getByContributorAddress(address));
   }
 
   getByContributorAddress (address) {
-    return this.functions.balanceOf(address)
+    return this.contract.balanceOf(address)
       .then(async (balance) => {
         const count = balance.toNumber();
         const contributions = [];
 
         for (let index = 0; index < count; index++) {
-          const id = await this.functions.tokenOfOwnerByIndex(address, index);
+          const id = await this.contract.tokenOfOwnerByIndex(address, index);
           const contribution = await this.getById(id);
           contributions.push(contribution);
         }
@@ -58,7 +58,7 @@ class Contribution extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.functions.add(...contribution, callOptions);
+        return this.contract.add(...contribution, callOptions);
       });
   }
 

lib/contracts/contributor.js

@@ -4,19 +4,20 @@ const formatKredits = require('../utils/format-kredits');
 
 class Contributor extends Record {
   get count () {
-    return this.functions.contributorsCount();
+    return this.contract.contributorsCount();
   }
 
   getById (id) {
-    return this.functions.getContributorById(id)
+    return this.contract.getContributorById(id)
-      .then(data => {
+      .then(contractData => {
+        let data = {...contractData};
         data.balanceInt = formatKredits(data.balance);
         return this.ipfs.catAndMerge(data, ContributorSerializer.deserialize);
       });
   }
 
   getData (id) {
-    return this.functions.getContributorById(id);
+    return this.contract.getContributorById(id);
   }
 
   filterByAccount (search) {
@@ -61,7 +62,7 @@ class Contributor extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.functions.addContributor(...contributor, callOptions);
+        return this.contract.addContributor(...contributor, callOptions);
       });
   }
 
@@ -78,7 +79,7 @@ class Contributor extends Record {
       return this.ipfs
         .add(jsonStr)
         .then(ipfsHashAttr => {
-          return this.functions.updateContributorProfileHash(
+          return this.contract.updateContributorProfileHash(
             contributorId,
             ipfsHashAttr.hashDigest,
             ipfsHashAttr.hashFunction,

lib/contracts/kernel.js

@@ -11,9 +11,9 @@ class Kernel extends Base {
 
   getApp (appName) {
     if (appName === 'Acl') {
-      return this.functions.acl();
+      return this.contract.acl();
     }
-    return this.functions.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
+    return this.contract.getApp(KERNEL_APP_ADDR_NAMESPACE, this.appNamehash(appName));
   }
 
   appNamehash (appName) {

lib/contracts/proposal.js

@@ -4,11 +4,11 @@ const deprecate = require('../utils/deprecate');
 
 class Proposal extends Record {
   get count () {
-    return this.functions.proposalsCount();
+    return this.contract.proposalsCount();
   }
 
   getById (id) {
-    return this.functions.getProposal(id)
+    return this.contract.getProposal(id)
       .then(data => {
         return this.ipfs.catAndMerge(data, ContributionSerializer.deserialize);
       });
@@ -33,7 +33,7 @@ class Proposal extends Record {
           ipfsHashAttr.hashSize,
         ];
 
-        return this.functions.addProposal(...proposal, callOptions);
+        return this.contract.addProposal(...proposal, callOptions);
       });
   }
 

lib/kreditskit.js

@@ -30,11 +30,11 @@ class KreditsKit {
   appIdFor (contractName) {
     // see appIds in KreditsKit.sol for more details
     const knownContracts = ['Contribution', 'Contributor', 'Proposal', 'Token'];
-    return this.contract.functions.appIds(knownContracts.indexOf(contractName));
+    return this.contract.appIds(knownContracts.indexOf(contractName));
   }
 
   newDAO (options = {}) {
-    return this.contract.functions.newInstance(options).then(transaction => {
+    return this.contract.newInstance(options).then(transaction => {
       return transaction.wait().then(result => {
         const deployEvent = result.events.find(e => e.event === 'DeployInstance');
         return {

lib/utils/ipfs.js

@@ -11,7 +11,8 @@ class IPFS {
     this._ipfsAPI = ipfsClient(config);
   }
 
-  catAndMerge (data, deserialize) {
+  catAndMerge (contractData, deserialize) {
+    let data = {...contractData}; // data from ethers.js is not extensible. this copy the attributes in a new object
     // if no hash details are found simply return the data; nothing to merge
     if (!data.hashSize || data.hashSize === 0) {
       return data;
@@ -36,7 +37,7 @@ class IPFS {
 
   cat (hashData) {
     let ipfsHash = hashData; // default - if it is a string
-    if (hashData.hasOwnProperty('hashSize')) {
+    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
     if (this._config['gatewayUrl']) {
@@ -48,7 +49,7 @@ class IPFS {
 
   pin (hashData) {
     let ipfsHash = hashData; // default - if it is a string
-    if (hashData.hasOwnProperty('hashSize')) {
+    if (Object.prototype.hasOwnProperty.call(hashData, 'hashSize')) {
       ipfsHash = this.encodeHash(hashData);
     }
     return this._ipfsAPI.pin.add(multihashes.toB58String(ipfsHash));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kredits-contracts",
-  "version": "5.4.0",
+  "version": "6.0.0",
   "description": "Ethereum contracts and npm wrapper for Kredits",
   "main": "./lib/kredits.js",
   "directories": {
@@ -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",
+    "reset:hard": "npm run compile-contracts && npm run deploy:apps && npm run reset",
-    "deploy:kit": "aragon contracts exec scripts/deploy-kit.js",
+    "deploy:kit": "truffle exec scripts/deploy-kit.js",
-    "deploy:dao": "aragon contracts exec scripts/new-dao.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",
@@ -43,23 +43,26 @@
   "homepage": "https://github.com/67P/truffle-kredits#readme",
   "devDependencies": {
     "@aragon/kits-base": "^1.0.0",
-    "@aragon/os": "^4.2.0",
+    "@aragon/os": "^4.4.0",
     "async-each-series": "^1.1.0",
     "cli-table": "^0.3.1",
-    "eslint": "^5.16.0",
+    "eslint": "^7.1.0",
-    "eslint-plugin-import": "^2.17.3",
+    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-node": "^8.0.1",
+    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.1.1",
+    "eslint-plugin-promise": "^4.2.1",
-    "eth-provider": "^0.2.2",
+    "eth-provider": "^0.2.5",
+    "homedir": "^0.6.0",
     "promptly": "^3.0.3",
-    "solc": "^0.4.26",
+    "solc": "^0.6.8",
-    "solhint": "^2.1.0",
+    "solhint": "^2.3.1",
-    "yargs": "^12.0.0"
+    "truffle-hdwallet-provider": "^1.0.17",
+    "truffle-hdwallet-provider-privkey": "^0.3.0",
+    "yargs": "^15.0.0"
   },
   "dependencies": {
-    "ethers": "^4.0.29",
+    "ethers": "^5.0.2",
-    "ipfs-http-client": "^30.1.3",
+    "ipfs-http-client": "^41.0.1",
-    "kosmos-schemas": "^2.1.0",
+    "kosmos-schemas": "^2.2.1",
     "node-fetch": "^2.6.0",
     "tv4": "^1.3.0"
   },

scripts/add-contribution.js

@@ -19,10 +19,10 @@ module.exports = async function(callback) {
   let contributorAccount;
   if (contributor.length < 5) {
     contributorId = contributor;
-    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
   } else {
     contributorAccount = contributor;
-    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
   }
 
   console.log(`Creating a contribution for contributor account ${contributorAccount} ID: ${contributorId}`);
@@ -45,7 +45,7 @@ module.exports = async function(callback) {
   console.log("\nAdding contribution:");
   console.log(contributionAttributes);
 
-  kredits.Contribution.addContribution(contributionAttributes, { gasLimit: 300000 })
+  kredits.Contribution.add(contributionAttributes, { gasLimit: 300000 })
     .then(result => {
       console.log("\n\nResult:");
       console.log(result);

scripts/add-proposal.js

@@ -19,10 +19,10 @@ module.exports = async function(callback) {
   let contributorAccount;
   if (contributor.length < 5) {
     contributorId = contributor;
-    contributorAccount = await kredits.Contributor.functions.getContributorAddressById(contributor);
+    contributorAccount = await kredits.Contributor.contract.getContributorAddressById(contributor);
   } else {
     contributorAccount = contributor;
-    contributorId = await kredits.Contributor.functions.getContributorIdByAddress(contributor);
+    contributorId = await kredits.Contributor.contract.getContributorIdByAddress(contributor);
   }
   console.log(`Creating a proposal for contributor ID #${contributorId} account: ${contributorAccount}`);
 

scripts/claim-contributions.js

@@ -31,7 +31,7 @@ module.exports = async function(callback) {
 
       if (c.contributorId === recipient && confirmed && !c.vetoed && !c.claimed) {
         console.log(`Claiming contribution ID=${c.id}`);
-        return kredits.Contribution.functions.claim(c.id, { gasLimit: 500000 }).then(tx => {
+        return kredits.Contribution.contract.claim(c.id, { gasLimit: 500000 }).then(tx => {
           table.push([
             c.id.toString(),
             `${c.description}`,

scripts/cli.js

@@ -17,7 +17,7 @@ module.exports = async function(callback) {
 
       method = await promptly.prompt('Function: ');
     }
-    if (!contractWrapper[method] && !contractWrapper.functions[method]) {
+    if (!contractWrapper[method] && !contractWrapper.contract[method]) {
       callback(new Error(`Method ${method} is not defined on ${contractName}`));
       return;
     }
@@ -33,7 +33,7 @@ module.exports = async function(callback) {
     if (contractWrapper[method]) {
       func = contractWrapper[method];
     } else {
-      func = contractWrapper.functions[method];
+      func = contractWrapper.contract[method];
     }
     func.apply(contractWrapper, args).then((result) => {
       console.log("\nResult:");

scripts/current-address.js

@@ -1,9 +1,12 @@
 const knownDAOAddresses = require('../lib/addresses/dao.json');
 const knownKreditsKitAddresses = require('../lib/addresses/KreditsKit.json');
 const getNetworkId = require('./helpers/networkid.js')
+const ethers = require('ethers');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  let network = await provider.getNetwork();
+  let networkId = network.chainId;
 
   console.log('# All known DAO addresses');
   Object.keys(knownDAOAddresses).forEach((networkId) => {

scripts/deploy-kit.js

@@ -3,23 +3,33 @@ const deployDAOFactory = require('@aragon/os/scripts/deploy-daofactory.js')
 const fs = require('fs');
 const path = require('path');
 const argv = require('yargs').argv
-const namehash = require('ethers').utils.namehash;
+const ethers = require('ethers');
+const namehash = ethers.utils.namehash;
 
 const fileInject = require('./helpers/file_inject.js')
-const getNetworkId = require('./helpers/networkid.js')
 
 const DAOFactory = artifacts.require('DAOFactory')
 const KreditsKit = artifacts.require('KreditsKit')
 
 const arapp = require('../arapp.json')
 const environment = argv['network'] || argv['environment'] || 'development'
-const apm = arapp.environments[environment].apm
-const ensAddr = arapp.environments[environment].registry || process.env.ENS
-const daoFactoryAddress = arapp.environments[environment].daoFactory || process.env.DAO_FACTORY
 
+const kreditsArappConfig = arapp.environments[environment].kredits || {}
+
+// typically we use the open.aragonpm.eth aragonpm.
+const apm = kreditsArappConfig.apmDomain || argv['apmDomain'] || 'open.aragonpm.eth'
+
+// daoFactory is environment specific.
+// See https://github.com/aragon/deployments/tree/master/environments/ for the official daoFactory
+// Locally we deploy our own daoFactory and no daoFactory is required (`daoFactoryAddress` is null).
+const daoFactoryAddress = kreditsArappConfig.daoFactory || argv['daoFactory']
+
+const ensAddr = arapp.environments[environment].registry || argv['ensAddress']
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const network = await provider.getNetwork();
+  const networkId = network.chainId;
   console.log(`Deploying to networkId: ${networkId}`)
 
   if (!ensAddr) {

scripts/helpers/init_kredits.js

@@ -1,6 +1,5 @@
 const argv = require('yargs').argv;
 const ethers = require('ethers');
-const getNetworkId = require('./networkid.js');
 const Kredits = require('../../lib/kredits');
 
 const arapp = require('../../arapp.json');
@@ -10,7 +9,7 @@ const apm = arapp.environments[environment].apm;
 module.exports = async function(web3) {
   return new Promise((resolve, reject) => {
     const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-    let signer = provider.getSigner();
+    const signer = provider.getSigner();
     // checking if siner supports signing transactions
     signer.getAddress().then(_ => {
       new Kredits(provider, signer, { apm }).init().then(kredits => {

scripts/helpers/networkid.js

@@ -1,17 +0,0 @@
-module.exports = function(web3) {
-  return new Promise((resolve, reject) => {
-    let func;
-    if (web3.version.getNetwork) {
-      func = web3.version.getNetwork;
-    } else {
-      func = web3.eth.net.getId;
-    }
-    func((err, network) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(network);
-      }
-    })
-  })
-}

scripts/helpers/update_local_networkid.js

@@ -1,12 +1,14 @@
 const fs = require('fs');
-const getNetworkId = require('./networkid.js');
+const ethers = require('ethers');
 
 module.exports = async function(callback) {
   const daoAddressPath = 'lib/addresses/dao.json';
 
   // TODO maybe do the same for KreditsKit address file
   try {
-    const networkId = await getNetworkId(web3);
+    const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+    const network = await provider.getNetwork();
+    const networkId = network.chainId;
     const daoAddresses = JSON.parse(fs.readFileSync(daoAddressPath));
     const oldNetworkId = Math.max(...Object.keys(daoAddresses).map(a => parseInt(a)));
     const localDaoAddress = daoAddresses[oldNetworkId];

scripts/list-contributions.js

@@ -41,8 +41,8 @@ module.exports = async function(callback) {
 
     console.log(table.toString());
 
-    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.functions.totalKreditsEarned(false);
+    let totalKreditsEarnedUnConfirmed = await kredits.Contribution.contract.totalKreditsEarned(false);
-    let totalKreditsEarnedConfirmed = await kredits.Contribution.functions.totalKreditsEarned(true);
+    let totalKreditsEarnedConfirmed = await kredits.Contribution.contract.totalKreditsEarned(true);
     console.log(`Total Kredits: ${totalKreditsEarnedConfirmed} (confirmed) | ${totalKreditsEarnedUnConfirmed} (including unconfirmed)`);
   } catch (err) {
     console.log(err);

scripts/new-dao.js

@@ -3,13 +3,15 @@ const path = require('path');
 
 const ethers = require('ethers');
 const fileInject = require('./helpers/file_inject.js');
-const getNetworkId = require('./helpers/networkid.js');
 const KreditsKit = require('../lib/kreditskit');
 
 const addressesPath = path.join(__dirname, '..', 'lib/addresses');
 
 module.exports = async function(callback) {
-  const networkId = await getNetworkId(web3)
+  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
+  const signer = provider.getSigner();
+  const network = await provider.getNetwork();
+  const networkId = network.chainId;
   console.log(`Deploying to networkId: ${networkId}`)
 
   let kitAddresseFile = path.join(addressesPath, 'KreditsKit.json');
@@ -20,9 +22,6 @@ module.exports = async function(callback) {
   }
   console.log(`Using KreditsKit at: ${kreditsKitAddress}`);
 
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider);
-  let signer = provider.getSigner();
-
   let kit = await new KreditsKit(provider, signer).init()
 
   // TODO: get rid of the hard coded gas limit

scripts/seeds.js

@@ -38,7 +38,7 @@ module.exports = async function(callback) {
     if (contractWrapper[method]) {
       func = contractWrapper[method];
     } else {
-      func = contractWrapper.functions[method];
+      func = contractWrapper.contract[method];
     }
     func.apply(contractWrapper, args).then((result) => {
       console.log(`[OK] kredits.${contractName}.${method}(${JSON.stringify(args)}) => ${result.hash}`);

scripts/veto-contribution.js

@@ -15,7 +15,7 @@ module.exports = async function(callback) {
   console.log(`Recording a veto for contribution #${contributionId}`);
 
   try {
-    kredits.Contribution.functions.veto(contributionId, { gasLimit: 300000 })
+    kredits.Contribution.contract.veto(contributionId, { gasLimit: 300000 })
       .then(result => {
         console.log("\n\nResult:");
         console.log(result);