From c0c37a2e1a015220579746c4a0dc579befc2829f Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Fri, 17 Sep 2021 18:01:30 +0300 Subject: [PATCH 1/5] feat: convenient broadcast errors --- package-lock.json | 69 +++++++++++++---- package.json | 5 +- src/SDK/Client/Client.spec.ts | 4 - .../Platform/broadcastStateTransition.ts | 76 +++++++++++-------- .../Platform/methods/contracts/get.spec.ts | 2 +- .../Client/Platform/methods/contracts/get.ts | 2 +- .../Client/Platform/methods/identities/get.ts | 2 +- src/errors/StateTransitionBroadcastError.ts | 33 +++----- 8 files changed, 115 insertions(+), 78 deletions(-) diff --git a/package-lock.json b/package-lock.json index 85b2559f..b2765380 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,12 +93,13 @@ } }, "@dashevo/dapi-client": { - "version": "0.21.0-dev.7", - "resolved": "https://registry.npmjs.org/@dashevo/dapi-client/-/dapi-client-0.21.0-dev.7.tgz", - "integrity": "sha512-fNfby71MJasseVRLmNURZvBSFqAhCpkJaSoJhf2AK2zmJ1YDFhJkB0IdnMMyjgfnxrzmVYL8X0wf+fLpiVJ6dw==", + "version": "github:dashevo/js-dapi-client#0b542379ca89092cf2b40dead4eca87d8a5534f3", + "from": "github:dashevo/js-dapi-client#convenient-error", "requires": { "@dashevo/dapi-grpc": "~0.21.0-dev.8", "@dashevo/dashcore-lib": "~0.19.25", + "@dashevo/dpp": "~0.21.0-dev.4", + "@dashevo/grpc-common": "~0.5.0", "axios": "^0.21.1", "bs58": "^4.0.1", "cbor": "^7.0.5", @@ -116,6 +117,46 @@ "google-protobuf": "^3.12.2", "grpc-web": "^1.2.0", "protobufjs": "github:jawid-h/protobuf.js#fix/buffer-conversion" + }, + "dependencies": { + "@dashevo/grpc-common": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.4.2.tgz", + "integrity": "sha512-z8f5ucWIkM7Pohr7nQAggXEgRMwbi6MVgBXskXZ/rps3N2es9psMjnhSKWMP4GPCOKBJE72F/7BPw64SVLQc8Q==", + "requires": { + "@grpc/grpc-js": "^1.3.6", + "@grpc/proto-loader": "^0.5.2", + "lodash.get": "^4.4.2", + "protobufjs": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", + "semver": "^7.3.2" + }, + "dependencies": { + "protobufjs": { + "version": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", + "from": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", + "requires": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", + "@protobufjs/codegen": "^2.0.4", + "@protobufjs/eventemitter": "^1.1.0", + "@protobufjs/fetch": "^1.1.0", + "@protobufjs/float": "^1.0.2", + "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", + "@protobufjs/utf8": "^1.1.0", + "@types/long": "^4.0.1", + "@types/node": "^13.7.0", + "long": "^4.0.0" + } + } + } + }, + "@types/node": { + "version": "13.13.52", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz", + "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==" + } } }, "@dashevo/dashcore-lib": { @@ -186,12 +227,13 @@ "integrity": "sha512-OnKpFX498ZcJVAEv1MRF/bNpDY0DUHSd+5MjGtSBkZ9plv+E2p6UWHK77479l59ZJWun+Ix2BsYPY7PSd+11yA==" }, "@dashevo/grpc-common": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.4.1.tgz", - "integrity": "sha512-9UQSHbNLeIPIeUnn7XBc8gMaKZiXW/jUUictsVJrECUPlS5W/hwW6gz5vNayjg59QYPQXSKy98NhVkEXh2FbbA==", + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.5.1.tgz", + "integrity": "sha512-pPK0mZEXz3avQyipnEwcTJajnmpE4ef3INw0/XQmdvsrsRAwU/oufjkQJZI8gIDMXVax0ngkEvgsjPoDZW+eCQ==", "requires": { "@grpc/grpc-js": "^1.3.6", "@grpc/proto-loader": "^0.5.2", + "cbor": "^7.0.6", "lodash.get": "^4.4.2", "protobufjs": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", "semver": "^7.3.2" @@ -229,14 +271,13 @@ "integrity": "sha512-ihW/0heZgcLozQTSPDxa/cSy4NCZmQdGvu9lyR1jrCGfeDPp5N8ZXbLWOPPLulnR/28g683QA+Z4G/8tW+mw5Q==" }, "@dashevo/wallet-lib": { - "version": "7.21.0-dev.6", - "resolved": "https://registry.npmjs.org/@dashevo/wallet-lib/-/wallet-lib-7.21.0-dev.6.tgz", - "integrity": "sha512-sbsTNSJc0tAh/vqtc2i203oxzm0iFjSIVsl3N1nwV6iqxU/+P1Bjw3Z6z4j0M54ZUEADptR2txseNhT5xh4PGQ==", + "version": "github:dashevo/wallet-lib#79fc83ed22dc15e91e660aa7b20eb2ee98e88f44", + "from": "github:dashevo/wallet-lib#convenient-errors", "requires": { - "@dashevo/dapi-client": "~0.21.0-dev.7", + "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", "@dashevo/dashcore-lib": "~0.19.25", "@dashevo/dpp": "~0.21.0-dev.4", - "@dashevo/grpc-common": "~0.4.0", + "@dashevo/grpc-common": "~0.5.0", "cbor": "^7.0.5", "crypto-js": "^4.0.0", "lodash": "^4.17.19", @@ -3171,9 +3212,9 @@ } }, "google-protobuf": { - "version": "3.17.3", - "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.17.3.tgz", - "integrity": "sha512-OVPzcSWIAJ+d5yiHyeaLrdufQtrvaBrF4JQg+z8ynTkbO3uFcujqXszTumqg1cGsAsjkWnI+M5B1xZ19yR4Wyg==" + "version": "3.18.0", + "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.18.0.tgz", + "integrity": "sha512-WlaQWRkUOo/lm9uTgNH6nk9IQt814RggWPzKBfnAVewOFzSzRUSmS1yUWRT6ixW1vS7er5p6tmLSmwzpPpmc8A==" }, "got": { "version": "9.6.0", diff --git a/package.json b/package.json index 5e65a1c5..fb216c3c 100644 --- a/package.json +++ b/package.json @@ -28,10 +28,11 @@ }, "homepage": "https://github.com/dashevo/DashJS#readme", "dependencies": { - "@dashevo/dapi-client": "~0.21.0-dev.7", + "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", "@dashevo/dashcore-lib": "~0.19.25", "@dashevo/dpp": "~0.21.0-dev.4", - "@dashevo/wallet-lib": "~7.21.0-dev.6", + "@dashevo/grpc-common": "~0.5.0", + "@dashevo/wallet-lib": "github:dashevo/wallet-lib#convenient-errors", "bs58": "^4.0.1", "node-inspect-extracted": "1.0.7" }, diff --git a/src/SDK/Client/Client.spec.ts b/src/SDK/Client/Client.spec.ts index 2e6eb93c..923652c0 100644 --- a/src/SDK/Client/Client.spec.ts +++ b/src/SDK/Client/Client.spec.ts @@ -171,7 +171,6 @@ describe('Dash - Client', function suite() { expect(error).to.be.an.instanceOf(StateTransitionBroadcastError); expect(error.getCode()).to.be.equal(errorResponse.error.code); expect(error.getMessage()).to.be.equal(errorResponse.error.message); - expect(error.getData()).to.be.equal(errorResponse.error.data); const importedIdentityIds = account.identities.getIdentityIds(); // Check that no identities were imported @@ -226,7 +225,6 @@ describe('Dash - Client', function suite() { expect(error).to.be.an.instanceOf(StateTransitionBroadcastError); expect(error.getCode()).to.be.equal(errorResponse.error.code); expect(error.getMessage()).to.be.equal(errorResponse.error.message); - expect(error.getData()).to.be.equal(errorResponse.error.data); }); }); @@ -254,7 +252,6 @@ describe('Dash - Client', function suite() { expect(error).to.be.an.instanceOf(StateTransitionBroadcastError); expect(error.getCode()).to.be.equal(errorResponse.error.code); expect(error.getMessage()).to.be.equal(errorResponse.error.message); - expect(error.getData()).to.be.equal(errorResponse.error.data); }); it('should broadcast documents', async () => { @@ -303,7 +300,6 @@ describe('Dash - Client', function suite() { expect(error).to.be.an.instanceOf(StateTransitionBroadcastError); expect(error.getCode()).to.be.equal(errorResponse.error.code); expect(error.getMessage()).to.be.equal(errorResponse.error.message); - expect(error.getData()).to.be.equal(errorResponse.error.data); }); it('should broadcast data contract', async () => { diff --git a/src/SDK/Client/Platform/broadcastStateTransition.ts b/src/SDK/Client/Platform/broadcastStateTransition.ts index 96bef0e4..54aa15dc 100644 --- a/src/SDK/Client/Platform/broadcastStateTransition.ts +++ b/src/SDK/Client/Platform/broadcastStateTransition.ts @@ -4,6 +4,13 @@ import { StateTransitionBroadcastError } from "../../../errors/StateTransitionBr import { IStateTransitionResult } from "./IStateTransitionResult"; import { IPlatformStateProof } from "./IPlatformStateProof"; +const ResponseError = require('@dashevo/dapi-client/lib/transport/errors/response/ResponseError'); +const InvalidRequestDPPError = require('@dashevo/dapi-client/lib/transport/errors/response/InvalidRequestDPPError'); + +const createGrpcTransportError = require('@dashevo/dapi-client/lib/transport/GrpcTransport/createGrpcTransportError'); + +const GrpcError = require('@dashevo/grpc-common/lib/server/error/GrpcError'); + /** * @param {Platform} platform * @param stateTransition @@ -14,7 +21,13 @@ export default async function broadcastStateTransition(platform: Platform, state const result = await dpp.stateTransition.validateBasic(stateTransition); if (!result.isValid()) { - throw new Error(`StateTransition is invalid - ${JSON.stringify(result.getErrors())}`); + const consensusError = result.getFirstError(); + + throw new StateTransitionBroadcastError( + consensusError.getCode(), + consensusError.message, + consensusError, + ); } // Subscribing to future result @@ -26,40 +39,24 @@ export default async function broadcastStateTransition(platform: Platform, state try { await client.getDAPIClient().platform.broadcastStateTransition(serializedStateTransition); - } catch (e) { - let data; - let message; - - if (e.data) { - data = e.data; - } else if (e.metadata) { - // Due to an unknown bug in the minifier, `get` method of the metadata can be stripped off. - // See the comment in the 'else' branch for more details - if (typeof e.metadata.get === 'function') { - const errors = e.metadata.get('errors'); - data = {}; - data.errors = errors && errors.length > 0 ? JSON.parse(errors) : errors; - } else { - // This code can be executed only if deserialization failed and no errors - // were provided in the metadata, so we can deserialize here again - // and see the details locally - try { - await dpp.stateTransition.createFromBuffer(serializedStateTransition); - } catch (deserializationError) { - data = {}; - data.errors = deserializationError.errors; - data.rawStateTransition = deserializationError.rawStateTransition; - } + } catch (error) { + if (error instanceof ResponseError) { + let cause = error; + + // Pass DPP consensus error directly to avoid + // additional wrappers + if (cause instanceof InvalidRequestDPPError) { + cause = cause.getConsensusError(); } - } - if (e.details) { - message = e.details; - } else { - message = e.message; + throw new StateTransitionBroadcastError( + cause.getCode(), + cause.message, + cause, + ); } - throw new StateTransitionBroadcastError(e.code, message, data); + throw error; } // Waiting for result to return @@ -68,7 +65,22 @@ export default async function broadcastStateTransition(platform: Platform, state let { error } = stateTransitionResult; if (error) { - throw new StateTransitionBroadcastError(error.code, error.message, error.data); + // Create DAPI response error from gRPC error passed as gRPC response + const grpcError = new GrpcError(error.code, error.message, error.data); + + let cause = createGrpcTransportError(grpcError); + + // Pass DPP consensus error directly to avoid + // additional wrappers + if (cause instanceof InvalidRequestDPPError) { + cause = cause.getConsensusError(); + } + + throw new StateTransitionBroadcastError( + cause.getCode(), + cause.message, + cause, + ); } return stateTransitionResult.proof; diff --git a/src/SDK/Client/Platform/methods/contracts/get.spec.ts b/src/SDK/Client/Platform/methods/contracts/get.spec.ts index 3f541e8d..351dcaa8 100644 --- a/src/SDK/Client/Platform/methods/contracts/get.spec.ts +++ b/src/SDK/Client/Platform/methods/contracts/get.spec.ts @@ -9,7 +9,7 @@ import Identifier from "@dashevo/dpp/lib/Identifier"; import 'mocha'; import { ClientApps } from "../../../ClientApps"; const GetDataContractResponse = require("@dashevo/dapi-client/lib/methods/platform/getDataContract/GetDataContractResponse"); -const NotFoundError = require('@dashevo/dapi-client/lib/errors/response/NotFoundError'); +const NotFoundError = require('@dashevo/dapi-client/lib/transport/GrpcTransport/errors/NotFoundError'); const factory = new DataContractFactory( undefined, diff --git a/src/SDK/Client/Platform/methods/contracts/get.ts b/src/SDK/Client/Platform/methods/contracts/get.ts index edff961b..e756ff7a 100644 --- a/src/SDK/Client/Platform/methods/contracts/get.ts +++ b/src/SDK/Client/Platform/methods/contracts/get.ts @@ -3,7 +3,7 @@ import {Platform} from "../../Platform"; // @ts-ignore import Identifier from "@dashevo/dpp/lib/Identifier"; import Metadata from "@dashevo/dpp/lib/Metadata"; -const NotFoundError = require('@dashevo/dapi-client/lib/errors/response/NotFoundError'); +const NotFoundError = require('@dashevo/dapi-client/lib/transport/GrpcTransport/errors/NotFoundError'); declare type ContractIdentifier = string | Identifier; diff --git a/src/SDK/Client/Platform/methods/identities/get.ts b/src/SDK/Client/Platform/methods/identities/get.ts index 6a4faa42..7f65e29c 100644 --- a/src/SDK/Client/Platform/methods/identities/get.ts +++ b/src/SDK/Client/Platform/methods/identities/get.ts @@ -2,7 +2,7 @@ import {Platform} from "../../Platform"; // @ts-ignore import Identifier from "@dashevo/dpp/lib/Identifier"; import Metadata from "@dashevo/dpp/lib/Metadata"; -const NotFoundError = require('@dashevo/dapi-client/lib/errors/response/NotFoundError'); +const NotFoundError = require('@dashevo/dapi-client/lib/transport/GrpcTransport/errors/NotFoundError'); /** * Get an identity from the platform diff --git a/src/errors/StateTransitionBroadcastError.ts b/src/errors/StateTransitionBroadcastError.ts index 362cda07..589124a8 100644 --- a/src/errors/StateTransitionBroadcastError.ts +++ b/src/errors/StateTransitionBroadcastError.ts @@ -1,32 +1,19 @@ export class StateTransitionBroadcastError extends Error { code: number; message: string; - data: any; + cause: Error; /** - * * @param {number} code * @param {string} message - * @param {*} data + * @param {Error} cause */ - constructor(code: number, message: string, data: any) { - let detailedMessage = message; - - if (data && data.errors && data.errors.length > 0) { - const [firstError] = data.errors; - - detailedMessage += `: ${firstError.name}: ${firstError.message}`; - - if (data.errors.length > 1) { - detailedMessage += ` and ${data.errors.length} more`; - } - } - - super(detailedMessage); + constructor(code: number, message: string, cause: Error) { + super(message); this.code = code; - this.message = detailedMessage; - this.data = data; + this.message = message; + this.cause = cause; if (Error.captureStackTrace) { Error.captureStackTrace(this, this.constructor); @@ -54,11 +41,11 @@ export class StateTransitionBroadcastError extends Error { } /** - * Get error data + * Get error that was a cause * - * @return {*} + * @return {Error} */ - getData(): any { - return this.data; + getCause(): any { + return this.cause; } } From 1a049b9ffb53ae08feff8d9aa9b02ac64526dd1e Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Fri, 17 Sep 2021 19:50:23 +0300 Subject: [PATCH 2/5] chore: github action variables --- .github/workflows/.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/.env b/.github/workflows/.env index 609ec84f..5661529f 100644 --- a/.github/workflows/.env +++ b/.github/workflows/.env @@ -1,4 +1,4 @@ -DRIVE_BRANCH=feat/grpc-error-codes -DAPI_BRANCH=error-codes -DASHMATE_BRANCH=error-codes -TEST_SUITE_BRANCH=error-codes +DRIVE_BRANCH=bring-back-drive-errors +DAPI_BRANCH=send-metadata-buffer +DASHMATE_BRANCH=convenient-errors +TEST_SUITE_BRANCH=convenient-errors From 2b01bbf5a5dcbc51006f8a43a8075dc8f713a875 Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Mon, 20 Sep 2021 11:06:32 +0300 Subject: [PATCH 3/5] chore: package-lock.json --- package-lock.json | 242 ++++++++++++++++++---------------------------- 1 file changed, 92 insertions(+), 150 deletions(-) diff --git a/package-lock.json b/package-lock.json index b2765380..a2b85a71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,9 +24,9 @@ } }, "@babel/helper-validator-identifier": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz", - "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==", + "version": "7.15.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz", + "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==", "dev": true }, "@babel/highlight": { @@ -93,13 +93,13 @@ } }, "@dashevo/dapi-client": { - "version": "github:dashevo/js-dapi-client#0b542379ca89092cf2b40dead4eca87d8a5534f3", + "version": "github:dashevo/js-dapi-client#489aa6a72d2aac16b31a3b882719ff622aa82ce7", "from": "github:dashevo/js-dapi-client#convenient-error", "requires": { - "@dashevo/dapi-grpc": "~0.21.0-dev.8", - "@dashevo/dashcore-lib": "~0.19.25", + "@dashevo/dapi-grpc": "~0.21.0-dev.11", + "@dashevo/dashcore-lib": "~0.19.26", "@dashevo/dpp": "~0.21.0-dev.4", - "@dashevo/grpc-common": "~0.5.0", + "@dashevo/grpc-common": "~0.5.3", "axios": "^0.21.1", "bs58": "^4.0.1", "cbor": "^7.0.5", @@ -108,61 +108,21 @@ } }, "@dashevo/dapi-grpc": { - "version": "0.21.0-dev.8", - "resolved": "https://registry.npmjs.org/@dashevo/dapi-grpc/-/dapi-grpc-0.21.0-dev.8.tgz", - "integrity": "sha512-/jfmpR7K0mgVWoJvxWd33bfecTKEBcaUE2KI2u6+PyItwYcrK+nxJm36Yt6AzroQBf56Dxvo3lQ6WhU9BwePeQ==", + "version": "0.21.0-dev.11", + "resolved": "https://registry.npmjs.org/@dashevo/dapi-grpc/-/dapi-grpc-0.21.0-dev.11.tgz", + "integrity": "sha512-npRpgtUgqzcwPzVHP0J7ChysWqVUcXjTy9kfs+AckiRZRvZJ/2IWdZZ2oPZ82UTE3G3x0vBI1SaGgKEsdDuHyQ==", "requires": { - "@dashevo/grpc-common": "^0.4.0", + "@dashevo/grpc-common": "^0.5.3", "@grpc/grpc-js": "^1.3.6", "google-protobuf": "^3.12.2", "grpc-web": "^1.2.0", - "protobufjs": "github:jawid-h/protobuf.js#fix/buffer-conversion" - }, - "dependencies": { - "@dashevo/grpc-common": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.4.2.tgz", - "integrity": "sha512-z8f5ucWIkM7Pohr7nQAggXEgRMwbi6MVgBXskXZ/rps3N2es9psMjnhSKWMP4GPCOKBJE72F/7BPw64SVLQc8Q==", - "requires": { - "@grpc/grpc-js": "^1.3.6", - "@grpc/proto-loader": "^0.5.2", - "lodash.get": "^4.4.2", - "protobufjs": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "semver": "^7.3.2" - }, - "dependencies": { - "protobufjs": { - "version": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "from": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": "^13.7.0", - "long": "^4.0.0" - } - } - } - }, - "@types/node": { - "version": "13.13.52", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz", - "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==" - } + "protobufjs": "git+https://git@github.com/jawid-h/protobuf.js.git#fix/buffer-conversion" } }, "@dashevo/dashcore-lib": { - "version": "0.19.25", - "resolved": "https://registry.npmjs.org/@dashevo/dashcore-lib/-/dashcore-lib-0.19.25.tgz", - "integrity": "sha512-/xVQxotoysCDKUg54Wkc0q/5IICLlUkt+8Pp5zAHI7E8Zf8bQ+CB7P0KzeufkMiUVsIdOZ7INM2sMQYcVk2SeA==", + "version": "0.19.26", + "resolved": "https://registry.npmjs.org/@dashevo/dashcore-lib/-/dashcore-lib-0.19.26.tgz", + "integrity": "sha512-wcGojfHIpEWR4/pjT4CcMmRhI00MbkYT5S29uBhUl7aTNo3Ya75f9YQOXykD03gM3yyCRQSOovmK/cOJU030BQ==", "requires": { "@dashevo/x11-hash-js": "^1.0.2", "@types/node": "^12.12.47", @@ -178,16 +138,16 @@ }, "dependencies": { "@types/node": { - "version": "12.20.20", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.20.tgz", - "integrity": "sha512-kqmxiJg4AT7rsSPIhO6eoBIx9mNwwpeH42yjtgQh6X2ANSpLpvToMXv+LMFdfxpwG1FZXZ41OGZMiUAtbBLEvg==" + "version": "12.20.25", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.25.tgz", + "integrity": "sha512-hcTWqk7DR/HrN9Xe7AlJwuCaL13Vcd9/g/T54YrJz4Q3ESM5mr33YCzW2bOfzSIc3aZMeGBvbLGvgN6mIJ0I5Q==" } } }, "@dashevo/dpp": { - "version": "0.21.0-dev.4", - "resolved": "https://registry.npmjs.org/@dashevo/dpp/-/dpp-0.21.0-dev.4.tgz", - "integrity": "sha512-H1QP1ZdZnptYe4rztIdkohts8Y11J2izt6LDkquZR9+kfrpv4gCiWqs+UeslCY06HiaeXVjLUHwk+x7JZOvVNQ==", + "version": "0.21.0-dev.5", + "resolved": "https://registry.npmjs.org/@dashevo/dpp/-/dpp-0.21.0-dev.5.tgz", + "integrity": "sha512-cONdPkfczI1OIP98sWve++lqBPh2N7Gk0YWvu9s6vsevaHryLroMq4y3MRvS+kRVYhfZfEvW6yVPt2fej3fc9g==", "requires": { "@apidevtools/json-schema-ref-parser": "^8.0.0", "@dashevo/dashcore-lib": "~0.19.25", @@ -227,42 +187,16 @@ "integrity": "sha512-OnKpFX498ZcJVAEv1MRF/bNpDY0DUHSd+5MjGtSBkZ9plv+E2p6UWHK77479l59ZJWun+Ix2BsYPY7PSd+11yA==" }, "@dashevo/grpc-common": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.5.1.tgz", - "integrity": "sha512-pPK0mZEXz3avQyipnEwcTJajnmpE4ef3INw0/XQmdvsrsRAwU/oufjkQJZI8gIDMXVax0ngkEvgsjPoDZW+eCQ==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/@dashevo/grpc-common/-/grpc-common-0.5.3.tgz", + "integrity": "sha512-Zst9vK/utmTLlUxM/+oVsMgl3CnaqtuNhgBmQgY9za7sZNPfXSBOzLdP2mezGFMj40orL+fbzFUeA2qhahA+cQ==", "requires": { "@grpc/grpc-js": "^1.3.6", "@grpc/proto-loader": "^0.5.2", "cbor": "^7.0.6", "lodash.get": "^4.4.2", - "protobufjs": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", + "protobufjs": "git+https://git@github.com/jawid-h/protobuf.js.git#fix/buffer-conversion", "semver": "^7.3.2" - }, - "dependencies": { - "@types/node": { - "version": "13.13.52", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.52.tgz", - "integrity": "sha512-s3nugnZumCC//n4moGGe6tkNMyYEdaDBitVjwPxXmR5lnMG5dHePinH2EdxkG3Rh1ghFHHixAG4NJhpJW1rthQ==" - }, - "protobufjs": { - "version": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "from": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "requires": { - "@protobufjs/aspromise": "^1.1.2", - "@protobufjs/base64": "^1.1.2", - "@protobufjs/codegen": "^2.0.4", - "@protobufjs/eventemitter": "^1.1.0", - "@protobufjs/fetch": "^1.1.0", - "@protobufjs/float": "^1.0.2", - "@protobufjs/inquire": "^1.1.0", - "@protobufjs/path": "^1.1.2", - "@protobufjs/pool": "^1.1.0", - "@protobufjs/utf8": "^1.1.0", - "@types/long": "^4.0.1", - "@types/node": "^13.7.0", - "long": "^4.0.0" - } - } } }, "@dashevo/re2-wasm": { @@ -271,13 +205,13 @@ "integrity": "sha512-ihW/0heZgcLozQTSPDxa/cSy4NCZmQdGvu9lyR1jrCGfeDPp5N8ZXbLWOPPLulnR/28g683QA+Z4G/8tW+mw5Q==" }, "@dashevo/wallet-lib": { - "version": "github:dashevo/wallet-lib#79fc83ed22dc15e91e660aa7b20eb2ee98e88f44", + "version": "github:dashevo/wallet-lib#cdb28f4831300f3a485dea65c9fa103a179bb239", "from": "github:dashevo/wallet-lib#convenient-errors", "requires": { "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", "@dashevo/dashcore-lib": "~0.19.25", - "@dashevo/dpp": "~0.21.0-dev.4", - "@dashevo/grpc-common": "~0.5.0", + "@dashevo/dpp": "~0.21.0-dev.5", + "@dashevo/grpc-common": "~0.5.3", "cbor": "^7.0.5", "crypto-js": "^4.0.0", "lodash": "^4.17.19", @@ -296,6 +230,13 @@ "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==", "requires": { "@types/node": ">=12.12.47" + }, + "dependencies": { + "@types/node": { + "version": "16.9.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz", + "integrity": "sha512-KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA==" + } } }, "@grpc/proto-loader": { @@ -308,9 +249,9 @@ } }, "@jest/types": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.0.6.tgz", - "integrity": "sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz", + "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.0", @@ -499,9 +440,10 @@ "dev": true }, "@types/node": { - "version": "14.17.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.11.tgz", - "integrity": "sha512-n2OQ+0Bz6WEsUjrvcHD1xZ8K+Kgo4cn9/w94s1bJS690QMUWfJPW/m7CCb7gPkA1fcYwL2UpjXP/rq/Eo41m6w==" + "version": "14.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.17.tgz", + "integrity": "sha512-niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==", + "dev": true }, "@types/sinon": { "version": "9.0.11", @@ -771,9 +713,9 @@ "dev": true }, "ajv": { - "version": "8.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz", - "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==", + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -857,9 +799,9 @@ "dev": true }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true }, "ansi-styles": { @@ -1553,9 +1495,9 @@ } }, "chance": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.7.tgz", - "integrity": "sha512-bua/2cZEfzS6qPm0vi3JEvGNbriDLcMj9lKxCQOjUcCJRcyjA7umP0zZm6bKWWlBN04vA0L99QGH/CZQawr0eg==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/chance/-/chance-1.1.8.tgz", + "integrity": "sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg==", "dev": true }, "check-error": { @@ -1890,9 +1832,9 @@ "dev": true }, "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" }, "create-ecdh": { "version": "4.0.4", @@ -2589,16 +2531,16 @@ } }, "expect": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/expect/-/expect-27.0.6.tgz", - "integrity": "sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.0.tgz", + "integrity": "sha512-oOTbawMQv7AK1FZURbPTgGSzmhxkjFzoARSvDjOMnOpeWuYQx1tP6rXu9MIX5mrACmyCAM7fSNP8IJO2f1p0CQ==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-styles": "^5.0.0", "jest-get-type": "^27.0.6", - "jest-matcher-utils": "^27.0.6", - "jest-message-util": "^27.0.6", + "jest-matcher-utils": "^27.2.0", + "jest-message-util": "^27.2.0", "jest-regex-util": "^27.0.6" } }, @@ -2974,9 +2916,9 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "follow-redirects": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz", - "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==" + "version": "1.14.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz", + "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==" }, "for-in": { "version": "1.0.2", @@ -3755,15 +3697,15 @@ "dev": true }, "jest-diff": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.0.6.tgz", - "integrity": "sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.0.tgz", + "integrity": "sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==", "dev": true, "requires": { "chalk": "^4.0.0", "diff-sequences": "^27.0.6", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.2.0" } }, "jest-get-type": { @@ -3773,30 +3715,30 @@ "dev": true }, "jest-matcher-utils": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz", - "integrity": "sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz", + "integrity": "sha512-F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw==", "dev": true, "requires": { "chalk": "^4.0.0", - "jest-diff": "^27.0.6", + "jest-diff": "^27.2.0", "jest-get-type": "^27.0.6", - "pretty-format": "^27.0.6" + "pretty-format": "^27.2.0" } }, "jest-message-util": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.0.6.tgz", - "integrity": "sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.0.tgz", + "integrity": "sha512-y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w==", "dev": true, "requires": { "@babel/code-frame": "^7.12.13", - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "@types/stack-utils": "^2.0.0", "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "micromatch": "^4.0.4", - "pretty-format": "^27.0.6", + "pretty-format": "^27.2.0", "slash": "^3.0.0", "stack-utils": "^2.0.3" } @@ -5311,12 +5253,12 @@ "dev": true }, "pretty-format": { - "version": "27.0.6", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.0.6.tgz", - "integrity": "sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.0.tgz", + "integrity": "sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==", "dev": true, "requires": { - "@jest/types": "^27.0.6", + "@jest/types": "^27.1.1", "ansi-regex": "^5.0.0", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" @@ -5340,8 +5282,8 @@ "dev": true }, "protobufjs": { - "version": "github:jawid-h/protobuf.js#8b91c72dca68fd6c418078fd2358c4969425dcdc", - "from": "github:jawid-h/protobuf.js#fix/buffer-conversion", + "version": "git+https://git@github.com/jawid-h/protobuf.js.git#8b91c72dca68fd6c418078fd2358c4969425dcdc", + "from": "git+https://git@github.com/jawid-h/protobuf.js.git#fix/buffer-conversion", "requires": { "@protobufjs/aspromise": "^1.1.2", "@protobufjs/base64": "^1.1.2", @@ -5879,9 +5821,9 @@ "dev": true }, "signal-exit": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz", + "integrity": "sha512-rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q==", "dev": true }, "simple-swizzle": { @@ -6183,9 +6125,9 @@ } }, "source-map-support": { - "version": "0.5.19", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", - "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -6227,9 +6169,9 @@ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=" }, "stack-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz", - "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz", + "integrity": "sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==", "dev": true, "requires": { "escape-string-regexp": "^2.0.0" From e71c072d0281e7cdc7e5c9d073c0c05b5f4f857e Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Mon, 20 Sep 2021 11:13:14 +0300 Subject: [PATCH 4/5] chore: package-lock.json --- package-lock.json | 18 +++++------------- package.json | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index a2b85a71..e01d525b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -93,8 +93,8 @@ } }, "@dashevo/dapi-client": { - "version": "github:dashevo/js-dapi-client#489aa6a72d2aac16b31a3b882719ff622aa82ce7", - "from": "github:dashevo/js-dapi-client#convenient-error", + "version": "0.21.0-dev.9", + "resolved": "github:dashevo/js-dapi-client#489aa6a72d2aac16b31a3b882719ff622aa82ce7", "requires": { "@dashevo/dapi-grpc": "~0.21.0-dev.11", "@dashevo/dashcore-lib": "~0.19.26", @@ -205,8 +205,8 @@ "integrity": "sha512-ihW/0heZgcLozQTSPDxa/cSy4NCZmQdGvu9lyR1jrCGfeDPp5N8ZXbLWOPPLulnR/28g683QA+Z4G/8tW+mw5Q==" }, "@dashevo/wallet-lib": { - "version": "github:dashevo/wallet-lib#cdb28f4831300f3a485dea65c9fa103a179bb239", - "from": "github:dashevo/wallet-lib#convenient-errors", + "version": "7.21.0-dev.7", + "resolved": "github:dashevo/wallet-lib#cdb28f4831300f3a485dea65c9fa103a179bb239", "requires": { "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", "@dashevo/dashcore-lib": "~0.19.25", @@ -230,13 +230,6 @@ "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==", "requires": { "@types/node": ">=12.12.47" - }, - "dependencies": { - "@types/node": { - "version": "16.9.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz", - "integrity": "sha512-KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA==" - } } }, "@grpc/proto-loader": { @@ -442,8 +435,7 @@ "@types/node": { "version": "14.17.17", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.17.tgz", - "integrity": "sha512-niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==", - "dev": true + "integrity": "sha512-niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==" }, "@types/sinon": { "version": "9.0.11", diff --git a/package.json b/package.json index fb216c3c..fed0598e 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,11 @@ }, "homepage": "https://github.com/dashevo/DashJS#readme", "dependencies": { - "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", + "@dashevo/dapi-client": "~0.21.0-dev.9", "@dashevo/dashcore-lib": "~0.19.25", "@dashevo/dpp": "~0.21.0-dev.4", "@dashevo/grpc-common": "~0.5.0", - "@dashevo/wallet-lib": "github:dashevo/wallet-lib#convenient-errors", + "@dashevo/wallet-lib": "~7.21.0-dev.7", "bs58": "^4.0.1", "node-inspect-extracted": "1.0.7" }, From 41fc1b0e392507368fa614aa41aa37875f9d8c47 Mon Sep 17 00:00:00 2001 From: Konstantin Shuplenkov Date: Mon, 20 Sep 2021 11:27:58 +0300 Subject: [PATCH 5/5] chore: package-lock.json --- package-lock.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index e01d525b..8eed5382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -94,7 +94,8 @@ }, "@dashevo/dapi-client": { "version": "0.21.0-dev.9", - "resolved": "github:dashevo/js-dapi-client#489aa6a72d2aac16b31a3b882719ff622aa82ce7", + "resolved": "https://registry.npmjs.org/@dashevo/dapi-client/-/dapi-client-0.21.0-dev.9.tgz", + "integrity": "sha512-mTAj32BXuvyLQQBERatfzTkSvP/7dbX6tyEnXuVdub613M+J+2XVhFCTbYmRt6ZjsjUx4t2apBW0xYa2pRHCjA==", "requires": { "@dashevo/dapi-grpc": "~0.21.0-dev.11", "@dashevo/dashcore-lib": "~0.19.26", @@ -206,9 +207,10 @@ }, "@dashevo/wallet-lib": { "version": "7.21.0-dev.7", - "resolved": "github:dashevo/wallet-lib#cdb28f4831300f3a485dea65c9fa103a179bb239", + "resolved": "https://registry.npmjs.org/@dashevo/wallet-lib/-/wallet-lib-7.21.0-dev.7.tgz", + "integrity": "sha512-xDi6CGQaIRjs5HEShZ1oiEEHzviWo1aYcjWqzX5aBO76v5ZOdo+PYBRBsAp7czlsoa1kbCf0x9BhdZ5xq4cqng==", "requires": { - "@dashevo/dapi-client": "github:dashevo/js-dapi-client#convenient-error", + "@dashevo/dapi-client": "~0.21.0-dev.9", "@dashevo/dashcore-lib": "~0.19.25", "@dashevo/dpp": "~0.21.0-dev.5", "@dashevo/grpc-common": "~0.5.3", @@ -230,6 +232,13 @@ "integrity": "sha512-CKQVuwuSPh40tgOkR7c0ZisxYRiN05PcKPW72mQL5y++qd7CwBRoaJZvU5xfXnCJDFBmS3qZGQ71Frx6Ofo2XA==", "requires": { "@types/node": ">=12.12.47" + }, + "dependencies": { + "@types/node": { + "version": "16.9.4", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.4.tgz", + "integrity": "sha512-KDazLNYAGIuJugdbULwFZULF9qQ13yNWEBFnfVpqlpgAAo6H/qnM9RjBgh0A0kmHf3XxAKLdN5mTIng9iUvVLA==" + } } }, "@grpc/proto-loader": { @@ -435,7 +444,8 @@ "@types/node": { "version": "14.17.17", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.17.17.tgz", - "integrity": "sha512-niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==" + "integrity": "sha512-niAjcewgEYvSPCZm3OaM9y6YQrL2SEPH9PymtE6fuZAvFiP6ereCcvApGl2jKTq7copTIguX3PBvfP08LN4LvQ==", + "dev": true }, "@types/sinon": { "version": "9.0.11",