Merge branch 'master' into contribution-contract

* master:
  Update truffle and ganache-cli
This commit is contained in:
bumi 2018-09-29 19:54:28 +02:00
commit d687ff604e
2 changed files with 449 additions and 4414 deletions

4856
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,8 @@
}, },
"scripts": { "scripts": {
"build-json": "truffle compile && node ./scripts/build-json.js", "build-json": "truffle compile && node ./scripts/build-json.js",
"bootstrap": "truffle migrate --reset && npm run build-json && truffle exec scripts/seeds.js", "reset": "truffle migrate --reset && npm run build-json",
"bootstrap": "npm run reset && truffle exec scripts/seeds.js",
"ganache": "ganache-cli -p 7545 -i 100 --db=./.ganache-db -m kredits", "ganache": "ganache-cli -p 7545 -i 100 --db=./.ganache-db -m kredits",
"dev": "truffle migrate && npm run build-json", "dev": "truffle migrate && npm run build-json",
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
@ -25,9 +26,9 @@
"homepage": "https://github.com/67P/truffle-kredits#readme", "homepage": "https://github.com/67P/truffle-kredits#readme",
"devDependencies": { "devDependencies": {
"async-each-series": "^1.1.0", "async-each-series": "^1.1.0",
"ganache-cli": "^6.0.3", "ganache-cli": "^6.1.8",
"promptly": "^3.0.3", "promptly": "^3.0.3",
"truffle": "^4.1.3", "truffle": "^4.1.14",
"zeppelin-solidity": "^1.7.0" "zeppelin-solidity": "^1.7.0"
}, },
"dependencies": { "dependencies": {