Some required dependency updates #194

Merged
bumi merged 8 commits from updates into master 2020-05-07 08:08:27 +00:00
6 changed files with 2517 additions and 312 deletions

View File

@ -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:

View File

@ -1,3 +1,4 @@
{
"4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4"
"4": "0x76e069b47b79442657eaf0555a32c6b16fa1b8b4",
"18335577": "0xeE10a87d8D758B563E301F5C5d029bDD21166DCC"
}

View File

@ -1,3 +1,4 @@
{
"4": "0xc34edf7d11b7f8433d597f0bb0697acdff55ef14"
"4": "0xc34edf7d11b7f8433d597f0bb0697acdff55ef14",
"18335577": "0x29E33B66108fa2DC3a018f3DdE41D295eB0922D5"
}

2805
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{
"name": "kredits-contracts",
"version": "5.4.0",
"version": "5.5.0",
"description": "Ethereum contracts and npm wrapper for Kredits",
"main": "./lib/kredits.js",
"directories": {
@ -43,7 +43,7 @@
"homepage": "https://github.com/67P/truffle-kredits#readme",
"devDependencies": {
"@aragon/kits-base": "^1.0.0",
"@aragon/os": "^4.3.0",
"@aragon/os": "^4.4.0",
"async-each-series": "^1.1.0",
"cli-table": "^0.3.1",
"eslint": "^6.8.0",
@ -51,14 +51,17 @@
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-promise": "^4.2.1",
"eth-provider": "^0.2.5",
"homedir": "^0.6.0",
"promptly": "^3.0.3",
"solc": "^0.4.26",
"solhint": "^2.3.0",
"truffle-hdwallet-provider": "^1.0.17",
"truffle-hdwallet-provider-privkey": "^0.3.0",
"yargs": "^12.0.0"
},
"dependencies": {
"ethers": "^4.0.46",
"ipfs-http-client": "^41.0.1",
"ethers": "^4.0.44",
"kosmos-schemas": "^2.1.0",
"node-fetch": "^2.6.0",
"tv4": "^1.3.0"

View File

@ -14,7 +14,7 @@ const KreditsKit = artifacts.require('KreditsKit')
const arapp = require('../arapp.json')
const environment = argv['network'] || argv['environment'] || 'development'
const kreditsArappConfig = (arapp.environments[environment].kredits || {}
const kreditsArappConfig = arapp.environments[environment].kredits || {}
// typically we use the open.aragonpm.eth aragonpm.
const apm = kreditsArappConfig.apmDomain || argv['apmDomain'] || 'open.aragonpm.eth'