From b3a4a7c1abc4159f527bb7d9d1c3aa2ed50380a6 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Tue, 15 Mar 2022 18:58:55 -0400 Subject: [PATCH 1/8] feat(test): Got ipfs.js to 100% test coverage --- src/adapters/ipfs/ipfs.js | 36 ++++++++++++------------- test/unit/adapters/ipfs.adapter.unit.js | 35 ++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/src/adapters/ipfs/ipfs.js b/src/adapters/ipfs/ipfs.js index 2cf508d..c8506b0 100644 --- a/src/adapters/ipfs/ipfs.js +++ b/src/adapters/ipfs/ipfs.js @@ -102,9 +102,9 @@ class IpfsAdapter { console.error('Error in ipfs.js/start()') // If IPFS crashes because the /blocks directory is full, wipe the directory. - if (err.message.includes('No space left on device')) { - this.rmBlocksDir() - } + // if (err.message.includes('No space left on device')) { + // this.rmBlocksDir() + // } throw err } @@ -120,21 +120,21 @@ class IpfsAdapter { // Dev Note: It's assumed this node is not pinning any data and that // everything in this directory is transient. This folder will regularly // fill up and prevent IPFS from starting. - rmBlocksDir () { - try { - const dir = `${IPFS_DIR}/blocks` - console.log(`Deleting ${dir} directory...`) - - this.fs.rmdirSync(dir, { recursive: true }) - - console.log(`${dir} directory is deleted!`) - - return true // Signal successful execution. - } catch (err) { - console.log('Error in rmBlocksDir()') - throw err - } - } + // rmBlocksDir () { + // try { + // const dir = `${IPFS_DIR}/blocks` + // console.log(`Deleting ${dir} directory...`) + // + // this.fs.rmdirSync(dir, { recursive: true }) + // + // console.log(`${dir} directory is deleted!`) + // + // return true // Signal successful execution. + // } catch (err) { + // console.log('Error in rmBlocksDir()') + // throw err + // } + // } } module.exports = IpfsAdapter diff --git a/test/unit/adapters/ipfs.adapter.unit.js b/test/unit/adapters/ipfs.adapter.unit.js index eb7e2bc..f5da812 100644 --- a/test/unit/adapters/ipfs.adapter.unit.js +++ b/test/unit/adapters/ipfs.adapter.unit.js @@ -4,10 +4,11 @@ const assert = require('chai').assert const sinon = require('sinon') - const IPFSLib = require('../../../src/adapters/ipfs/ipfs') const IPFSMock = require('../mocks/ipfs-mock') +const config = require('../../../config') +// config.isProduction = true; describe('#IPFS-adapter', () => { let uut let sandbox @@ -18,8 +19,27 @@ describe('#IPFS-adapter', () => { sandbox = sinon.createSandbox() }) - afterEach(() => sandbox.restore()) + afterEach(() => { + sandbox.restore() + }) + describe('#Constructor', () => { + it('should instantiate IPFS Lib in dev mode.', async () => { + const _uut = new IPFSLib() + assert.exists(_uut) + assert.isFunction(_uut.start) + assert.isFunction(_uut.stop) + }) + + it('should instantiate dev IPFS Lib in production mode.', async () => { + config.isProduction = true + const _uut = new IPFSLib() + assert.exists(_uut) + assert.isFunction(_uut.start) + assert.isFunction(_uut.stop) + config.isProduction = false + }) + }) describe('#start', () => { it('should return a promise that resolves into an instance of IPFS.', async () => { // Mock dependencies. @@ -32,6 +52,17 @@ describe('#IPFS-adapter', () => { assert.property(result, 'config') }) + it('should return a promise that resolves into an instance of IPFS in production mode.', async () => { + // Mock dependencies. + uut.IPFS = IPFSMock + uut.config.isProduction = true + const result = await uut.start() + // console.log('result: ', result) + + assert.equal(uut.isReady, true) + + assert.property(result, 'config') + }) it('should catch and throw an error', async () => { try { From 13b3150f62050c8104b459587978b96ef606addc Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 18 Mar 2022 11:24:04 -0700 Subject: [PATCH 2/8] minor linting --- test/unit/adapters/ipfs.adapter.unit.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/unit/adapters/ipfs.adapter.unit.js b/test/unit/adapters/ipfs.adapter.unit.js index f5da812..72ffbda 100644 --- a/test/unit/adapters/ipfs.adapter.unit.js +++ b/test/unit/adapters/ipfs.adapter.unit.js @@ -23,7 +23,7 @@ describe('#IPFS-adapter', () => { sandbox.restore() }) - describe('#Constructor', () => { + describe('#constructor', () => { it('should instantiate IPFS Lib in dev mode.', async () => { const _uut = new IPFSLib() assert.exists(_uut) @@ -40,6 +40,7 @@ describe('#IPFS-adapter', () => { config.isProduction = false }) }) + describe('#start', () => { it('should return a promise that resolves into an instance of IPFS.', async () => { // Mock dependencies. @@ -52,6 +53,7 @@ describe('#IPFS-adapter', () => { assert.property(result, 'config') }) + it('should return a promise that resolves into an instance of IPFS in production mode.', async () => { // Mock dependencies. uut.IPFS = IPFSMock From 5d95109ad48e3e4343779c9c6fcbafbc7062f287 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 18 Mar 2022 11:24:15 -0700 Subject: [PATCH 3/8] more linting --- test/unit/adapters/ipfs.adapter.unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/adapters/ipfs.adapter.unit.js b/test/unit/adapters/ipfs.adapter.unit.js index 72ffbda..0a1519d 100644 --- a/test/unit/adapters/ipfs.adapter.unit.js +++ b/test/unit/adapters/ipfs.adapter.unit.js @@ -53,7 +53,7 @@ describe('#IPFS-adapter', () => { assert.property(result, 'config') }) - + it('should return a promise that resolves into an instance of IPFS in production mode.', async () => { // Mock dependencies. uut.IPFS = IPFSMock From e37223cc882ac3f88c68d8077c74f671371ed9dd Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sun, 20 Mar 2022 07:46:08 -0700 Subject: [PATCH 4/8] fix(deps): Updating bch-js --- package-lock.json | 539 +++------------------------------------------- package.json | 2 +- 2 files changed, 25 insertions(+), 516 deletions(-) diff --git a/package-lock.json b/package-lock.json index d94a0c1..cce14f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "5.3.2", + "@psf/bch-js": "6.2.1", "axios": "0.21.1", "bcryptjs": "2.4.3", "glob": "7.1.6", @@ -1485,18 +1485,17 @@ "license": "BSD-3-Clause" }, "node_modules/@psf/bch-js": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-5.3.2.tgz", - "integrity": "sha512-LzYekwuee+T8AEZ1MKBe5KnZKXzpRZ57SpXRL2S8qsHefokTIN+XnDPX7dsOFkN4VGGgyjYyZ33iN6xhOSHWJw==", + "version": "6.2.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.1.tgz", + "integrity": "sha512-sTqjbPkpfxrxu0WARZBf/t2K+Sz3Y4EpuzHlSZG2n4k7jKM+J8tQuh/stRsEXOl/ewwdVmjNIAcBx+Z+MkCtHQ==", + "license": "MIT", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", "@psf/bip21": "2.0.1", "@psf/bitcoincash-ops": "2.0.0", "@psf/bitcoincashjs-lib": "4.0.2", "@psf/coininfo": "4.0.0", - "@uppy/core": "1.10.4", - "@uppy/tus": "1.5.12", - "axios": "^0.21.4", + "axios": "0.26.1", "bc-bip68": "1.0.5", "bchaddrjs-slp": "0.2.5", "bigi": "1.4.2", @@ -1518,12 +1517,12 @@ } }, "node_modules/@psf/bch-js/node_modules/axios": { - "version": "0.21.4", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.26.1", + "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "license": "MIT", "dependencies": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.8" } }, "node_modules/@psf/bip21": { @@ -2039,12 +2038,6 @@ "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", "license": "MIT" }, - "node_modules/@types/tus-js-client": { - "version": "1.8.0", - "resolved": "http://94.130.170.209:4873/@types%2ftus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-lWxu5+6qfyfwsW99GzUeJ9y9JeOSSLduKxgYMvaYM7sGTDKZsrIIHTUbHI2P016xhXtu9NxmUM3GrB4i14ie4A==", - "license": "MIT" - }, "node_modules/@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "http://94.130.170.209:4873/@ungap%2fpromise-all-settled/-/promise-all-settled-1.1.2.tgz", @@ -2052,73 +2045,6 @@ "dev": true, "license": "ISC" }, - "node_modules/@uppy/companion-client": { - "version": "1.10.2", - "resolved": "http://94.130.170.209:4873/@uppy%2fcompanion-client/-/companion-client-1.10.2.tgz", - "integrity": "sha512-5RmsNF9UBvUqmqQz48SoiLvkpGmvQTgwNM4bJX8xwVozv/6goRpFrsMJGLwqFcHS/9xj6STKOqrM582g8exVwQ==", - "license": "MIT", - "dependencies": { - "@uppy/utils": "^3.6.2", - "namespace-emitter": "^2.0.1", - "qs-stringify": "^1.1.0", - "url-parse": "^1.4.7" - } - }, - "node_modules/@uppy/companion-client/node_modules/@uppy/utils": { - "version": "3.6.2", - "resolved": "http://94.130.170.209:4873/@uppy%2futils/-/utils-3.6.2.tgz", - "integrity": "sha512-wGTZma7eywIojfuE1vXlT0fxPSpmCRMkfgFWYc+6TL2FfGqWInmePoB+yal6/M2AnjeKHz6XYMhIpZkjOxFvcw==", - "license": "MIT", - "dependencies": { - "abortcontroller-polyfill": "^1.4.0", - "lodash.throttle": "^4.1.1" - } - }, - "node_modules/@uppy/core": { - "version": "1.10.4", - "resolved": "http://94.130.170.209:4873/@uppy%2fcore/-/core-1.10.4.tgz", - "integrity": "sha512-mORSXL4JyXHGo98u6u0sMzv3wtdI5jjHsqyThQAXx3LvctWE0EBrxE7vJqrXue2z/m9lovsZVhuzP2L7Qkuebg==", - "license": "MIT", - "dependencies": { - "@uppy/store-default": "^1.2.1", - "@uppy/utils": "^2.4.4", - "cuid": "^2.1.1", - "lodash.throttle": "^4.1.1", - "mime-match": "^1.0.2", - "namespace-emitter": "^2.0.1", - "preact": "8.2.9" - } - }, - "node_modules/@uppy/store-default": { - "version": "1.2.7", - "resolved": "http://94.130.170.209:4873/@uppy%2fstore-default/-/store-default-1.2.7.tgz", - "integrity": "sha512-58IG9yk/i/kYQ9uEwAwMFl1H2V3syOoODrYoFfVHlxaqv+9MkXBg2tHE2gk40iaAIxcCErcPxZkBOvkqzO1SQA==", - "license": "MIT" - }, - "node_modules/@uppy/tus": { - "version": "1.5.12", - "resolved": "http://94.130.170.209:4873/@uppy%2ftus/-/tus-1.5.12.tgz", - "integrity": "sha512-jDiwsTRHnMfb83ZB8JdDD0uA9DX0K/FqenGMYBGTOlkCjAcXD3sI59DzEHwq2TtY3ZH7iaL3fTNQ7ExBWkwrqw==", - "license": "MIT", - "dependencies": { - "@types/tus-js-client": "^1.8.0", - "@uppy/companion-client": "^1.4.4", - "@uppy/utils": "^2.4.4", - "tus-js-client": "^1.8.0" - }, - "peerDependencies": { - "@uppy/core": "^1.0.0" - } - }, - "node_modules/@uppy/utils": { - "version": "2.4.4", - "resolved": "http://94.130.170.209:4873/@uppy%2futils/-/utils-2.4.4.tgz", - "integrity": "sha512-7A0uwK5Rf8XcKqlpNUZ5L5LmkHT5c0/UWjDJGwmzeCxp2lECgzsMC+4vgA6kT4sFzPFbLtUtxHi7ecFwow3NQQ==", - "license": "MIT", - "dependencies": { - "lodash.throttle": "^4.1.1" - } - }, "node_modules/@vascosantos/moving-average": { "version": "1.1.0", "resolved": "http://94.130.170.209:4873/@vascosantos%2fmoving-average/-/moving-average-1.1.0.tgz", @@ -2152,12 +2078,6 @@ "get-iterator": "^1.0.2" } }, - "node_modules/abortcontroller-polyfill": { - "version": "1.7.3", - "resolved": "http://94.130.170.209:4873/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz", - "integrity": "sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==", - "license": "MIT" - }, "node_modules/abstract-leveldown": { "version": "7.2.0", "resolved": "http://94.130.170.209:4873/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz", @@ -3806,25 +3726,6 @@ "text-hex": "1.0.x" } }, - "node_modules/combine-errors": { - "version": "3.0.3", - "resolved": "http://94.130.170.209:4873/combine-errors/-/combine-errors-3.0.3.tgz", - "integrity": "sha1-9N9nQAg+VwOjGBEQwrEFUfAD2oY=", - "dependencies": { - "custom-error-instance": "2.1.1", - "lodash.uniqby": "4.5.0" - } - }, - "node_modules/combine-errors/node_modules/lodash.uniqby": { - "version": "4.5.0", - "resolved": "http://94.130.170.209:4873/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz", - "integrity": "sha1-o6F7v2LutiQPSRhG6XwcTipeHiE=", - "license": "MIT", - "dependencies": { - "lodash._baseiteratee": "~4.7.0", - "lodash._baseuniq": "~4.6.0" - } - }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "http://94.130.170.209:4873/combined-stream/-/combined-stream-1.0.8.tgz", @@ -4254,12 +4155,6 @@ "node": ">=8" } }, - "node_modules/cuid": { - "version": "2.1.8", - "resolved": "http://94.130.170.209:4873/cuid/-/cuid-2.1.8.tgz", - "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==", - "license": "MIT" - }, "node_modules/currently-unhandled": { "version": "0.4.1", "resolved": "http://94.130.170.209:4873/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -4273,12 +4168,6 @@ "node": ">=0.10.0" } }, - "node_modules/custom-error-instance": { - "version": "2.1.1", - "resolved": "http://94.130.170.209:4873/custom-error-instance/-/custom-error-instance-2.1.1.tgz", - "integrity": "sha1-PPY5FIemYppiR+sMoM4ACBt+Nho=", - "license": "ISC" - }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "http://94.130.170.209:4873/dashdash/-/dashdash-1.14.1.tgz", @@ -6473,9 +6362,9 @@ "license": "MIT" }, "node_modules/follow-redirects": { - "version": "1.14.6", - "resolved": "http://94.130.170.209:4873/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==", + "version": "1.14.9", + "resolved": "http://94.130.170.209:4873/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==", "funding": [ { "type": "individual", @@ -10338,12 +10227,6 @@ "node": ">=6" } }, - "node_modules/js-base64": { - "version": "2.6.4", - "resolved": "http://94.130.170.209:4873/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", - "license": "BSD-3-Clause" - }, "node_modules/js-sha256": { "version": "0.9.0", "resolved": "http://94.130.170.209:4873/js-sha256/-/js-sha256-0.9.0.tgz", @@ -11838,52 +11721,6 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, - "node_modules/lodash._baseiteratee": { - "version": "4.7.0", - "resolved": "http://94.130.170.209:4873/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz", - "integrity": "sha1-NKm1VDVycnw9sueO2uPA6eZr0QI=", - "license": "MIT", - "dependencies": { - "lodash._stringtopath": "~4.8.0" - } - }, - "node_modules/lodash._basetostring": { - "version": "4.12.0", - "resolved": "http://94.130.170.209:4873/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz", - "integrity": "sha1-kyfJ3FFYhmt/pLnUL0Y45XZt2d8=", - "license": "MIT" - }, - "node_modules/lodash._baseuniq": { - "version": "4.6.0", - "resolved": "http://94.130.170.209:4873/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz", - "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=", - "license": "MIT", - "dependencies": { - "lodash._createset": "~4.0.0", - "lodash._root": "~3.0.0" - } - }, - "node_modules/lodash._createset": { - "version": "4.0.3", - "resolved": "http://94.130.170.209:4873/lodash._createset/-/lodash._createset-4.0.3.tgz", - "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=", - "license": "MIT" - }, - "node_modules/lodash._root": { - "version": "3.0.1", - "resolved": "http://94.130.170.209:4873/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", - "license": "MIT" - }, - "node_modules/lodash._stringtopath": { - "version": "4.8.0", - "resolved": "http://94.130.170.209:4873/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz", - "integrity": "sha1-lBvPDmQmbl/B1m/tCmlZVExXaCQ=", - "license": "MIT", - "dependencies": { - "lodash._basetostring": "~4.12.0" - } - }, "node_modules/lodash.camelcase": { "version": "4.3.0", "resolved": "http://94.130.170.209:4873/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -12348,15 +12185,6 @@ "node": ">= 0.6" } }, - "node_modules/mime-match": { - "version": "1.0.2", - "resolved": "http://94.130.170.209:4873/mime-match/-/mime-match-1.0.2.tgz", - "integrity": "sha1-P4fDHprxpf1IX7nbE0Qosju7e6g=", - "license": "ISC", - "dependencies": { - "wildcard": "^1.1.0" - } - }, "node_modules/mime-types": { "version": "2.1.34", "resolved": "http://94.130.170.209:4873/mime-types/-/mime-types-2.1.34.tgz", @@ -13175,12 +13003,6 @@ "npm": ">=3.X.X" } }, - "node_modules/namespace-emitter": { - "version": "2.0.1", - "resolved": "http://94.130.170.209:4873/namespace-emitter/-/namespace-emitter-2.0.1.tgz", - "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==", - "license": "MIT" - }, "node_modules/nan": { "version": "2.15.0", "resolved": "http://94.130.170.209:4873/nan/-/nan-2.15.0.tgz", @@ -18277,13 +18099,6 @@ "semver-compare": "^1.0.0" } }, - "node_modules/preact": { - "version": "8.2.9", - "resolved": "http://94.130.170.209:4873/preact/-/preact-8.2.9.tgz", - "integrity": "sha512-ThuGXBmJS3VsT+jIP+eQufD3L8pRw/PY3FoCys6O9Pu6aF12Pn9zAJDX99TfwRAFOCEKm/P0lwiPTbqKMJp0fA==", - "hasInstallScript": true, - "license": "MIT" - }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "http://94.130.170.209:4873/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -18818,18 +18633,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/qs-stringify": { - "version": "1.2.1", - "resolved": "http://94.130.170.209:4873/qs-stringify/-/qs-stringify-1.2.1.tgz", - "integrity": "sha512-2N5xGLGZUxpgAYq1fD1LmBSCbxQVsXYt5JU0nU3FuPWO8PlCnKNFQwXkZgyB6mrTdg7IbexX4wxIR403dJw9pw==", - "license": "MIT" - }, - "node_modules/querystringify": { - "version": "2.2.0", - "resolved": "http://94.130.170.209:4873/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "license": "MIT" - }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "http://94.130.170.209:4873/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -19419,12 +19222,6 @@ "dev": true, "license": "ISC" }, - "node_modules/requires-port": { - "version": "1.0.0", - "resolved": "http://94.130.170.209:4873/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "license": "MIT" - }, "node_modules/resolve": { "version": "1.20.0", "resolved": "http://94.130.170.209:4873/resolve/-/resolve-1.20.0.tgz", @@ -21869,49 +21666,6 @@ "node": "*" } }, - "node_modules/tus-js-client": { - "version": "1.8.0", - "resolved": "http://94.130.170.209:4873/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-qPX3TywqzxocTxUZtcS8X7Aik72SVMa0jKi4hWyfvRV+s9raVzzYGaP4MoJGaF0yOgm2+b6jXaVEHogxcJ8LGw==", - "license": "MIT", - "dependencies": { - "buffer-from": "^0.1.1", - "combine-errors": "^3.0.3", - "extend": "^3.0.2", - "js-base64": "^2.4.9", - "lodash.throttle": "^4.1.1", - "proper-lockfile": "^2.0.1", - "url-parse": "^1.4.3" - } - }, - "node_modules/tus-js-client/node_modules/buffer-from": { - "version": "0.1.2", - "resolved": "http://94.130.170.209:4873/buffer-from/-/buffer-from-0.1.2.tgz", - "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==", - "license": "MIT" - }, - "node_modules/tus-js-client/node_modules/proper-lockfile": { - "version": "2.0.1", - "resolved": "http://94.130.170.209:4873/proper-lockfile/-/proper-lockfile-2.0.1.tgz", - "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=", - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.1.2", - "retry": "^0.10.0" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/tus-js-client/node_modules/retry": { - "version": "0.10.1", - "resolved": "http://94.130.170.209:4873/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", - "license": "MIT", - "engines": { - "node": "*" - } - }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "http://94.130.170.209:4873/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -22169,16 +21923,6 @@ "dev": true, "license": "MIT" }, - "node_modules/url-parse": { - "version": "1.5.4", - "resolved": "http://94.130.170.209:4873/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", - "license": "MIT", - "dependencies": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "node_modules/url-parse-lax": { "version": "3.0.0", "resolved": "http://94.130.170.209:4873/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -22479,12 +22223,6 @@ "bs58check": "<3.0.0" } }, - "node_modules/wildcard": { - "version": "1.1.2", - "resolved": "http://94.130.170.209:4873/wildcard/-/wildcard-1.1.2.tgz", - "integrity": "sha1-pwIEUwhNjNLv5wup02liY94XEKU=", - "license": "MIT" - }, "node_modules/winston": { "version": "3.3.3", "resolved": "http://94.130.170.209:4873/winston/-/winston-3.3.3.tgz", @@ -23979,18 +23717,16 @@ "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, "@psf/bch-js": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-5.3.2.tgz", - "integrity": "sha512-LzYekwuee+T8AEZ1MKBe5KnZKXzpRZ57SpXRL2S8qsHefokTIN+XnDPX7dsOFkN4VGGgyjYyZ33iN6xhOSHWJw==", + "version": "6.2.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.1.tgz", + "integrity": "sha512-sTqjbPkpfxrxu0WARZBf/t2K+Sz3Y4EpuzHlSZG2n4k7jKM+J8tQuh/stRsEXOl/ewwdVmjNIAcBx+Z+MkCtHQ==", "requires": { "@chris.troutner/bip32-utils": "1.0.5", "@psf/bip21": "2.0.1", "@psf/bitcoincash-ops": "2.0.0", "@psf/bitcoincashjs-lib": "4.0.2", "@psf/coininfo": "4.0.0", - "@uppy/core": "1.10.4", - "@uppy/tus": "1.5.12", - "axios": "^0.21.4", + "axios": "0.26.1", "bc-bip68": "1.0.5", "bchaddrjs-slp": "0.2.5", "bigi": "1.4.2", @@ -24012,11 +23748,11 @@ }, "dependencies": { "axios": { - "version": "0.21.4", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.21.4.tgz", - "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "version": "0.26.1", + "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "requires": { - "follow-redirects": "^1.14.0" + "follow-redirects": "^1.14.8" } } } @@ -24451,77 +24187,12 @@ "resolved": "http://94.130.170.209:4873/@types%2fretry/-/retry-0.12.1.tgz", "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==" }, - "@types/tus-js-client": { - "version": "1.8.0", - "resolved": "http://94.130.170.209:4873/@types%2ftus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-lWxu5+6qfyfwsW99GzUeJ9y9JeOSSLduKxgYMvaYM7sGTDKZsrIIHTUbHI2P016xhXtu9NxmUM3GrB4i14ie4A==" - }, "@ungap/promise-all-settled": { "version": "1.1.2", "resolved": "http://94.130.170.209:4873/@ungap%2fpromise-all-settled/-/promise-all-settled-1.1.2.tgz", "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, - "@uppy/companion-client": { - "version": "1.10.2", - "resolved": "http://94.130.170.209:4873/@uppy%2fcompanion-client/-/companion-client-1.10.2.tgz", - "integrity": "sha512-5RmsNF9UBvUqmqQz48SoiLvkpGmvQTgwNM4bJX8xwVozv/6goRpFrsMJGLwqFcHS/9xj6STKOqrM582g8exVwQ==", - "requires": { - "@uppy/utils": "^3.6.2", - "namespace-emitter": "^2.0.1", - "qs-stringify": "^1.1.0", - "url-parse": "^1.4.7" - }, - "dependencies": { - "@uppy/utils": { - "version": "3.6.2", - "resolved": "http://94.130.170.209:4873/@uppy%2futils/-/utils-3.6.2.tgz", - "integrity": "sha512-wGTZma7eywIojfuE1vXlT0fxPSpmCRMkfgFWYc+6TL2FfGqWInmePoB+yal6/M2AnjeKHz6XYMhIpZkjOxFvcw==", - "requires": { - "abortcontroller-polyfill": "^1.4.0", - "lodash.throttle": "^4.1.1" - } - } - } - }, - "@uppy/core": { - "version": "1.10.4", - "resolved": "http://94.130.170.209:4873/@uppy%2fcore/-/core-1.10.4.tgz", - "integrity": "sha512-mORSXL4JyXHGo98u6u0sMzv3wtdI5jjHsqyThQAXx3LvctWE0EBrxE7vJqrXue2z/m9lovsZVhuzP2L7Qkuebg==", - "requires": { - "@uppy/store-default": "^1.2.1", - "@uppy/utils": "^2.4.4", - "cuid": "^2.1.1", - "lodash.throttle": "^4.1.1", - "mime-match": "^1.0.2", - "namespace-emitter": "^2.0.1", - "preact": "8.2.9" - } - }, - "@uppy/store-default": { - "version": "1.2.7", - "resolved": "http://94.130.170.209:4873/@uppy%2fstore-default/-/store-default-1.2.7.tgz", - "integrity": "sha512-58IG9yk/i/kYQ9uEwAwMFl1H2V3syOoODrYoFfVHlxaqv+9MkXBg2tHE2gk40iaAIxcCErcPxZkBOvkqzO1SQA==" - }, - "@uppy/tus": { - "version": "1.5.12", - "resolved": "http://94.130.170.209:4873/@uppy%2ftus/-/tus-1.5.12.tgz", - "integrity": "sha512-jDiwsTRHnMfb83ZB8JdDD0uA9DX0K/FqenGMYBGTOlkCjAcXD3sI59DzEHwq2TtY3ZH7iaL3fTNQ7ExBWkwrqw==", - "requires": { - "@types/tus-js-client": "^1.8.0", - "@uppy/companion-client": "^1.4.4", - "@uppy/utils": "^2.4.4", - "tus-js-client": "^1.8.0" - } - }, - "@uppy/utils": { - "version": "2.4.4", - "resolved": "http://94.130.170.209:4873/@uppy%2futils/-/utils-2.4.4.tgz", - "integrity": "sha512-7A0uwK5Rf8XcKqlpNUZ5L5LmkHT5c0/UWjDJGwmzeCxp2lECgzsMC+4vgA6kT4sFzPFbLtUtxHi7ecFwow3NQQ==", - "requires": { - "lodash.throttle": "^4.1.1" - } - }, "@vascosantos/moving-average": { "version": "1.1.0", "resolved": "http://94.130.170.209:4873/@vascosantos%2fmoving-average/-/moving-average-1.1.0.tgz", @@ -24548,11 +24219,6 @@ "get-iterator": "^1.0.2" } }, - "abortcontroller-polyfill": { - "version": "1.7.3", - "resolved": "http://94.130.170.209:4873/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz", - "integrity": "sha512-zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q==" - }, "abstract-leveldown": { "version": "7.2.0", "resolved": "http://94.130.170.209:4873/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz", @@ -25729,26 +25395,6 @@ "text-hex": "1.0.x" } }, - "combine-errors": { - "version": "3.0.3", - "resolved": "http://94.130.170.209:4873/combine-errors/-/combine-errors-3.0.3.tgz", - "integrity": "sha1-9N9nQAg+VwOjGBEQwrEFUfAD2oY=", - "requires": { - "custom-error-instance": "2.1.1", - "lodash.uniqby": "4.5.0" - }, - "dependencies": { - "lodash.uniqby": { - "version": "4.5.0", - "resolved": "http://94.130.170.209:4873/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz", - "integrity": "sha1-o6F7v2LutiQPSRhG6XwcTipeHiE=", - "requires": { - "lodash._baseiteratee": "~4.7.0", - "lodash._baseuniq": "~4.6.0" - } - } - } - }, "combined-stream": { "version": "1.0.8", "resolved": "http://94.130.170.209:4873/combined-stream/-/combined-stream-1.0.8.tgz", @@ -26076,11 +25722,6 @@ "resolved": "http://94.130.170.209:4873/crypto-random-string/-/crypto-random-string-2.0.0.tgz", "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==" }, - "cuid": { - "version": "2.1.8", - "resolved": "http://94.130.170.209:4873/cuid/-/cuid-2.1.8.tgz", - "integrity": "sha512-xiEMER6E7TlTPnDxrM4eRiC6TRgjNX9xzEZ5U/Se2YJKr7Mq4pJn/2XEHjl3STcSh96GmkHPcBXLES8M29wyyg==" - }, "currently-unhandled": { "version": "0.4.1", "resolved": "http://94.130.170.209:4873/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -26090,11 +25731,6 @@ "array-find-index": "^1.0.1" } }, - "custom-error-instance": { - "version": "2.1.1", - "resolved": "http://94.130.170.209:4873/custom-error-instance/-/custom-error-instance-2.1.1.tgz", - "integrity": "sha1-PPY5FIemYppiR+sMoM4ACBt+Nho=" - }, "dashdash": { "version": "1.14.1", "resolved": "http://94.130.170.209:4873/dashdash/-/dashdash-1.14.1.tgz", @@ -27712,9 +27348,9 @@ "integrity": "sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU=" }, "follow-redirects": { - "version": "1.14.6", - "resolved": "http://94.130.170.209:4873/follow-redirects/-/follow-redirects-1.14.6.tgz", - "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" + "version": "1.14.9", + "resolved": "http://94.130.170.209:4873/follow-redirects/-/follow-redirects-1.14.9.tgz", + "integrity": "sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==" }, "for-each": { "version": "0.3.3", @@ -30563,11 +30199,6 @@ "resolved": "http://94.130.170.209:4873/joycon/-/joycon-2.2.5.tgz", "integrity": "sha512-YqvUxoOcVPnCp0VU1/56f+iKSdvIRJYPznH22BdXV3xMk75SFXhWeJkZ8C9XxUWt1b5x2X1SxuFygW1U0FmkEQ==" }, - "js-base64": { - "version": "2.6.4", - "resolved": "http://94.130.170.209:4873/js-base64/-/js-base64-2.6.4.tgz", - "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==" - }, "js-sha256": { "version": "0.9.0", "resolved": "http://94.130.170.209:4873/js-sha256/-/js-sha256-0.9.0.tgz", @@ -31739,46 +31370,6 @@ "resolved": "http://94.130.170.209:4873/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, - "lodash._baseiteratee": { - "version": "4.7.0", - "resolved": "http://94.130.170.209:4873/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz", - "integrity": "sha1-NKm1VDVycnw9sueO2uPA6eZr0QI=", - "requires": { - "lodash._stringtopath": "~4.8.0" - } - }, - "lodash._basetostring": { - "version": "4.12.0", - "resolved": "http://94.130.170.209:4873/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz", - "integrity": "sha1-kyfJ3FFYhmt/pLnUL0Y45XZt2d8=" - }, - "lodash._baseuniq": { - "version": "4.6.0", - "resolved": "http://94.130.170.209:4873/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz", - "integrity": "sha1-DrtE5FaBSveQXGIS+iybLVG4Qeg=", - "requires": { - "lodash._createset": "~4.0.0", - "lodash._root": "~3.0.0" - } - }, - "lodash._createset": { - "version": "4.0.3", - "resolved": "http://94.130.170.209:4873/lodash._createset/-/lodash._createset-4.0.3.tgz", - "integrity": "sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=" - }, - "lodash._root": { - "version": "3.0.1", - "resolved": "http://94.130.170.209:4873/lodash._root/-/lodash._root-3.0.1.tgz", - "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" - }, - "lodash._stringtopath": { - "version": "4.8.0", - "resolved": "http://94.130.170.209:4873/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz", - "integrity": "sha1-lBvPDmQmbl/B1m/tCmlZVExXaCQ=", - "requires": { - "lodash._basetostring": "~4.12.0" - } - }, "lodash.camelcase": { "version": "4.3.0", "resolved": "http://94.130.170.209:4873/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", @@ -32115,14 +31706,6 @@ "resolved": "http://94.130.170.209:4873/mime-db/-/mime-db-1.51.0.tgz", "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==" }, - "mime-match": { - "version": "1.0.2", - "resolved": "http://94.130.170.209:4873/mime-match/-/mime-match-1.0.2.tgz", - "integrity": "sha1-P4fDHprxpf1IX7nbE0Qosju7e6g=", - "requires": { - "wildcard": "^1.1.0" - } - }, "mime-types": { "version": "2.1.34", "resolved": "http://94.130.170.209:4873/mime-types/-/mime-types-2.1.34.tgz", @@ -32685,11 +32268,6 @@ "resolved": "http://94.130.170.209:4873/mutable-proxy/-/mutable-proxy-1.0.0.tgz", "integrity": "sha512-4OvNRr1DJpy2QuDUV74m+BWZ//n4gG4bmd21MzDSPqHEidIDWqwyOjcadU1LBMO3vXYGurVKjfBrxrSQIHFu9A==" }, - "namespace-emitter": { - "version": "2.0.1", - "resolved": "http://94.130.170.209:4873/namespace-emitter/-/namespace-emitter-2.0.1.tgz", - "integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==" - }, "nan": { "version": "2.15.0", "resolved": "http://94.130.170.209:4873/nan/-/nan-2.15.0.tgz", @@ -36307,11 +35885,6 @@ "semver-compare": "^1.0.0" } }, - "preact": { - "version": "8.2.9", - "resolved": "http://94.130.170.209:4873/preact/-/preact-8.2.9.tgz", - "integrity": "sha512-ThuGXBmJS3VsT+jIP+eQufD3L8pRw/PY3FoCys6O9Pu6aF12Pn9zAJDX99TfwRAFOCEKm/P0lwiPTbqKMJp0fA==" - }, "prelude-ls": { "version": "1.2.1", "resolved": "http://94.130.170.209:4873/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -36705,16 +36278,6 @@ "side-channel": "^1.0.4" } }, - "qs-stringify": { - "version": "1.2.1", - "resolved": "http://94.130.170.209:4873/qs-stringify/-/qs-stringify-1.2.1.tgz", - "integrity": "sha512-2N5xGLGZUxpgAYq1fD1LmBSCbxQVsXYt5JU0nU3FuPWO8PlCnKNFQwXkZgyB6mrTdg7IbexX4wxIR403dJw9pw==" - }, - "querystringify": { - "version": "2.2.0", - "resolved": "http://94.130.170.209:4873/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" - }, "queue-microtask": { "version": "1.2.3", "resolved": "http://94.130.170.209:4873/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -37124,11 +36687,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, - "requires-port": { - "version": "1.0.0", - "resolved": "http://94.130.170.209:4873/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" - }, "resolve": { "version": "1.20.0", "resolved": "http://94.130.170.209:4873/resolve/-/resolve-1.20.0.tgz", @@ -38929,41 +38487,6 @@ "safe-buffer": "^5.0.1" } }, - "tus-js-client": { - "version": "1.8.0", - "resolved": "http://94.130.170.209:4873/tus-js-client/-/tus-js-client-1.8.0.tgz", - "integrity": "sha512-qPX3TywqzxocTxUZtcS8X7Aik72SVMa0jKi4hWyfvRV+s9raVzzYGaP4MoJGaF0yOgm2+b6jXaVEHogxcJ8LGw==", - "requires": { - "buffer-from": "^0.1.1", - "combine-errors": "^3.0.3", - "extend": "^3.0.2", - "js-base64": "^2.4.9", - "lodash.throttle": "^4.1.1", - "proper-lockfile": "^2.0.1", - "url-parse": "^1.4.3" - }, - "dependencies": { - "buffer-from": { - "version": "0.1.2", - "resolved": "http://94.130.170.209:4873/buffer-from/-/buffer-from-0.1.2.tgz", - "integrity": "sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==" - }, - "proper-lockfile": { - "version": "2.0.1", - "resolved": "http://94.130.170.209:4873/proper-lockfile/-/proper-lockfile-2.0.1.tgz", - "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=", - "requires": { - "graceful-fs": "^4.1.2", - "retry": "^0.10.0" - } - }, - "retry": { - "version": "0.10.1", - "resolved": "http://94.130.170.209:4873/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" - } - } - }, "tweetnacl": { "version": "0.14.5", "resolved": "http://94.130.170.209:4873/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -39154,15 +38677,6 @@ "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==", "dev": true }, - "url-parse": { - "version": "1.5.4", - "resolved": "http://94.130.170.209:4873/url-parse/-/url-parse-1.5.4.tgz", - "integrity": "sha512-ITeAByWWoqutFClc/lRZnFplgXgEZr3WJ6XngMM/N9DMIm4K8zXPCZ1Jdu0rERwO84w1WC5wkle2ubwTA4NTBg==", - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, "url-parse-lax": { "version": "3.0.0", "resolved": "http://94.130.170.209:4873/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -39382,11 +38896,6 @@ "bs58check": "<3.0.0" } }, - "wildcard": { - "version": "1.1.2", - "resolved": "http://94.130.170.209:4873/wildcard/-/wildcard-1.1.2.tgz", - "integrity": "sha1-pwIEUwhNjNLv5wup02liY94XEKU=" - }, "winston": { "version": "3.3.3", "resolved": "http://94.130.170.209:4873/winston/-/winston-3.3.3.tgz", diff --git a/package.json b/package.json index 15924b2..e5b917d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "repository": "Permissionless-Software-Foundation/ipfs-service-provider", "dependencies": { - "@psf/bch-js": "5.3.2", + "@psf/bch-js": "6.2.1", "axios": "0.21.1", "bcryptjs": "2.4.3", "glob": "7.1.6", From 7e3ce1564dd83883a5943760fc80bef4a5916bdd Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Fri, 25 Mar 2022 22:12:11 -0400 Subject: [PATCH 5/8] feat(coverage): Got ipfs-coord.js to 100% test coverage --- test/unit/adapters/ipfs-coord.adapter.unit.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/unit/adapters/ipfs-coord.adapter.unit.js b/test/unit/adapters/ipfs-coord.adapter.unit.js index 3900f00..d839c05 100644 --- a/test/unit/adapters/ipfs-coord.adapter.unit.js +++ b/test/unit/adapters/ipfs-coord.adapter.unit.js @@ -8,6 +8,7 @@ const sinon = require('sinon') const IPFSCoordAdapter = require('../../../src/adapters/ipfs/ipfs-coord') const IPFSMock = require('../mocks/ipfs-mock') const IPFSCoordMock = require('../mocks/ipfs-coord-mock') +const config = require('../../../config') describe('#IPFS', () => { let uut @@ -61,6 +62,16 @@ describe('#IPFS', () => { assert.equal(result, true) }) + it('should return a promise that resolves into an instance of IPFS in production mode', async () => { + uut.config.isProduction = true + // Mock dependencies. + uut.IpfsCoord = IPFSCoordMock + + const result = await uut.start() + // console.log('result: ', result) + assert.equal(result, true) + config.isProduction = false + }) }) describe('#attachRPCRouter', () => { From a3cea782bad139d21dfa48545ffe6f2021ab4985 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 16 May 2022 12:14:20 -0700 Subject: [PATCH 6/8] fix(bch-js): Updating to v6.4.1 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index cce14f9..d162bfc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "6.2.1", + "@psf/bch-js": "6.4.1", "axios": "0.21.1", "bcryptjs": "2.4.3", "glob": "7.1.6", @@ -1485,9 +1485,9 @@ "license": "BSD-3-Clause" }, "node_modules/@psf/bch-js": { - "version": "6.2.1", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.1.tgz", - "integrity": "sha512-sTqjbPkpfxrxu0WARZBf/t2K+Sz3Y4EpuzHlSZG2n4k7jKM+J8tQuh/stRsEXOl/ewwdVmjNIAcBx+Z+MkCtHQ==", + "version": "6.4.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.4.1.tgz", + "integrity": "sha512-/BLGzWH02VqaDNeY05QGMhrCtYDw5bXn45Egz+L5FLcyZaOqONR4kl80T6a8xvTPcREO4R+AjGTRBpfjdikwpA==", "license": "MIT", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", @@ -23717,9 +23717,9 @@ "integrity": "sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=" }, "@psf/bch-js": { - "version": "6.2.1", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.1.tgz", - "integrity": "sha512-sTqjbPkpfxrxu0WARZBf/t2K+Sz3Y4EpuzHlSZG2n4k7jKM+J8tQuh/stRsEXOl/ewwdVmjNIAcBx+Z+MkCtHQ==", + "version": "6.4.1", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.4.1.tgz", + "integrity": "sha512-/BLGzWH02VqaDNeY05QGMhrCtYDw5bXn45Egz+L5FLcyZaOqONR4kl80T6a8xvTPcREO4R+AjGTRBpfjdikwpA==", "requires": { "@chris.troutner/bip32-utils": "1.0.5", "@psf/bip21": "2.0.1", diff --git a/package.json b/package.json index e5b917d..acbd5ad 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ }, "repository": "Permissionless-Software-Foundation/ipfs-service-provider", "dependencies": { - "@psf/bch-js": "6.2.1", + "@psf/bch-js": "6.4.1", "axios": "0.21.1", "bcryptjs": "2.4.3", "glob": "7.1.6", From fb10e102267ea98f2a6ac528c9e1cc6821d9a968 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 16 May 2022 12:30:58 -0700 Subject: [PATCH 7/8] fix(production): Updating docker images --- production/docker/Dockerfile | 2 +- production/docker/docker-compose.yml | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/production/docker/Dockerfile b/production/docker/Dockerfile index 1a7a9ed..3950749 100644 --- a/production/docker/Dockerfile +++ b/production/docker/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update RUN apt-get install -y sudo git curl nano gnupg wget #Install Node and NPM -RUN curl -sL https://deb.nodesource.com/setup_14.x -o nodesource_setup.sh +RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh RUN bash nodesource_setup.sh RUN apt-get install -y nodejs build-essential diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index 24fbd69..fdada55 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -14,7 +14,7 @@ services: restart: always ipfs: - image: ipfs/go-ipfs:v0.11.0 + image: ipfs/go-ipfs:v0.12.0 container_name: ipfs environment: MY_ENV_VAR: 'placeholder' @@ -30,7 +30,7 @@ services: - 172.17.0.1:8080:8080 volumes: - ../data/go-ipfs/data:/data/ipfs - - ../data/go-ipfs/export:/export + - ../../swarm.key:/data/ipfs/swarm.key # https://docs.docker.com/compose/compose-file/compose-file-v3/#command # https://github.com/ipfs/go-ipfs/blob/91c52657166bcf86f2476926e4fe56694dc26562/Dockerfile#L115 command: @@ -43,7 +43,8 @@ services: restart: always ipfs-service: - build: . + #build: . + image: christroutner/ipfs-service-provider:v2.2.1 container_name: ipfs-service logging: driver: 'json-file' From bec7c11e46c4d65bfe50e813b5d9c0d2690d8bcf Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Mon, 16 May 2022 12:31:53 -0700 Subject: [PATCH 8/8] Updating README --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1992e27..ab98d94 100644 --- a/README.md +++ b/README.md @@ -71,13 +71,11 @@ npm install The [docker](./production/docker) directory contains a Dockerfile for building a production deployment. ``` -docker-compose build --no-cache +docker-compose pull docker-compose up -d ``` -- Bring the containers up once, then take them back down with `docker-compose down`. -- Copy the [swarm.key](./swarm.key) file to `ipfs-service-provider/production/data/go-ipfs/data/swarm.key`. -- Bring the containers back up with `docker-compose up -d`. +You can bring the containers back up with `docker-compose up -d`. ### Operation Notes