Skip to content

fix(drive): cannot destructure property ‘quorumHash’ of ‘instantLock... #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shumkov merged 2 commits into from
May 8, 2023
Merged

fix(drive): cannot destructure property ‘quorumHash’ of ‘instantLock... #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a537303
fix(drive): cannot destructure property ‘quorumHash’ of ‘instantLock...
shumkov May 8, 2023
aa7d26a
fix: destruction of null
shumkov May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .pnp.cjs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file removed .yarn/cache/@dashevo-dashcore-lib-npm-0.20.4-45ccc5839f-a22a251253.zip
View file
Open in desktop
Binary file not shown.
Binary file added .yarn/cache/@dashevo-dashcore-lib-npm-0.20.6-dfe918f9a6-730145e130.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion packages/bench-suite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": "eslint ."
},
"dependencies": {
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/dpp": "workspace:*",
"@dashevo/wallet-lib": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/dapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"dependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dashd-rpc": "^18.2.0",
"@dashevo/dpp": "workspace:*",
"@dashevo/grpc-common": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/dash-spv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"dependencies": {
"@dashevo/dark-gravity-wave": "^1.1.1",
"@dashevo/dash-util": "^2.0.3",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"levelup": "^4.4.0",
"memdown": "^5.1.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"homepage": "https://github.com/dashevo/dashmate#readme",
"dependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dashd-rpc": "^18.2.0",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/docker-compose": "^0.24.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dapi-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dash-spv": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dpp": "workspace:*",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dash-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/dpp": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dpp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^8.0.0",
"@dashevo/bls": "~1.2.9",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/feature-flags-contract": "workspace:*",
Expand Down
12 changes: 8 additions & 4 deletions packages/js-drive/lib/dpp/DriveStateRepository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,15 +658,19 @@ class DriveStateRepository {
const llmqType = instantlockSML.getInstantSendLLMQType();

if (instantlockSML.isLLMQTypeRotated(llmqType)) {
const { quorumHash } = instantLock.selectSignatoryRotatedQuorum(
const quorum = instantLock.selectSignatoryRotatedQuorum(
smlStore,
instantLock.getRequestId(),
offset,
);

const { result: quorumInfo } = await this.coreRpcClient.quorum('info', llmqType, quorumHash);
if (quorumInfo.previousConsecutiveDKGFailures !== 0) {
return false;
// TODO: We should throw an error if quorum is not found?
if (quorum) {
const { result: quorumInfo } = await this.coreRpcClient.quorum('info', llmqType, quorum.quorumHash);

if (quorumInfo.previousConsecutiveDKGFailures !== 0) {
return false;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/js-drive/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@dashevo/abci": "github:dashpay/js-abci#09f72120bc2059144f72eb7a246d632ead3fc3c6",
"@dashevo/bls": "~1.2.9",
"@dashevo/dapi-grpc": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dashd-rpc": "^18.2.0",
"@dashevo/dashpay-contract": "workspace:*",
"@dashevo/dpns-contract": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-test-suite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"homepage": "https://github.com/dashevo/platform-test-suite#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/dpp": "workspace:*",
"@dashevo/feature-flags-contract": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/rs-drive-nodejs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"license": "MIT",
"devDependencies": {
"@dashevo/bls": "~1.2.9",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/withdrawals-contract": "workspace:*",
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"homepage": "https://github.com/dashevo/wallet-lib#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:*",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/grpc-common": "workspace:*",
"@dashevo/wasm-dpp": "workspace:*",
"cbor": "^8.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/wasm-dpp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@babel/cli": "^7.21.0",
"@babel/core": "^7.15.5",
"@babel/preset-env": "^7.15.4",
"@dashevo/dashcore-lib": "~0.20.4",
"@dashevo/dashcore-lib": "~0.20.5",
"@dashevo/dpns-contract": "workspace:*",
"@dashevo/dpp": "workspace:*",
"@dashevo/wasm-re2": "~1.0.2",
Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,7 +1339,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@dashevo/bench-suite@workspace:packages/bench-suite"
dependencies:
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/dpp": "workspace:*"
"@dashevo/wallet-lib": "workspace:*"
Expand Down Expand Up @@ -1372,7 +1372,7 @@ __metadata:
"@babel/core": ^7.15.5
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dash-spv": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dpp": "workspace:*"
"@dashevo/grpc-common": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
Expand Down Expand Up @@ -1449,7 +1449,7 @@ __metadata:
"@dashevo/bls": ~1.2.9
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dashd-rpc": ^18.2.0
"@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
"@dashevo/dpp": "workspace:*"
Expand Down Expand Up @@ -1497,7 +1497,7 @@ __metadata:
dependencies:
"@dashevo/dark-gravity-wave": ^1.1.1
"@dashevo/dash-util": ^2.0.3
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
chai: ^4.3.4
eslint: ^7.32.0
eslint-config-airbnb-base: ^14.2.1
Expand All @@ -1519,9 +1519,9 @@ __metadata:
languageName: node
linkType: hard

"@dashevo/dashcore-lib@npm:~0.20.4":
version: 0.20.4
resolution: "@dashevo/dashcore-lib@npm:0.20.4"
"@dashevo/dashcore-lib@npm:~0.20.5":
version: 0.20.6
resolution: "@dashevo/dashcore-lib@npm:0.20.6"
dependencies:
"@dashevo/bls": ~1.2.9
"@dashevo/x11-hash-js": ^1.0.2
Expand All @@ -1534,7 +1534,7 @@ __metadata:
lodash: ^4.17.20
ripemd160: ^2.0.2
unorm: ^1.6.0
checksum: a22a2512531050fa41ca1ee664ad0d3f854463d74f5f4477dd3936aac2a2037da291b45d5b08af9d28990a62fc68b72c48af6fcef690f4b9b265d1e970e5486a
checksum: 730145e1302908e0762cb3a102d52f8b5478d3b00c38e386c786da8c77dd53f4e99d7aca6ca4c6f0df2d32ef59a70bdcb0c8ae383426987d472f6c4e3f9ae0eb
languageName: node
linkType: hard

Expand Down Expand Up @@ -1620,7 +1620,7 @@ __metadata:
"@babel/core": ^7.15.5
"@babel/preset-env": ^7.15.4
"@dashevo/bls": ~1.2.9
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/feature-flags-contract": "workspace:*"
Expand Down Expand Up @@ -1684,7 +1684,7 @@ __metadata:
"@dashevo/abci": "github:dashpay/js-abci#09f72120bc2059144f72eb7a246d632ead3fc3c6"
"@dashevo/bls": ~1.2.9
"@dashevo/dapi-grpc": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dashd-rpc": ^18.2.0
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
Expand Down Expand Up @@ -1826,7 +1826,7 @@ __metadata:
resolution: "@dashevo/platform-test-suite@workspace:packages/platform-test-suite"
dependencies:
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/dpp": "workspace:*"
"@dashevo/feature-flags-contract": "workspace:*"
Expand Down Expand Up @@ -1927,7 +1927,7 @@ __metadata:
resolution: "@dashevo/rs-drive@workspace:packages/rs-drive-nodejs"
dependencies:
"@dashevo/bls": ~1.2.9
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dpp": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
"@dashevo/withdrawals-contract": "workspace:*"
Expand Down Expand Up @@ -1957,7 +1957,7 @@ __metadata:
dependencies:
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dash-spv": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/grpc-common": "workspace:*"
"@dashevo/wasm-dpp": "workspace:*"
assert: ^2.0.0
Expand Down Expand Up @@ -2014,7 +2014,7 @@ __metadata:
"@babel/core": ^7.15.5
"@babel/preset-env": ^7.15.4
"@dashevo/bls": ~1.2.9
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/dpp": "workspace:*"
"@dashevo/wasm-re2": ~1.0.2
Expand Down Expand Up @@ -6293,7 +6293,7 @@ __metadata:
dependencies:
"@dashevo/bls": ~1.2.9
"@dashevo/dapi-client": "workspace:*"
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/dpns-contract": "workspace:*"
"@dashevo/dpp": "workspace:*"
Expand Down Expand Up @@ -6364,7 +6364,7 @@ __metadata:
resolution: "dashmate@workspace:packages/dashmate"
dependencies:
"@dashevo/bls": ~1.2.9
"@dashevo/dashcore-lib": ~0.20.4
"@dashevo/dashcore-lib": ~0.20.5
"@dashevo/dashd-rpc": ^18.2.0
"@dashevo/dashpay-contract": "workspace:*"
"@dashevo/docker-compose": ^0.24.2
Expand Down