diff --git a/package-lock.json b/package-lock.json index b77e713..a149ecd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,11 +34,11 @@ "koa2-ratelimit": "0.9.1", "libp2p": "^0.36.2", "line-reader": "0.4.0", - "minimal-slp-wallet": "4.5.4", + "minimal-slp-wallet": "4.6.3", "mongoose": "5.13.13", "node-fetch": "npm:@achingbrain/node-fetch@2.6.7", "nodemailer": "6.4.17", - "p2wdb": "1.3.1", + "p2wdb": "1.4.0", "passport-local": "1.0.0", "public-ip": "^4.0.4", "winston": "3.3.3", @@ -13899,23 +13899,21 @@ } }, "node_modules/minimal-slp-wallet": { - "version": "4.5.4", - "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-4.5.4.tgz", - "integrity": "sha512-CzEe402T4NsFRVoovYQF5Db4lZHYnEQZseYVJMQwghVZ2gV+M69Igmsxj2/rxDGbiVbBSPd7ILMnWmes/BiseA==", - "license": "MIT", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-4.6.3.tgz", + "integrity": "sha512-1/EWrkqZsNoOYqV/do/NaCrzodh10wCm5PZTO2qV+a5d0ku65c/Y/yT5ljmIyYAM/m8Ob1bonjVq1kzE7o/lPA==", "dependencies": { - "@psf/bch-js": "6.2.14", + "@psf/bch-js": "6.4.1", "apidoc": "0.51.0", - "bch-consumer": "1.2.3", + "bch-consumer": "1.3.0", "bch-donation": "1.1.2", "crypto-js": "4.0.0" } }, "node_modules/minimal-slp-wallet/node_modules/@psf/bch-js": { - "version": "6.2.14", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.14.tgz", - "integrity": "sha512-tHF2DyBRgYHTvdhVY58dOzbCOuKQrhc9QvYyj+K4c7mfsVgprjU+FTcM9ZFcE3A+0G/92VBP4/kkfccqfdLlWA==", - "license": "MIT", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.4.1.tgz", + "integrity": "sha512-/BLGzWH02VqaDNeY05QGMhrCtYDw5bXn45Egz+L5FLcyZaOqONR4kl80T6a8xvTPcREO4R+AjGTRBpfjdikwpA==", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", "@psf/bip21": "2.0.1", @@ -13994,29 +13992,65 @@ }, "node_modules/minimal-slp-wallet/node_modules/axios": { "version": "0.26.1", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", - "license": "MIT", "dependencies": { "follow-redirects": "^1.14.8" } }, "node_modules/minimal-slp-wallet/node_modules/bch-consumer": { - "version": "1.2.3", - "resolved": "http://94.130.170.209:4873/bch-consumer/-/bch-consumer-1.2.3.tgz", - "integrity": "sha512-6hMe2RB3PkPG+ZsArSPueUjUL3G/HaONExXbGt5v/wx9iU14A3JmSJJxtpxJ+MMGjDbL9w96EJ3Yrpmn8nDi7A==", - "license": "MIT", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.0.tgz", + "integrity": "sha512-Lec0g7h2SynC/NlqMED+Kl/UKbFfeuAH5WPSk5k9OjMnI+W0Mqc/MsB0VCzte5Cw85ouL45n/3RWtNQmmZwcyA==", "dependencies": { - "@psf/bch-js": "6.2.14", + "@psf/bch-js": "6.3.4", "apidoc": "0.51.0", "axios": "0.25.0" } }, + "node_modules/minimal-slp-wallet/node_modules/bch-consumer/node_modules/@psf/bch-js": { + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.3.4.tgz", + "integrity": "sha512-TgT1R+PUJomdpUUuOY/PDb8Nl6PDbF9qohlbkEv7cvkT1WvkN1Obma4b2tziL45mxhKVM3ASYBgAGw8yURiiXQ==", + "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.26.1", + "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/minimal-slp-wallet/node_modules/bch-consumer/node_modules/@psf/bch-js/node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "dependencies": { + "follow-redirects": "^1.14.8" + } + }, "node_modules/minimal-slp-wallet/node_modules/bch-consumer/node_modules/axios": { "version": "0.25.0", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.25.0.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", - "license": "MIT", "dependencies": { "follow-redirects": "^1.14.7" } @@ -14100,18 +14134,16 @@ }, "node_modules/minimal-slp-wallet/node_modules/randombytes": { "version": "2.0.6", - "resolved": "http://94.130.170.209:4873/randombytes/-/randombytes-2.0.6.tgz", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", - "license": "MIT", "dependencies": { "safe-buffer": "^5.1.0" } }, "node_modules/minimal-slp-wallet/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" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/minimalistic-assert": { "version": "1.0.1", @@ -18792,8 +18824,9 @@ "license": "MIT" }, "node_modules/p2wdb": { - "version": "1.3.1", - "license": "MIT", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/p2wdb/-/p2wdb-1.4.0.tgz", + "integrity": "sha512-YbwxKdaT8yKvE+vEGJYfOdquASOgYY0C4OP7h4jd8ceHg5w+dxUnPrjAF2ll7fXx02y2vPndAKgSBStvBYZL/A==", "dependencies": { "apidoc": "0.25.0", "axios": "0.24.0", @@ -33188,21 +33221,21 @@ "dev": true }, "minimal-slp-wallet": { - "version": "4.5.4", - "resolved": "http://94.130.170.209:4873/minimal-slp-wallet/-/minimal-slp-wallet-4.5.4.tgz", - "integrity": "sha512-CzEe402T4NsFRVoovYQF5Db4lZHYnEQZseYVJMQwghVZ2gV+M69Igmsxj2/rxDGbiVbBSPd7ILMnWmes/BiseA==", + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-4.6.3.tgz", + "integrity": "sha512-1/EWrkqZsNoOYqV/do/NaCrzodh10wCm5PZTO2qV+a5d0ku65c/Y/yT5ljmIyYAM/m8Ob1bonjVq1kzE7o/lPA==", "requires": { - "@psf/bch-js": "6.2.14", + "@psf/bch-js": "6.4.1", "apidoc": "0.51.0", - "bch-consumer": "1.2.3", + "bch-consumer": "1.3.0", "bch-donation": "1.1.2", "crypto-js": "4.0.0" }, "dependencies": { "@psf/bch-js": { - "version": "6.2.14", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.14.tgz", - "integrity": "sha512-tHF2DyBRgYHTvdhVY58dOzbCOuKQrhc9QvYyj+K4c7mfsVgprjU+FTcM9ZFcE3A+0G/92VBP4/kkfccqfdLlWA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@psf/bch-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", @@ -33266,25 +33299,66 @@ }, "axios": { "version": "0.26.1", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.26.1.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", "requires": { "follow-redirects": "^1.14.8" } }, "bch-consumer": { - "version": "1.2.3", - "resolved": "http://94.130.170.209:4873/bch-consumer/-/bch-consumer-1.2.3.tgz", - "integrity": "sha512-6hMe2RB3PkPG+ZsArSPueUjUL3G/HaONExXbGt5v/wx9iU14A3JmSJJxtpxJ+MMGjDbL9w96EJ3Yrpmn8nDi7A==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bch-consumer/-/bch-consumer-1.3.0.tgz", + "integrity": "sha512-Lec0g7h2SynC/NlqMED+Kl/UKbFfeuAH5WPSk5k9OjMnI+W0Mqc/MsB0VCzte5Cw85ouL45n/3RWtNQmmZwcyA==", "requires": { - "@psf/bch-js": "6.2.14", + "@psf/bch-js": "6.3.4", "apidoc": "0.51.0", "axios": "0.25.0" }, "dependencies": { + "@psf/bch-js": { + "version": "6.3.4", + "resolved": "https://registry.npmjs.org/@psf/bch-js/-/bch-js-6.3.4.tgz", + "integrity": "sha512-TgT1R+PUJomdpUUuOY/PDb8Nl6PDbF9qohlbkEv7cvkT1WvkN1Obma4b2tziL45mxhKVM3ASYBgAGw8yURiiXQ==", + "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", + "axios": "0.26.1", + "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" + }, + "dependencies": { + "axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "requires": { + "follow-redirects": "^1.14.8" + } + } + } + }, "axios": { "version": "0.25.0", - "resolved": "http://94.130.170.209:4873/axios/-/axios-0.25.0.tgz", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz", "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==", "requires": { "follow-redirects": "^1.14.7" @@ -33347,7 +33421,7 @@ }, "randombytes": { "version": "2.0.6", - "resolved": "http://94.130.170.209:4873/randombytes/-/randombytes-2.0.6.tgz", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", "requires": { "safe-buffer": "^5.1.0" @@ -33355,7 +33429,7 @@ }, "safe-buffer": { "version": "5.1.2", - "resolved": "http://94.130.170.209:4873/safe-buffer/-/safe-buffer-5.1.2.tgz", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" } } @@ -36564,7 +36638,9 @@ "version": "1.0.1" }, "p2wdb": { - "version": "1.3.1", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/p2wdb/-/p2wdb-1.4.0.tgz", + "integrity": "sha512-YbwxKdaT8yKvE+vEGJYfOdquASOgYY0C4OP7h4jd8ceHg5w+dxUnPrjAF2ll7fXx02y2vPndAKgSBStvBYZL/A==", "requires": { "apidoc": "0.25.0", "axios": "0.24.0", diff --git a/package.json b/package.json index 97f22cb..2a9c03e 100644 --- a/package.json +++ b/package.json @@ -52,11 +52,11 @@ "koa2-ratelimit": "0.9.1", "libp2p": "^0.36.2", "line-reader": "0.4.0", - "minimal-slp-wallet": "4.5.4", + "minimal-slp-wallet": "4.6.3", "mongoose": "5.13.13", "node-fetch": "npm:@achingbrain/node-fetch@2.6.7", "nodemailer": "6.4.17", - "p2wdb": "1.3.1", + "p2wdb": "1.4.0", "passport-local": "1.0.0", "public-ip": "^4.0.4", "winston": "3.3.3", diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index e2b25f0..0d446b3 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -4,7 +4,7 @@ version: '3.9' services: mongo-p2wdb-service: - image: mongo:4.4 + image: mongo:4.4.2-bionic container_name: mongo-p2wdb-service ports: - '5666:27017' # : @@ -14,7 +14,7 @@ services: restart: always ipfs: - image: ipfs/go-ipfs:v0.12.0 + image: ipfs/go-ipfs:v0.13.0 container_name: ipfs environment: MY_ENV_VAR: 'placeholder' @@ -46,7 +46,7 @@ services: #build: # context: ./p2wdb/ # dockerfile: Dockerfile - image: christroutner/p2wdb-bch-dex:v1.7.0 + image: christroutner/ipfs-p2wdb-service:v3.0.1 container_name: p2wdb environment: CONSUMER_URL: 'https://free-bch.fullstack.cash' @@ -66,6 +66,7 @@ services: #- 5669:5669 # IPFS WS Port volumes: - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb + - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh restart: always bch-dex: diff --git a/production/docker/p2wdb/start-production.sh b/production/docker/p2wdb/start-production.sh index 343cd66..8daafad 100755 --- a/production/docker/p2wdb/start-production.sh +++ b/production/docker/p2wdb/start-production.sh @@ -30,8 +30,8 @@ export FULLSTACKPASS=demo export DBURL=mongodb://172.17.0.1:5666/p2wdb-service-dev # Configure IPFS ports -export IPFS_TCP_PORT=5668 -export IPFS_WS_PORT=5669 +#export IPFS_TCP_PORT=5668 +#export IPFS_WS_PORT=5669 # Configure REST API port export PORT=5667 @@ -42,6 +42,6 @@ export IPFS_API_PORT=5001 export IPFS_TCP_PORT=4001 # P2WDB specific env vars -export ORBITDB_NAME=/orbitdb/zdpuAm4fPafpjs5mgbBUJV8Az7kd8Xj1ttD6M1JaAxF8RMRrw/psf-bch-p2wdb-keyvalue-v1.0.0-0004 +#export ORBITDB_NAME=/orbitdb/zdpuAm4fPafpjs5mgbBUJV8Az7kd8Xj1ttD6M1JaAxF8RMRrw/psf-bch-p2wdb-keyvalue-v1.0.0-0004 npm start