Skip to content

Commit

Permalink
fix!: invalid merkleRootQuorums calculation (#362)
Browse files Browse the repository at this point in the history
  • Loading branch information
shumkov authored Apr 29, 2022
1 parent 3458842 commit b80eae9
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 78 deletions.
91 changes: 42 additions & 49 deletions .pnp.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/dapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"dependencies": {
"@dashevo/dapi-grpc": "workspace:~",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dashd-rpc": "^2.3.1",
"@dashevo/dpp": "workspace:~",
"@dashevo/grpc-common": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/configs/system/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
},
core: {
docker: {
image: 'dashpay/dashd:0.18.0.0-rc1',
image: 'dashpay/dashd:18.0.0.0-rc3',
},
p2p: {
port: 20001,
Expand Down
2 changes: 1 addition & 1 deletion packages/dashmate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"homepage": "https://github.com/dashevo/dashmate#readme",
"dependencies": {
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dashd-rpc": "^2.3.1",
"@dashevo/dashpay-contract": "workspace:~",
"@dashevo/dpns-contract": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dapi-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"dependencies": {
"@dashevo/dapi-grpc": "workspace:~",
"@dashevo/dash-spv": "github:dashevo/dash-spv",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dpp": "workspace:~",
"@dashevo/grpc-common": "workspace:~",
"@grpc/grpc-js": "^1.3.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dash-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"homepage": "https://github.com/dashevo/DashJS#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:~",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dashpay-contract": "workspace:~",
"@dashevo/dpns-contract": "workspace:~",
"@dashevo/dpp": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-dpp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"dependencies": {
"@apidevtools/json-schema-ref-parser": "^8.0.0",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dashpay-contract": "workspace:~",
"@dashevo/dpns-contract": "workspace:~",
"@dashevo/feature-flags-contract": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-drive/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"dependencies": {
"@dashevo/abci": "github:dashevo/js-abci#v0.22-dev",
"@dashevo/dapi-grpc": "workspace:~",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dashd-rpc": "^2.3.1",
"@dashevo/dashpay-contract": "workspace:~",
"@dashevo/dpns-contract": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/platform-test-suite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"homepage": "https://github.com/dashevo/platform-test-suite#readme",
"dependencies": {
"@dashevo/dapi-client": "workspace:~",
"@dashevo/dashcore-lib": "~0.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dpns-contract": "workspace:~",
"@dashevo/dpp": "workspace:~",
"@dashevo/feature-flags-contract": "workspace:~",
Expand Down
2 changes: 1 addition & 1 deletion packages/wallet-lib/package.json
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.19.31",
"@dashevo/dashcore-lib": "~0.19.32",
"@dashevo/dpp": "workspace:~",
"@dashevo/grpc-common": "workspace:~",
"cbor": "^8.0.0",
Expand Down
33 changes: 13 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ __metadata:
"@babel/core": ^7.15.5
"@dashevo/dapi-grpc": "workspace:~"
"@dashevo/dash-spv": "github:dashevo/dash-spv"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dpp": "workspace:~"
"@dashevo/grpc-common": "workspace:~"
"@grpc/grpc-js": ^1.3.7
Expand Down Expand Up @@ -1366,7 +1366,7 @@ __metadata:
dependencies:
"@dashevo/dapi-client": "workspace:~"
"@dashevo/dapi-grpc": "workspace:~"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dashd-rpc": ^2.3.1
"@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
"@dashevo/dpp": "workspace:~"
Expand Down Expand Up @@ -1430,9 +1430,9 @@ __metadata:
languageName: node
linkType: hard

"@dashevo/dashcore-lib@npm:^0.19.29, @dashevo/dashcore-lib@npm:~0.19.31":
version: 0.19.31
resolution: "@dashevo/dashcore-lib@npm:0.19.31"
"@dashevo/dashcore-lib@npm:^0.19.29, @dashevo/dashcore-lib@npm:~0.19.32":
version: 0.19.32
resolution: "@dashevo/dashcore-lib@npm:0.19.32"
dependencies:
"@dashevo/x11-hash-js": ^1.0.2
"@types/node": ^12.12.47
Expand All @@ -1445,7 +1445,7 @@ __metadata:
inherits: =2.0.1
lodash: ^4.17.20
unorm: ^1.6.0
checksum: 67ba5b44f22e40af56caea21fcd97760e9e07e79509ae6b2841eb7419abdd64377e80556ed7af30f3a10652fa38c88d8972b16ab52847c00aa618331fd328208
checksum: 5a21b2c7fe3e6019566b5685b4e6ad28db589f22730abb959c77dc75e8e5db502b13c34aa7382de3ecaa4c994c8c62de9f6022a510b1ffde71d9eaa71e336784
languageName: node
linkType: hard

Expand Down Expand Up @@ -1511,7 +1511,7 @@ __metadata:
"@apidevtools/json-schema-ref-parser": ^8.0.0
"@babel/core": ^7.15.5
"@babel/preset-env": ^7.15.4
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dashpay-contract": "workspace:~"
"@dashevo/dpns-contract": "workspace:~"
"@dashevo/feature-flags-contract": "workspace:~"
Expand Down Expand Up @@ -1577,7 +1577,7 @@ __metadata:
dependencies:
"@dashevo/abci": "github:dashevo/js-abci#v0.22-dev"
"@dashevo/dapi-grpc": "workspace:~"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dashd-rpc": ^2.3.1
"@dashevo/dashpay-contract": "workspace:~"
"@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev"
Expand Down Expand Up @@ -1701,7 +1701,7 @@ __metadata:
resolution: "@dashevo/platform-test-suite@workspace:packages/platform-test-suite"
dependencies:
"@dashevo/dapi-client": "workspace:~"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dpns-contract": "workspace:~"
"@dashevo/dpp": "workspace:~"
"@dashevo/feature-flags-contract": "workspace:~"
Expand Down Expand Up @@ -1813,7 +1813,7 @@ __metadata:
resolution: "@dashevo/wallet-lib@workspace:packages/wallet-lib"
dependencies:
"@dashevo/dapi-client": "workspace:~"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dpp": "workspace:~"
"@dashevo/grpc-common": "workspace:~"
assert: ^2.0.0
Expand Down Expand Up @@ -5639,7 +5639,7 @@ __metadata:
resolution: "dash@workspace:packages/js-dash-sdk"
dependencies:
"@dashevo/dapi-client": "workspace:~"
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dashpay-contract": "workspace:~"
"@dashevo/dpns-contract": "workspace:~"
"@dashevo/dpp": "workspace:~"
Expand Down Expand Up @@ -5708,7 +5708,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "dashmate@workspace:packages/dashmate"
dependencies:
"@dashevo/dashcore-lib": ~0.19.31
"@dashevo/dashcore-lib": ~0.19.32
"@dashevo/dashd-rpc": ^2.3.1
"@dashevo/dashpay-contract": "workspace:~"
"@dashevo/dpns-contract": "workspace:~"
Expand Down Expand Up @@ -7823,20 +7823,13 @@ fsevents@~2.3.2:
languageName: node
linkType: hard

"graceful-fs@npm:^4.1.11":
"graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
version: 4.2.10
resolution: "graceful-fs@npm:4.2.10"
checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
languageName: node
linkType: hard

"graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
version: 4.2.9
resolution: "graceful-fs@npm:4.2.9"
checksum: 68ea4e07ff2c041ada184f9278b830375f8e0b75154e3f080af6b70f66172fabb4108d19b3863a96b53fc068a310b9b6493d86d1291acc5f3861eb4b79d26ad6
languageName: node
linkType: hard

"grouped-queue@npm:^2.0.0":
version: 2.0.0
resolution: "grouped-queue@npm:2.0.0"
Expand Down

0 comments on commit b80eae9

Please sign in to comment.