Merge branch 'master' into greenkeeper/nock-11.7.0

This commit is contained in:
Chris Troutner
2020-01-11 11:44:32 -08:00
83 changed files with 2830 additions and 20702 deletions
+5 -9
View File
@@ -11,7 +11,6 @@
"start": "node ./src/app.js",
"dev": "nodemon ./dist/app.js",
"test": "npm run test-v3",
"test-v2": "export NETWORK=testnet && nyc --reporter=text mocha --timeout 25000 test/v2/",
"test-v3": "export NETWORK=mainnet && nyc --reporter=text mocha --timeout 25000 test/v3/",
"test:integration": "mocha test/v3/integration",
"coverage": "nyc report --reporter=text-lcov | coveralls",
@@ -22,8 +21,8 @@
"node": ">=10.15.1"
},
"dependencies": {
"@chris.troutner/bch-js": "^1.6.1",
"apidoc": "^0.17.7",
"apidoc": "^0.18.0",
"@chris.troutner/bch-js": "^2.0.0",
"axios": "^0.19.0",
"body-parser": "^1.18.3",
"cookie-parser": "~1.4.3",
@@ -44,8 +43,6 @@
"passport-http": "^0.3.0",
"pg": "^7.11.0",
"pg-hstore": "^2.3.2",
"slp-sdk": "^4.4.1",
"slpjs": "0.21.4",
"strftime": "^0.10.0",
"winston": "^3.2.1",
"winston-daily-rotate-file": "^4.0.0"
@@ -62,14 +59,13 @@
"fs-extra": "^8.0.1",
"nock": "^11.7.0",
"node-mocks-http": "^1.7.0",
"nodemon": "^1.18.1",
"nyc": "^14.1.1",
"nyc": "^15.0.0",
"prettier": "^1.18.2",
"proxyquire": "^2.1.0",
"request": "^2.88.0",
"request-promise": "^4.2.2",
"semantic-release": "^15.13.19",
"sinon": "^7.3.2",
"sinon": "^8.0.0",
"semantic-release": "^16.0.0",
"typescript": "^3.1.4"
},
"release": {