diff --git a/package-lock.json b/package-lock.json index 78c9689..f82e617 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "2.0.0", "license": "MIT", "dependencies": { - "@psf/bch-js": "^4.20.7", + "@psf/bch-js": "6.2.9", "apidoc": "^0.26.0", "axios": "^0.21.1", "bitcore-lib-cash": "^8.23.1", @@ -833,9 +833,9 @@ } }, "node_modules/@psf/bch-js": { - "version": "4.20.28", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-4.20.28.tgz", - "integrity": "sha512-tlWfYTUnmAzrFZDHTuP2CccE6fp20j4XcCIJiJYlpaKzxB0ilH8CEVWBQaMY+Fb+eaTrlSdiaDC5MBWV4klpQg==", + "version": "6.2.9", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.9.tgz", + "integrity": "sha512-7oj1+DqiSqOvl5Pn4PdLG+1hSptWqLHLEqen7UvkCL1KSR4qqVaI3m/j3SCHb6nWEZ4HceZalav2AM1LYHDEWg==", "license": "MIT", "dependencies": { "@chris.troutner/bip32-utils": "1.0.5", @@ -843,9 +843,7 @@ "@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", @@ -866,6 +864,15 @@ "wif": "2.0.6" } }, + "node_modules/@psf/bch-js/node_modules/axios": { + "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.8" + } + }, "node_modules/@psf/bch-js/node_modules/bignumber.js": { "version": "9.0.0", "resolved": "http://94.130.170.209:4873/bignumber.js/-/bignumber.js-9.0.0.tgz", @@ -1188,12 +1195,6 @@ "dev": true, "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/@types/ws": { "version": "7.4.7", "resolved": "http://94.130.170.209:4873/@types%2fws/-/ws-7.4.7.tgz", @@ -1203,85 +1204,12 @@ "@types/node": "*" } }, - "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/abbrev": { "version": "1.1.1", "resolved": "http://94.130.170.209:4873/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "license": "ISC" }, - "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/accepts": { "version": "1.3.7", "resolved": "http://94.130.170.209:4873/accepts/-/accepts-1.3.7.tgz", @@ -2792,25 +2720,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", @@ -3182,18 +3091,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/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", @@ -4624,6 +4521,7 @@ "version": "3.0.2", "resolved": "http://94.130.170.209:4873/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true, "license": "MIT" }, "node_modules/extsprintf": { @@ -4882,9 +4780,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", @@ -6727,12 +6625,6 @@ "node": ">= 0.6.0" } }, - "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-sdsl": { "version": "2.1.4", "resolved": "http://94.130.170.209:4873/js-sdsl/-/js-sdsl-2.1.4.tgz", @@ -7148,52 +7040,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.capitalize": { "version": "4.2.1", "resolved": "http://94.130.170.209:4873/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", @@ -7303,12 +7149,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.throttle": { - "version": "4.1.1", - "resolved": "http://94.130.170.209:4873/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=", - "license": "MIT" - }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "http://94.130.170.209:4873/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -7687,15 +7527,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", @@ -8137,12 +7968,6 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "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", @@ -12351,13 +12176,6 @@ "node": ">=4" } }, - "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", @@ -12455,28 +12273,6 @@ "node": ">= 8" } }, - "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/proper-lockfile/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/proxy-addr": { "version": "2.0.7", "resolved": "http://94.130.170.209:4873/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -12561,18 +12357,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", @@ -13077,12 +12861,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "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.21.0", "resolved": "http://94.130.170.209:4873/resolve/-/resolve-1.21.0.tgz", @@ -14935,27 +14713,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/tweetnacl": { "version": "0.14.5", "resolved": "http://94.130.170.209:4873/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -15152,16 +14909,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", @@ -15415,12 +15162,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", @@ -16324,18 +16065,16 @@ } }, "@psf/bch-js": { - "version": "4.20.28", - "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-4.20.28.tgz", - "integrity": "sha512-tlWfYTUnmAzrFZDHTuP2CccE6fp20j4XcCIJiJYlpaKzxB0ilH8CEVWBQaMY+Fb+eaTrlSdiaDC5MBWV4klpQg==", + "version": "6.2.9", + "resolved": "http://94.130.170.209:4873/@psf%2fbch-js/-/bch-js-6.2.9.tgz", + "integrity": "sha512-7oj1+DqiSqOvl5Pn4PdLG+1hSptWqLHLEqen7UvkCL1KSR4qqVaI3m/j3SCHb6nWEZ4HceZalav2AM1LYHDEWg==", "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", @@ -16356,6 +16095,14 @@ "wif": "2.0.6" }, "dependencies": { + "axios": { + "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.8" + } + }, "bignumber.js": { "version": "9.0.0", "resolved": "http://94.130.170.209:4873/bignumber.js/-/bignumber.js-9.0.0.tgz", @@ -16613,11 +16360,6 @@ "integrity": "sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==", "dev": true }, - "@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==" - }, "@types/ws": { "version": "7.4.7", "resolved": "http://94.130.170.209:4873/@types%2fws/-/ws-7.4.7.tgz", @@ -16626,76 +16368,11 @@ "@types/node": "*" } }, - "@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" - } - }, "abbrev": { "version": "1.1.1", "resolved": "http://94.130.170.209:4873/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, - "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==" - }, "accepts": { "version": "1.3.7", "resolved": "http://94.130.170.209:4873/accepts/-/accepts-1.3.7.tgz", @@ -17765,26 +17442,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", @@ -18055,16 +17712,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==" - }, - "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", @@ -19098,7 +18745,8 @@ "extend": { "version": "3.0.2", "resolved": "http://94.130.170.209:4873/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true }, "extsprintf": { "version": "1.3.0", @@ -19289,9 +18937,9 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "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", @@ -20502,11 +20150,6 @@ "integrity": "sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==", "dev": true }, - "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-sdsl": { "version": "2.1.4", "resolved": "http://94.130.170.209:4873/js-sdsl/-/js-sdsl-2.1.4.tgz", @@ -20816,46 +20459,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.capitalize": { "version": "4.2.1", "resolved": "http://94.130.170.209:4873/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz", @@ -20948,11 +20551,6 @@ "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=", "dev": true }, - "lodash.throttle": { - "version": "4.1.1", - "resolved": "http://94.130.170.209:4873/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" - }, "lodash.truncate": { "version": "4.4.2", "resolved": "http://94.130.170.209:4873/lodash.truncate/-/lodash.truncate-4.4.2.tgz", @@ -21213,14 +20811,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", @@ -21530,11 +21120,6 @@ "resolved": "http://94.130.170.209:4873/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" }, - "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", @@ -24511,11 +24096,6 @@ "find-up": "^2.1.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", @@ -24580,22 +24160,6 @@ "integrity": "sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==", "dev": true }, - "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" - }, - "dependencies": { - "retry": { - "version": "0.10.1", - "resolved": "http://94.130.170.209:4873/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" - } - } - }, "proxy-addr": { "version": "2.0.7", "resolved": "http://94.130.170.209:4873/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -24653,16 +24217,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", @@ -25013,11 +24567,6 @@ "resolved": "http://94.130.170.209:4873/require-main-filename/-/require-main-filename-2.0.0.tgz", "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==" }, - "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.21.0", "resolved": "http://94.130.170.209:4873/resolve/-/resolve-1.21.0.tgz", @@ -26345,27 +25894,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==" - } - } - }, "tweetnacl": { "version": "0.14.5", "resolved": "http://94.130.170.209:4873/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -26507,15 +26035,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", @@ -26699,11 +26218,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 c36395f..30f1936 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "node": ">=10.15.1" }, "dependencies": { - "@psf/bch-js": "^4.20.7", + "@psf/bch-js": "6.2.9", "apidoc": "^0.26.0", "axios": "^0.21.1", "bitcore-lib-cash": "^8.23.1", diff --git a/src/routes/v5/psf-slp-indexer.js b/src/routes/v5/psf-slp-indexer.js index e990100..8cdf742 100644 --- a/src/routes/v5/psf-slp-indexer.js +++ b/src/routes/v5/psf-slp-indexer.js @@ -229,7 +229,7 @@ class PsfSlpIndexer { // such data. // // Example: - // curl -H "Content-Type: application/json" -X POST -d '{ "tokenId": "afca62f07560b4c72c2ed6c9c3995315f964ccdfc37dded316d182640b42d88a" }' localhost:3000/v5/psf/slp/token/data + // curl -H "Content-Type: application/json" -X POST -d '{ "tokenId": "f055256b938f1ecfa270459d6f12c7c8c82b66d3263c03d5074445a2b1a498a3" }' localhost:3000/v5/psf/slp/token/data async getTokenData (req, res, next) { try { // Verify env var is set for interacting with the indexer. @@ -292,17 +292,18 @@ class PsfSlpIndexer { // Get the OP_RETURN data and decode it. const mutableData = await _this.decodeOpReturn(documentHash) const jsonData = JSON.parse(mutableData) + // console.log(`jsonData: ${JSON.stringify(jsonData, null, 2)}`) - const mspAddress = jsonData.mspAddress + const mutableDataAddr = jsonData.mda // Gets the mutable data address (MDA) transaction history. - const transactions = await _this.bchjs.Electrumx.transactions(mspAddress) + const transactions = await _this.bchjs.Electrumx.transactions(mutableDataAddr) const mspTxs = transactions.transactions // console.log(`mspTxs: ${JSON.stringify(mspTxs, null, 2)}`) let data = false - // Maps each transaction of the mspAddress + // Maps each transaction of the mutableDataAddr // if finds an OP_RETURN decode is and closes the loop // Start with the newest TXID entry and scan the history to find the first // entry with an IPFS CID. @@ -326,8 +327,15 @@ class PsfSlpIndexer { // Keep searching if this TX does not have a cid value. if (!obj.cid) continue - // TODO: Ensure data was generated by the MSP address and not an - // update from a different address. + // Ensure data was generated by the MDA + const txData = await this.bchjs.Transaction.get(txid) + const vinAddress = txData.txData.vin[0].address + + // Skip entry if it was not made by the MDA private key. + if (mutableDataAddr !== vinAddress) { + console.log('Data is not generated by MDA') + continue + } break } catch (error) { @@ -352,6 +360,7 @@ class PsfSlpIndexer { return result } catch (err) { console.log('Error in getMutableData().') + // console.log('Error in getMutableData(): ', err) throw err } } @@ -395,7 +404,12 @@ class PsfSlpIndexer { if (!cid || typeof cid !== 'string') { throw new Error('cid must be a string.') } + + // Assuming that CID starts with ipfs://. Cutting out that prefix. + cid = cid.substring(7) + const dataUrl = `https://${cid}.ipfs.dweb.link/data.json` + console.log(`dataUrl: ${dataUrl}`) const response = await _this.axios.get(dataUrl) // console.log(`response.data: ${JSON.stringify(response.data, null, 2)}`)