From 84dfd5691854e5d7b0253e0018b695182832e97d Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 11 Mar 2022 08:25:35 -0800 Subject: [PATCH] Fixing dependencies --- dev-docs/README.md | 6 +- package-lock.json | 200 ++++++++++++++++++++++++++++++++------------- package.json | 4 +- 3 files changed, 150 insertions(+), 60 deletions(-) diff --git a/dev-docs/README.md b/dev-docs/README.md index 99f2b03..62562dc 100644 --- a/dev-docs/README.md +++ b/dev-docs/README.md @@ -10,16 +10,16 @@ There are three major pieces of software behind the bch-dex concept. They work t ![bch-dex major subcomponents](./diagrams/software-interaction.png) -- _Client_ could be a web browser, or a command-line client like [psf-bch-wallet](https://github.com/Permissionless-Software-Foundation/psf-bch-wallet) or [psf-avax-wallet](https://github.com/Permissionless-Software-Foundation/psf-avax-wallet). +- _Client_ could be a web browser like [wallet.fullstack.cash](https://bchn-wallet.fullstack.cash), or a command-line client like [psf-bch-wallet](https://github.com/Permissionless-Software-Foundation/psf-bch-wallet) or [psf-avax-wallet](https://github.com/Permissionless-Software-Foundation/psf-avax-wallet). - [bch-dex](https://github.com/Permissionless-Software-Foundation/bch-dex) is the back end REST API that maintains a local database of information that the client reads from. - [P2WDB](https://github.com/Permissionless-Software-Foundation/ipfs-p2wdb-service) is the pay-to-write global database with a REST API for interfacing with the other two pieces of software. The arrows in the image represent the information flow between the three pieces of software: - The _Client_ is essentially a 'dummy terminal' with a bidirectional interface to bch-dex. bch-dex does the heavy lifting, and the _Client_ is a 'thin' UI wrapper. -- `bch-dex` imports data from the global P2WDB database into its local database, using a [webhook](https://en.wikipedia.org/wiki/Webhook) (dashed line). It can also custody funds, pay transaction fees, and create an _Offer_ by submitting the data to the P2WDB to generate an _Order_ (solid line). +- `bch-dex` imports data from the global P2WDB database into its local database, using a [webhook](https://en.wikipedia.org/wiki/Webhook) (dashed line). It can also custody funds, pay transaction fees, and create an _Order_ by submitting the data to the P2WDB to generate an _Offer_ (solid line). -This architecture keeps the global database highly censorship resistant, while allowing local installations to maintain tight control over the user experience. The goal is to have many redundant copies of `bch-dex` on the network, and to empower individual traders to run their own, private copy. +This architecture keeps the global database highly censorship resistant, while allowing local installations to maintain tight control over the user experience. The goal is to have many redundant copies of `bch-dex` on the network, and to empower individual traders to run their own, private copy, while maintaining a single source of truth via the P2WDB. # Back End diff --git a/package-lock.json b/package-lock.json index 6007d75..e002ed8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "../bch-js", + "@psf/bch-js": "5.4.0", "axios": "0.21.1", "bch-message-lib": "2.1.4", "bcryptjs": "2.4.3", @@ -33,7 +33,7 @@ "koa2-ratelimit": "0.9.1", "libp2p": "^0.36.2", "line-reader": "0.4.0", - "minimal-slp-wallet": "../minimal-slp-wallet", + "minimal-slp-wallet": "4.4.3", "mongoose": "5.13.13", "node-fetch": "npm:@achingbrain/node-fetch@2.6.7", "nodemailer": "6.4.17", @@ -67,6 +67,7 @@ "../bch-js": { "name": "@psf/bch-js", "version": "5.0.0", + "extraneous": true, "license": "MIT", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", @@ -74,8 +75,6 @@ "@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", "bc-bip68": "1.0.5", "bchaddrjs-slp": "0.2.5", @@ -97,7 +96,7 @@ "wif": "2.0.6" }, "devDependencies": { - "apidoc": "0.17.7", + "apidoc": "^0.50.5", "assert": "2.0.0", "chai": "4.1.2", "coveralls": "3.0.2", @@ -109,19 +108,20 @@ "eslint-plugin-standard": "4.0.0", "husky": "^4.3.8", "lodash.clonedeep": "4.5.0", - "mocha": "9.1.3", + "mocha": "^9.2.1", "node-mocks-http": "1.7.0", "nyc": "15.1.0", - "semantic-release": "18.0.0", + "semantic-release": "^19.0.2", "sinon": "9.2.2", "standard": "^16.0.4" } }, "../minimal-slp-wallet": { "version": "4.0.0", + "extraneous": true, "license": "MIT", "dependencies": { - "@psf/bch-js": "5.3.2", + "@psf/bch-js": "../bch-js", "apidoc": "0.25.0", "bch-consumer": "1.2.0", "bch-donation": "1.1.1", @@ -139,9 +139,9 @@ "eslint-plugin-standard": "4.0.1", "husky": "4.3.8", "lodash.clonedeep": "4.5.0", - "mocha": "8.2.0", + "mocha": "^9.2.1", "nyc": "15.1.0", - "semantic-release": "17.4.4", + "semantic-release": "^19.0.2", "sinon": "9.2.0", "standard": "16.0.4", "tinyify": "3.0.0" @@ -1603,8 +1603,60 @@ "license": "BSD-3-Clause" }, "node_modules/@psf/bch-js": { - "resolved": "../bch-js", - "link": true + "version": "5.4.0", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-5.4.0.tgz", + "integrity": "sha512-HyBCpobC9moxSbQl4k/tb/GW9p8L12Fu+8yR1x8eflxBe7c2bwBlG218LmuoNcvjJMAdDxk0VEHvtO64vpltsw==", + "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", + "axios": "^0.21.4", + "bc-bip68": "1.0.5", + "bchaddrjs-slp": "0.2.5", + "bigi": "1.4.2", + "bignumber.js": "9.0.0", + "bip-schnorr": "0.3.0", + "bip38": "2.0.2", + "bip39": "3.0.2", + "bip66": "1.1.5", + "bitcoinjs-message": "2.0.0", + "bs58": "4.0.1", + "ecashaddrjs": "1.0.7", + "ini": "1.3.8", + "randombytes": "2.0.6", + "safe-buffer": "5.1.2", + "satoshi-bitcoin": "1.0.4", + "slp-mdm": "0.0.6", + "slp-parser": "0.0.4", + "wif": "2.0.6" + } + }, + "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==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.14.0" + } + }, + "node_modules/@psf/bch-js/node_modules/randombytes": { + "version": "2.0.6", + "resolved": "http://94.130.170.209:4873/randombytes/-/randombytes-2.0.6.tgz", + "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", + "license": "MIT", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/@psf/bch-js/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "http://94.130.170.209:4873/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" }, "node_modules/@psf/bip21": { "version": "2.0.1", @@ -12969,8 +13021,39 @@ } }, "node_modules/minimal-slp-wallet": { - "resolved": "../minimal-slp-wallet", - "link": true + "version": "4.4.3", + "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-4.4.3.tgz", + "integrity": "sha512-wpELTh4WYems96SxyRW/KdglJ6T3ieR7VVDCLcqq7bwZ+tJXFznOxDRggS5sREI9tTxiAHIyVSg+nbXZZk8buQ==", + "license": "MIT", + "dependencies": { + "@psf/bch-js": "5.4.0", + "apidoc": "0.25.0", + "bch-consumer": "1.2.0", + "bch-donation": "1.1.1", + "crypto-js": "4.0.0" + } + }, + "node_modules/minimal-slp-wallet/node_modules/apidoc": { + "version": "0.25.0", + "resolved": "http://94.130.170.209:4873/apidoc/-/apidoc-0.25.0.tgz", + "integrity": "sha512-5g9fp8OffXZOdBTzm4BBvV5Vw54s+NmKnGZIUKuH+gRTqqJuRJpcGN6sz6WnjJ+NcvXhB7rIRp6FhtJahazx2Q==", + "license": "MIT", + "dependencies": { + "apidoc-core": "^0.12.0", + "commander": "^2.20.0", + "fs-extra": "^9.0.1", + "handlebars": "^4.7.6", + "lodash": "^4.17.20", + "markdown-it": "^11.0.0", + "nodemon": "^2.0.4", + "winston": "^3.3.3" + }, + "bin": { + "apidoc": "bin/apidoc" + }, + "engines": { + "node": ">= 0.10.0" + } }, "node_modules/minimalistic-assert": { "version": "1.0.1", @@ -23318,17 +23401,15 @@ "version": "1.1.0" }, "@psf/bch-js": { - "version": "file:../bch-js", + "version": "5.4.0", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-5.4.0.tgz", + "integrity": "sha512-HyBCpobC9moxSbQl4k/tb/GW9p8L12Fu+8yR1x8eflxBe7c2bwBlG218LmuoNcvjJMAdDxk0VEHvtO64vpltsw==", "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", - "apidoc": "0.17.7", - "assert": "2.0.0", "axios": "^0.21.4", "bc-bip68": "1.0.5", "bchaddrjs-slp": "0.2.5", @@ -23340,30 +23421,37 @@ "bip66": "1.1.5", "bitcoinjs-message": "2.0.0", "bs58": "4.0.1", - "chai": "4.1.2", - "coveralls": "3.0.2", "ecashaddrjs": "1.0.7", - "eslint": "7.17.0", - "eslint-config-prettier": "7.1.0", - "eslint-config-standard": "16.0.3", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "3.3.1", - "eslint-plugin-standard": "4.0.0", - "husky": "^4.3.8", "ini": "1.3.8", - "lodash.clonedeep": "4.5.0", - "mocha": "9.1.3", - "node-mocks-http": "1.7.0", - "nyc": "15.1.0", "randombytes": "2.0.6", "safe-buffer": "5.1.2", "satoshi-bitcoin": "1.0.4", - "semantic-release": "18.0.0", - "sinon": "9.2.2", "slp-mdm": "0.0.6", "slp-parser": "0.0.4", - "standard": "^16.0.4", "wif": "2.0.6" + }, + "dependencies": { + "axios": { + "version": "0.21.4", + "resolved": "http://94.130.170.209:4873/axios/-/axios-0.21.4.tgz", + "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==", + "requires": { + "follow-redirects": "^1.14.0" + } + }, + "randombytes": { + "version": "2.0.6", + "resolved": "http://94.130.170.209:4873/randombytes/-/randombytes-2.0.6.tgz", + "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "http://94.130.170.209:4873/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, "@psf/bip21": { @@ -31595,30 +31683,32 @@ "dev": true }, "minimal-slp-wallet": { - "version": "file:../minimal-slp-wallet", + "version": "4.4.3", + "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-4.4.3.tgz", + "integrity": "sha512-wpELTh4WYems96SxyRW/KdglJ6T3ieR7VVDCLcqq7bwZ+tJXFznOxDRggS5sREI9tTxiAHIyVSg+nbXZZk8buQ==", "requires": { - "@psf/bch-js": "5.3.2", + "@psf/bch-js": "5.4.0", "apidoc": "0.25.0", "bch-consumer": "1.2.0", "bch-donation": "1.1.1", - "browserify": "17.0.0", - "chai": "4.2.0", - "coveralls": "3.1.0", - "crypto-js": "4.0.0", - "eslint": "7.17.0", - "eslint-config-prettier": "7.1.0", - "eslint-config-standard": "16.0.2", - "eslint-plugin-node": "11.1.0", - "eslint-plugin-prettier": "3.3.1", - "eslint-plugin-standard": "4.0.1", - "husky": "4.3.8", - "lodash.clonedeep": "4.5.0", - "mocha": "8.2.0", - "nyc": "15.1.0", - "semantic-release": "17.4.4", - "sinon": "9.2.0", - "standard": "16.0.4", - "tinyify": "3.0.0" + "crypto-js": "4.0.0" + }, + "dependencies": { + "apidoc": { + "version": "0.25.0", + "resolved": "http://94.130.170.209:4873/apidoc/-/apidoc-0.25.0.tgz", + "integrity": "sha512-5g9fp8OffXZOdBTzm4BBvV5Vw54s+NmKnGZIUKuH+gRTqqJuRJpcGN6sz6WnjJ+NcvXhB7rIRp6FhtJahazx2Q==", + "requires": { + "apidoc-core": "^0.12.0", + "commander": "^2.20.0", + "fs-extra": "^9.0.1", + "handlebars": "^4.7.6", + "lodash": "^4.17.20", + "markdown-it": "^11.0.0", + "nodemon": "^2.0.4", + "winston": "^3.3.3" + } + } } }, "minimalistic-assert": { diff --git a/package.json b/package.json index 41a5d37..997aba0 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ }, "repository": "Permissionless-Software-Foundation/bch-dex", "dependencies": { - "@psf/bch-js": "../bch-js", + "@psf/bch-js": "5.4.0", "axios": "0.21.1", "bch-message-lib": "2.1.4", "bcryptjs": "2.4.3", @@ -51,7 +51,7 @@ "koa2-ratelimit": "0.9.1", "libp2p": "^0.36.2", "line-reader": "0.4.0", - "minimal-slp-wallet": "../minimal-slp-wallet", + "minimal-slp-wallet": "4.4.3", "mongoose": "5.13.13", "node-fetch": "npm:@achingbrain/node-fetch@2.6.7", "nodemailer": "6.4.17",