From 6db9daf5d6df5bc91a451f644ebc16d04d497a71 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Fri, 21 Jul 2023 13:58:20 -0700 Subject: [PATCH] build(deps): fix npm (grpc) build on NodeJS v20.4.0 WORK IN PROGRESS -------------- 1. Eliminates all uses of the old `grpc` dependency from the codebase. 1.1. Upgraded all outdated fabirc-network, fabric-client and fabric-ca-client dependencies to the latest stable 2.2.x version which is 2.2.18 at the time. 1.2. Also outrighted swapped `grpc` declarations with `@grpc/grpc-js`. The rest of the diff is due to the incompatibility of the two mentioned. Fixes https://github.com/hyperledger/cacti/issues/2562 Fixes https://github.com/hyperledger/cacti/issues/1507 Signed-off-by: Peter Somogyvari --- .../package.json | 2 +- .../package.json | 4 +- .../package.json | 3 +- .../package.json | 2 +- .../cactus-example-tcs-huawei/package.json | 3 +- examples/test-run-transaction/package.json | 4 +- .../cactus-cmd-socketio-server/package.json | 3 +- .../package.json | 6 +- .../test/typescript/unit-test/package.json | 4 +- .../package.json | 2 +- .../typescript/iroha-transaction-wrapper.ts | 2 +- .../cactus-plugin-odap-hermes/package.json | 2 +- .../package.json | 2 +- .../asset-transfer-basic-utils/package.json | 4 +- weaver/common/protos-js/package.json | 3 +- .../core/drivers/fabric-driver/package.json | 3 +- .../iin-agent/package.json | 3 +- weaver/samples/fabric/fabric-cli/package.json | 3 +- .../interoperation-node-sdk/package.json | 2 +- yarn.lock | 363 ++++-------------- 20 files changed, 95 insertions(+), 325 deletions(-) diff --git a/examples/cactus-example-carbon-accounting-backend/package.json b/examples/cactus-example-carbon-accounting-backend/package.json index 3b4fcdaae0a..87a5afce696 100644 --- a/examples/cactus-example-carbon-accounting-backend/package.json +++ b/examples/cactus-example-carbon-accounting-backend/package.json @@ -65,7 +65,7 @@ "@openzeppelin/contracts": "4.9.2", "@openzeppelin/contracts-upgradeable": "4.9.2", "async-exit-hook": "2.0.1", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", "fs-extra": "10.0.0", "openapi-types": "9.1.0", "typescript-optional": "2.0.1", diff --git a/examples/cactus-example-discounted-asset-trade/package.json b/examples/cactus-example-discounted-asset-trade/package.json index d3085d967ec..98a6b92ebfe 100644 --- a/examples/cactus-example-discounted-asset-trade/package.json +++ b/examples/cactus-example-discounted-asset-trade/package.json @@ -28,9 +28,7 @@ "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", "express": "4.16.4", - "fabric-ca-client": "1.4.19", - "fabric-client": "1.4.19", - "fabric-network": "1.4.19", + "fabric-network": "2.2.18", "http-errors": "1.6.3", "jsonwebtoken": "9.0.0", "jsrsasign": "10.5.25", diff --git a/examples/cactus-example-electricity-trade/package.json b/examples/cactus-example-electricity-trade/package.json index 16f8a35ce85..e13aff87d47 100644 --- a/examples/cactus-example-electricity-trade/package.json +++ b/examples/cactus-example-electricity-trade/package.json @@ -24,8 +24,7 @@ "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", "express": "4.16.4", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", "http-errors": "1.6.3", "js-yaml": "3.14.1", "jsonwebtoken": "9.0.0", diff --git a/examples/cactus-example-supply-chain-backend/package.json b/examples/cactus-example-supply-chain-backend/package.json index a2aa829901b..1a0e7c40569 100644 --- a/examples/cactus-example-supply-chain-backend/package.json +++ b/examples/cactus-example-supply-chain-backend/package.json @@ -68,7 +68,7 @@ "dotenv": "16.0.0", "express": "4.17.3", "express-jwt": "8.4.1", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", "jose": "4.9.2", "openapi-types": "9.1.0", "solc": "0.8.6", diff --git a/examples/cactus-example-tcs-huawei/package.json b/examples/cactus-example-tcs-huawei/package.json index c25e18266a9..dc7646a1d37 100644 --- a/examples/cactus-example-tcs-huawei/package.json +++ b/examples/cactus-example-tcs-huawei/package.json @@ -22,8 +22,7 @@ "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", "express": "4.16.4", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", "http-errors": "1.6.3", "js-yaml": "3.14.1", "jsonwebtoken": "8.5.1", diff --git a/examples/test-run-transaction/package.json b/examples/test-run-transaction/package.json index 20cb1a62cc8..e056bddfb1d 100644 --- a/examples/test-run-transaction/package.json +++ b/examples/test-run-transaction/package.json @@ -21,8 +21,8 @@ "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", "express": "4.16.4", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", + "fabric-network": "2.2.18", "http-errors": "1.6.3", "jsonwebtoken": "8.5.1", "log4js": "6.4.0", diff --git a/packages/cactus-cmd-socketio-server/package.json b/packages/cactus-cmd-socketio-server/package.json index 638bb4d0c93..90a2cb65bf2 100644 --- a/packages/cactus-cmd-socketio-server/package.json +++ b/packages/cactus-cmd-socketio-server/package.json @@ -22,8 +22,7 @@ "ethereumjs-common": "1.5.2", "ethereumjs-tx": "2.1.2", "express": "4.16.4", - "fabric-ca-client": "1.4.19", - "fabric-network": "1.4.19", + "fabric-network": "2.2.18", "http-errors": "1.6.3", "js-yaml": "3.14.1", "jsonwebtoken": "9.0.0", diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json index e8d63a8514b..e2156479ac7 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json @@ -14,6 +14,7 @@ "prepare-docker-build": "cp -af ../../yarn.lock ./dist/yarn.lock" }, "dependencies": { + "@grpc/grpc-js": "1.8.18", "@hyperledger/cactus-cmd-socketio-server": "2.0.0-alpha.1", "@hyperledger/cactus-common": "2.0.0-alpha.1", "@types/node": "14.17.32", @@ -21,11 +22,8 @@ "cookie-parser": "1.4.6", "debug": "3.1.0", "express": "4.17.3", - "fabric-ca-client": "1.4.19", - "fabric-client": "1.4.19", - "fabric-network": "1.4.19", + "fabric-network": "2.2.18", "fs-extra": "10.0.0", - "grpc": "1.24.11", "js-yaml": "3.14.1", "jsonwebtoken": "9.0.0", "lodash": "4.17.21", diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json index 711f8833db6..76437db113c 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json @@ -13,8 +13,8 @@ "config": "1.31.0", "socket.io-client": "4.5.4", "ts-node": "9.1.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", + "fabric-network": "2.2.18", "shelljs": "0.8.5" }, "devDependencies": { diff --git a/packages/cactus-plugin-ledger-connector-iroha/package.json b/packages/cactus-plugin-ledger-connector-iroha/package.json index 086ab6a5947..38e839481c8 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/package.json +++ b/packages/cactus-plugin-ledger-connector-iroha/package.json @@ -55,6 +55,7 @@ "webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js" }, "dependencies": { + "@grpc/grpc-js": "1.8.18", "@hyperledger/cactus-common": "2.0.0-alpha.1", "@hyperledger/cactus-core": "2.0.0-alpha.1", "@hyperledger/cactus-core-api": "2.0.0-alpha.1", @@ -62,7 +63,6 @@ "axios": "0.21.4", "express": "4.17.1", "fast-safe-stringify": "2.1.1", - "grpc": "1.24.11", "iroha-helpers": "1.5.0", "key-encoder": "2.0.3", "openapi-types": "7.0.1", diff --git a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/iroha-transaction-wrapper.ts b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/iroha-transaction-wrapper.ts index 226bab7d577..ac61109c74e 100644 --- a/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/iroha-transaction-wrapper.ts +++ b/packages/cactus-plugin-ledger-connector-iroha/src/main/typescript/iroha-transaction-wrapper.ts @@ -13,7 +13,7 @@ import { } from "./generated/openapi/typescript-axios"; import { RuntimeError } from "run-time-error"; -import * as grpc from "grpc"; +import * as grpc from "@grpc/grpc-js"; import { GrantablePermission, diff --git a/packages/cactus-plugin-odap-hermes/package.json b/packages/cactus-plugin-odap-hermes/package.json index 96824743d83..b27af636ca0 100644 --- a/packages/cactus-plugin-odap-hermes/package.json +++ b/packages/cactus-plugin-odap-hermes/package.json @@ -72,7 +72,7 @@ "@types/express": "4.17.8", "@types/tape": "4.13.0", "crypto-js": "4.0.0", - "fabric-network": "2.2.10", + "fabric-network": "2.2.18", "ipfs-http-client": "51.0.1", "typescript": "4.3.2" }, diff --git a/packages/cactus-plugin-persistence-fabric/package.json b/packages/cactus-plugin-persistence-fabric/package.json index 17c1999fb1c..925b0b1d633 100644 --- a/packages/cactus-plugin-persistence-fabric/package.json +++ b/packages/cactus-plugin-persistence-fabric/package.json @@ -86,7 +86,7 @@ "@types/uuid": "8.3.1", "body-parser": "1.19.0", "express": "4.17.1", - "fabric-network": "1.4.19", + "fabric-network": "2.2.18", "uuid": "8.3.2" }, "engines": { diff --git a/tools/docker/fabric-all-in-one/asset-transfer-basic-utils/package.json b/tools/docker/fabric-all-in-one/asset-transfer-basic-utils/package.json index b897d38a6b9..47cfc769492 100644 --- a/tools/docker/fabric-all-in-one/asset-transfer-basic-utils/package.json +++ b/tools/docker/fabric-all-in-one/asset-transfer-basic-utils/package.json @@ -10,7 +10,7 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "1.4.19", - "fabric-network": "1.4.19" + "fabric-network": "2.2.18", + "fabric-network": "2.2.18" } } diff --git a/weaver/common/protos-js/package.json b/weaver/common/protos-js/package.json index f5cda3b4668..00d8c1a75de 100644 --- a/weaver/common/protos-js/package.json +++ b/weaver/common/protos-js/package.json @@ -32,10 +32,9 @@ "js" ], "dependencies": { - "@grpc/grpc-js": "^1.1.3", + "@grpc/grpc-js": "1.8.18", "@grpc/proto-loader": "^0.5.5", "google-protobuf": "^3.21.2", - "grpc": "^1.24.3", "grpc-tools": "^1.9.1" }, "devDependencies": { diff --git a/weaver/core/drivers/fabric-driver/package.json b/weaver/core/drivers/fabric-driver/package.json index 251640fb72a..3a30e3d8731 100644 --- a/weaver/core/drivers/fabric-driver/package.json +++ b/weaver/core/drivers/fabric-driver/package.json @@ -28,8 +28,7 @@ "dotenv": "^8.2.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-prettier": "^3.4.0", - "fabric-ca-client": "^2.2.8", - "fabric-network": "^2.2.8", + "fabric-network": "2.2.18", "level": "^8.0.0", "winston": "^3.3.3" }, diff --git a/weaver/core/identity-management/iin-agent/package.json b/weaver/core/identity-management/iin-agent/package.json index 3e4ea88f792..0f2be443cdb 100644 --- a/weaver/core/identity-management/iin-agent/package.json +++ b/weaver/core/identity-management/iin-agent/package.json @@ -28,9 +28,8 @@ "dotenv": "^8.2.0", "eslint-config-prettier": "^6.11.0", "eslint-plugin-prettier": "^3.1.4", - "fabric-ca-client": "^2.2.8", "fabric-common": "^2.2.8", - "fabric-network": "^2.2.8" + "fabric-network": "2.2.18" }, "devDependencies": { "@types/node": "^14.0.14", diff --git a/weaver/samples/fabric/fabric-cli/package.json b/weaver/samples/fabric/fabric-cli/package.json index e848fa3cfa3..c3f66b7c3ba 100644 --- a/weaver/samples/fabric/fabric-cli/package.json +++ b/weaver/samples/fabric/fabric-cli/package.json @@ -40,8 +40,7 @@ "dotenv": "^8.2.0", "elliptic": "^6.5.4", "express": "^4.18.1", - "fabric-ca-client": "^2.2.8", - "fabric-network": "^2.2.8", + "fabric-network": "2.2.18", "gluegun": "latest", "grpc-tools": "1.9.1", "ini": "^1.3.6", diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json index bda483eb91e..d2d888204a2 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package.json @@ -32,7 +32,7 @@ "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.1", "elliptic": "^6.2.3", "fabric-common": "^2.2.8", - "fabric-network": "^2.2.8", + "fabric-network": "2.2.18", "fabric-protos": "^2.2.8", "js-sha3": "^0.7.0", "jsrsasign": "^10.5.25", diff --git a/yarn.lock b/yarn.lock index f780bd59827..49982063745 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5189,6 +5189,16 @@ __metadata: languageName: node linkType: hard +"@grpc/grpc-js@npm:1.8.18": + version: 1.8.18 + resolution: "@grpc/grpc-js@npm:1.8.18" + dependencies: + "@grpc/proto-loader": ^0.7.0 + "@types/node": ">=12.12.47" + checksum: 90260dec594f2704d6ac6800d88a8fbbda872cc347d692a8bb88f73ed12035c60dd98c98569c5cfab508f1cdbf380ecc107e32a24f412952a7796148993dfc3a + languageName: node + linkType: hard + "@grpc/grpc-js@npm:1.8.8": version: 1.8.8 resolution: "@grpc/grpc-js@npm:1.8.8" @@ -5199,7 +5209,7 @@ __metadata: languageName: node linkType: hard -"@grpc/grpc-js@npm:^1.1.1, @grpc/grpc-js@npm:^1.1.3, @grpc/grpc-js@npm:^1.3.4": +"@grpc/grpc-js@npm:^1.1.1, @grpc/grpc-js@npm:^1.1.3": version: 1.8.14 resolution: "@grpc/grpc-js@npm:1.8.14" dependencies: @@ -5254,7 +5264,7 @@ __metadata: languageName: node linkType: hard -"@grpc/proto-loader@npm:^0.6.1, @grpc/proto-loader@npm:^0.6.10, @grpc/proto-loader@npm:^0.6.13, @grpc/proto-loader@npm:^0.6.2, @grpc/proto-loader@npm:^0.6.4": +"@grpc/proto-loader@npm:^0.6.1, @grpc/proto-loader@npm:^0.6.10, @grpc/proto-loader@npm:^0.6.13, @grpc/proto-loader@npm:^0.6.4": version: 0.6.13 resolution: "@grpc/proto-loader@npm:0.6.13" dependencies: @@ -5416,8 +5426,7 @@ __metadata: dotenv: ^8.2.0 eslint-config-prettier: ^8.3.0 eslint-plugin-prettier: ^3.4.0 - fabric-ca-client: ^2.2.8 - fabric-network: ^2.2.8 + fabric-network: 2.2.18 level: ^8.0.0 nodemon: ^2.0.4 patch-package: ^6.2.2 @@ -5449,8 +5458,7 @@ __metadata: eslint-config-prettier: ^8.3.0 eslint-plugin-prettier: ^3.4.0 express: ^4.18.1 - fabric-ca-client: ^2.2.8 - fabric-network: ^2.2.8 + fabric-network: 2.2.18 gluegun: latest google-protobuf: 3.13.0 grpc-tools: 1.9.1 @@ -5487,9 +5495,8 @@ __metadata: dotenv: ^8.2.0 eslint-config-prettier: ^6.11.0 eslint-plugin-prettier: ^3.1.4 - fabric-ca-client: ^2.2.8 fabric-common: ^2.2.8 - fabric-network: ^2.2.8 + fabric-network: 2.2.18 mocha: ^5.2.0 nodemon: ^2.0.4 nyc: ^12.0.2 @@ -5508,10 +5515,9 @@ __metadata: version: 0.0.0-use.local resolution: "@hyperledger/cacti-weaver-protos-js@workspace:weaver/common/protos-js" dependencies: - "@grpc/grpc-js": ^1.1.3 + "@grpc/grpc-js": 1.8.18 "@grpc/proto-loader": ^0.5.5 google-protobuf: ^3.21.2 - grpc: ^1.24.3 grpc-tools: ^1.9.1 grpc_tools_node_protoc_ts: ^5.0.1 languageName: unknown @@ -5566,7 +5572,7 @@ __metadata: eslint-plugin-import: ^2.22.1 eslint-plugin-prettier: ^3.4.0 fabric-common: ^2.2.8 - fabric-network: ^2.2.8 + fabric-network: 2.2.18 fabric-protos: ^2.2.8 js-sha3: ^0.7.0 jsrsasign: ^10.5.25 @@ -5696,8 +5702,7 @@ __metadata: ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 express: 4.16.4 - fabric-ca-client: 1.4.19 - fabric-network: 1.4.19 + fabric-network: 2.2.18 http-errors: 1.6.3 http-terminator: 3.2.0 js-yaml: 3.14.1 @@ -5806,7 +5811,7 @@ __metadata: "@types/uuid": 8.3.1 async-exit-hook: 2.0.1 express-jwt: 8.4.1 - fabric-network: 2.2.10 + fabric-network: 2.2.18 fs-extra: 10.0.0 hardhat: 2.13.1 http-status-codes: 2.1.4 @@ -5905,9 +5910,7 @@ __metadata: ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 express: 4.16.4 - fabric-ca-client: 1.4.19 - fabric-client: 1.4.19 - fabric-network: 1.4.19 + fabric-network: 2.2.18 http-errors: 1.6.3 jsonwebtoken: 9.0.0 jsrsasign: 10.5.25 @@ -5942,8 +5945,7 @@ __metadata: ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 express: 4.16.4 - fabric-ca-client: 2.2.10 - fabric-network: 2.2.10 + fabric-network: 2.2.18 http-errors: 1.6.3 js-yaml: 3.14.1 jsonwebtoken: 9.0.0 @@ -5982,7 +5984,7 @@ __metadata: dotenv: 16.0.0 express: 4.17.3 express-jwt: 8.4.1 - fabric-network: 2.2.10 + fabric-network: 2.2.18 jose: 4.9.2 openapi-types: 9.1.0 solc: 0.8.6 @@ -6081,8 +6083,7 @@ __metadata: ethereumjs-common: 1.5.2 ethereumjs-tx: 2.1.2 express: 4.16.4 - fabric-ca-client: 2.2.10 - fabric-network: 2.2.10 + fabric-network: 2.2.18 http-errors: 1.6.3 js-yaml: 3.14.1 jsonwebtoken: 8.5.1 @@ -6393,6 +6394,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hyperledger/cactus-plugin-ledger-connector-fabric-socketio@workspace:packages/cactus-plugin-ledger-connector-fabric-socketio" dependencies: + "@grpc/grpc-js": 1.8.18 "@hyperledger/cactus-api-client": 2.0.0-alpha.1 "@hyperledger/cactus-cmd-socketio-server": 2.0.0-alpha.1 "@hyperledger/cactus-common": 2.0.0-alpha.1 @@ -6409,11 +6411,8 @@ __metadata: cookie-parser: 1.4.6 debug: 3.1.0 express: 4.17.3 - fabric-ca-client: 1.4.19 - fabric-client: 1.4.19 - fabric-network: 1.4.19 + fabric-network: 2.2.18 fs-extra: 10.0.0 - grpc: 1.24.11 js-yaml: 3.14.1 jsonwebtoken: 9.0.0 lodash: 4.17.21 @@ -6543,6 +6542,7 @@ __metadata: version: 0.0.0-use.local resolution: "@hyperledger/cactus-plugin-ledger-connector-iroha@workspace:packages/cactus-plugin-ledger-connector-iroha" dependencies: + "@grpc/grpc-js": 1.8.18 "@hyperledger/cactus-common": 2.0.0-alpha.1 "@hyperledger/cactus-core": 2.0.0-alpha.1 "@hyperledger/cactus-core-api": 2.0.0-alpha.1 @@ -6554,7 +6554,6 @@ __metadata: axios: 0.21.4 express: 4.17.1 fast-safe-stringify: 2.1.1 - grpc: 1.24.11 internal-ip: 6.2.0 iroha-helpers: 1.5.0 key-encoder: 2.0.3 @@ -6734,7 +6733,7 @@ __metadata: "@types/tape": 4.13.0 axios: 0.21.4 crypto-js: 4.0.0 - fabric-network: 2.2.10 + fabric-network: 2.2.18 ipfs-http-client: 51.0.1 knex: 2.4.0 secp256k1: 4.0.2 @@ -6792,7 +6791,7 @@ __metadata: axios: 0.21.4 body-parser: 1.19.0 express: 4.17.1 - fabric-network: 1.4.19 + fabric-network: 2.2.18 fabric-protos: 2.2.18 js-sha256: 0.9.0 pg: 8.8.0 @@ -8398,7 +8397,7 @@ __metadata: languageName: node linkType: hard -"@mapbox/node-pre-gyp@npm:^1.0.0, @mapbox/node-pre-gyp@npm:^1.0.4, @mapbox/node-pre-gyp@npm:^1.0.5": +"@mapbox/node-pre-gyp@npm:^1.0.0, @mapbox/node-pre-gyp@npm:^1.0.5": version: 1.0.9 resolution: "@mapbox/node-pre-gyp@npm:1.0.9" dependencies: @@ -10270,16 +10269,6 @@ __metadata: languageName: node linkType: hard -"@types/bytebuffer@npm:^5.0.34, @types/bytebuffer@npm:^5.0.40": - version: 5.0.43 - resolution: "@types/bytebuffer@npm:5.0.43" - dependencies: - "@types/long": "*" - "@types/node": "*" - checksum: d04ffcec5a25084577362c278e30cf6ee87da2160117a3bae60ff2a5e437e57f730d802806b6e7ba96ebcaf268711a0b1681b09c002ac585d5db5103d0f78a7f - languageName: node - linkType: hard - "@types/cacheable-request@npm:^6.0.1": version: 6.0.2 resolution: "@types/cacheable-request@npm:6.0.2" @@ -10884,7 +10873,7 @@ __metadata: languageName: node linkType: hard -"@types/long@npm:*, @types/long@npm:^4.0.0, @types/long@npm:^4.0.1": +"@types/long@npm:^4.0.0, @types/long@npm:^4.0.1": version: 4.0.1 resolution: "@types/long@npm:4.0.1" checksum: ff9653c33f5000d0f131fd98a950a0343e2e33107dd067a97ac4a3b9678e1a2e39ea44772ad920f54ef6e8f107f76bc92c2584ba905a0dc4253282a4101166d0 @@ -13367,7 +13356,7 @@ __metadata: languageName: node linkType: hard -"async@npm:^1.4.0, async@npm:^1.5.2": +"async@npm:^1.5.2": version: 1.5.2 resolution: "async@npm:1.5.2" checksum: fe5d6214d8f15bd51eee5ae8ec5079b228b86d2d595f47b16369dec2e11b3ff75a567bb5f70d12d79006665fbbb7ee0a7ec0e388524eefd454ecbe651c124ebd @@ -14441,7 +14430,7 @@ __metadata: languageName: node linkType: hard -"bn.js@npm:4.12.0, bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.1, bn.js@npm:^4.11.3, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9": +"bn.js@npm:4.12.0, bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.0, bn.js@npm:^4.11.1, bn.js@npm:^4.11.6, bn.js@npm:^4.11.8, bn.js@npm:^4.11.9": version: 4.12.0 resolution: "bn.js@npm:4.12.0" checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12 @@ -14755,13 +14744,6 @@ __metadata: languageName: node linkType: hard -"browser-request@npm:~0.3.0": - version: 0.3.3 - resolution: "browser-request@npm:0.3.3" - checksum: 8f8db4f95aa33341ffa8d83dd069033310144f439d90bf5aafd4ec0a9495f4cc3fc1515a7d3e15d6968552169f72b7dd90b62efa3647adc4ce9e8be91f907240 - languageName: node - linkType: hard - "browser-resolve@npm:^1.11.3": version: 1.11.3 resolution: "browser-resolve@npm:1.11.3" @@ -15133,7 +15115,7 @@ __metadata: languageName: node linkType: hard -"bytebuffer@npm:^5.0.1, bytebuffer@npm:~5": +"bytebuffer@npm:~5": version: 5.0.1 resolution: "bytebuffer@npm:5.0.1" dependencies: @@ -16134,19 +16116,6 @@ __metadata: languageName: node linkType: hard -"cloudant-follow@npm:~0.17.0": - version: 0.17.0 - resolution: "cloudant-follow@npm:0.17.0" - dependencies: - browser-request: ~0.3.0 - debug: ^3.0.0 - request: ^2.83.0 - bin: - follow: ./cli.js - checksum: 606f2a238f6aa59b7ae14e9659d6d7dac4634cba8b46e9ffde0c024ac9dd2e6e003de398410aa49c7f37c9f11332474ffa93c8eae4235b2155f1ebeb8667cb18 - languageName: node - linkType: hard - "cmd-shim@npm:^6.0.0": version: 6.0.1 resolution: "cmd-shim@npm:6.0.1" @@ -17736,7 +17705,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^3.0.0, debug@npm:^3.0.1, debug@npm:^3.1.0, debug@npm:^3.2.6, debug@npm:^3.2.7": +"debug@npm:^3.0.1, debug@npm:^3.1.0, debug@npm:^3.2.6, debug@npm:^3.2.7": version: 3.2.7 resolution: "debug@npm:3.2.7" dependencies: @@ -19089,13 +19058,6 @@ __metadata: languageName: node linkType: hard -"errs@npm:^0.3.2": - version: 0.3.2 - resolution: "errs@npm:0.3.2" - checksum: 61f68b59632b1a0123035357cc6168202c54695f8b5644fea0be3b4408053faae692d9a833d23e3bc8a74aa62c1017340ba58c10cad48da7d66f8c09328cce8f - languageName: node - linkType: hard - "es-abstract@npm:^1.18.5, es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1": version: 1.19.1 resolution: "es-abstract@npm:1.19.1" @@ -21102,31 +21064,6 @@ __metadata: languageName: node linkType: hard -"fabric-ca-client@npm:1.4.19": - version: 1.4.19 - resolution: "fabric-ca-client@npm:1.4.19" - dependencies: - grpc: 1.24.11 - jsrsasign: ^10.4.1 - lodash.clone: 4.5.0 - url: ^0.11.0 - winston: ^2.4.0 - checksum: 6f288f528cc5387d388008629a715aaf1d027e4155d9baa7f10a8f32eafe8689d8085b4bb3c7aa7b43f71658dc890be68dbcbce38282c8662589878433ca8049 - languageName: node - linkType: hard - -"fabric-ca-client@npm:2.2.10": - version: 2.2.10 - resolution: "fabric-ca-client@npm:2.2.10" - dependencies: - fabric-common: 2.2.10 - jsrsasign: ^10.4.1 - url: ^0.11.0 - winston: ^2.4.5 - checksum: eefd19a135ac118d207fb609bf2a43c3dbeb844b416c4697b3c715eb4cfd752cfcfd128e0cbdc069b6afa22b0a1dffc45d2fddb41d7b816a408813829739b5c5 - languageName: node - linkType: hard - "fabric-ca-client@npm:2.5.0-snapshot.8": version: 2.5.0-snapshot.8 resolution: "fabric-ca-client@npm:2.5.0-snapshot.8" @@ -21139,65 +21076,17 @@ __metadata: languageName: node linkType: hard -"fabric-ca-client@npm:^2.2.8": - version: 2.2.17 - resolution: "fabric-ca-client@npm:2.2.17" - dependencies: - fabric-common: 2.2.17 - jsrsasign: ^10.5.25 - url: ^0.11.0 - winston: ^2.4.5 - checksum: bf7b3cf8706e9f9fecaf75b61eb8ea19d4f9eb72dc18082f9069244fd534be590ed32b0e987e8a9da8252bff760d2f6a61b283cb7ab37c9d9bfea0b02b11e9f2 - languageName: node - linkType: hard - -"fabric-client@npm:1.4.19": - version: 1.4.19 - resolution: "fabric-client@npm:1.4.19" - dependencies: - "@types/bytebuffer": ^5.0.34 - bn.js: ^4.11.3 - bytebuffer: ^5.0.1 - callsite: ^1.0.0 - elliptic: ^6.5.4 - fabric-ca-client: 1.4.19 - fs-extra: ^8.1.0 - grpc: 1.24.11 - ignore-walk: ^3.0.0 - js-sha3: ^0.7.0 - js-yaml: ^3.9.0 - jsrsasign: ^10.4.1 - klaw: ^4.0.1 - lodash.clone: 4.5.0 - long: ^4.0.0 - nano: ^6.4.4 - nconf: ^0.10.0 - pkcs11js: ^1.0.6 - promise-settle: ^0.3.0 - protobufjs: 5.0.3 - sjcl: 1.0.7 - tar-stream: ^2.2.0 - url: ^0.11.0 - winston: ^2.4.0 - dependenciesMeta: - pkcs11js: - optional: true - checksum: d5010e699c9898bdf009d7a0d442b6095732d0743484a404b0625672dc9fbb74a199ff0c624ac44a3673b94d0a72f04b88f8be5ca53c1146eb788d7f784d3e96 - languageName: node - linkType: hard - -"fabric-common@npm:2.2.10": - version: 2.2.10 - resolution: "fabric-common@npm:2.2.10" +"fabric-common@npm:2.2.18": + version: 2.2.18 + resolution: "fabric-common@npm:2.2.18" dependencies: callsite: ^1.0.0 elliptic: ^6.5.4 - fabric-protos: 2.2.10 + fabric-protos: 2.2.18 js-sha3: ^0.8.0 - jsrsasign: ^10.4.1 - long: ^4.0.0 - nconf: ^0.11.2 - pkcs11js: ^1.0.6 + jsrsasign: ^10.5.25 + nconf: ^0.12.0 + pkcs11js: ^1.3.0 promise-settle: ^0.3.0 sjcl: ^1.0.8 winston: ^2.4.5 @@ -21205,21 +21094,21 @@ __metadata: dependenciesMeta: pkcs11js: optional: true - checksum: aa9a79f749e272a6090fa09511ec1d5e1284dc7451cbd15c671f78b979c40596596eefa374a12a131678c372604c6a7ef7cf0e61adfbd91b7416f017407a408f + checksum: 3704b50daabac6e3951a1a82fd9a02d10433cf1a78b694c92e8490a4991b5fda3b8804f7f70336d68b06fbf5b5a85d04497344e1df10719b1ed71390be53bb67 languageName: node linkType: hard -"fabric-common@npm:2.2.17, fabric-common@npm:^2.2.8": - version: 2.2.17 - resolution: "fabric-common@npm:2.2.17" +"fabric-common@npm:2.5.0-snapshot.8": + version: 2.5.0-snapshot.8 + resolution: "fabric-common@npm:2.5.0-snapshot.8" dependencies: callsite: ^1.0.0 elliptic: ^6.5.4 - fabric-protos: 2.2.17 + fabric-protos: 2.5.0-snapshot.8 js-sha3: ^0.8.0 jsrsasign: ^10.5.25 nconf: ^0.12.0 - pkcs11js: ^1.3.0 + pkcs11js: ^1.0.6 promise-settle: ^0.3.0 sjcl: ^1.0.8 winston: ^2.4.5 @@ -21227,21 +21116,21 @@ __metadata: dependenciesMeta: pkcs11js: optional: true - checksum: 0cef5e2c9b047992e8b4525521d3c71ab53d7e5ef8c68193d9d7831a0e773fe5e024ace24e02f88f6764ea1dce6d269ce14877dcafe9e4ab7adee57abafcd0d5 + checksum: d5df5dc5853b0eb9e65c9bbecde1366533623719aef074d4d142d2dabcc65f1212c2189773e348f08864011cf4a2ddce35066029b4420027534a18479422e8be languageName: node linkType: hard -"fabric-common@npm:2.5.0-snapshot.8": - version: 2.5.0-snapshot.8 - resolution: "fabric-common@npm:2.5.0-snapshot.8" +"fabric-common@npm:^2.2.8": + version: 2.2.17 + resolution: "fabric-common@npm:2.2.17" dependencies: callsite: ^1.0.0 elliptic: ^6.5.4 - fabric-protos: 2.5.0-snapshot.8 + fabric-protos: 2.2.17 js-sha3: ^0.8.0 jsrsasign: ^10.5.25 nconf: ^0.12.0 - pkcs11js: ^1.0.6 + pkcs11js: ^1.3.0 promise-settle: ^0.3.0 sjcl: ^1.0.8 winston: ^2.4.5 @@ -21249,32 +21138,18 @@ __metadata: dependenciesMeta: pkcs11js: optional: true - checksum: d5df5dc5853b0eb9e65c9bbecde1366533623719aef074d4d142d2dabcc65f1212c2189773e348f08864011cf4a2ddce35066029b4420027534a18479422e8be - languageName: node - linkType: hard - -"fabric-network@npm:1.4.19": - version: 1.4.19 - resolution: "fabric-network@npm:1.4.19" - dependencies: - fabric-ca-client: 1.4.19 - fabric-client: 1.4.19 - nano: ^6.4.4 - rimraf: ^2.6.2 - winston: ^2.4.0 - checksum: a6a8ed1781cefe18e7377369c653d3290ba0ed3680903a8a5f028d544f7f2bcc1eaa5e7a6469bbf3f400c60481601a1d65693164a815e4eabee2f802f2506065 + checksum: 0cef5e2c9b047992e8b4525521d3c71ab53d7e5ef8c68193d9d7831a0e773fe5e024ace24e02f88f6764ea1dce6d269ce14877dcafe9e4ab7adee57abafcd0d5 languageName: node linkType: hard -"fabric-network@npm:2.2.10": - version: 2.2.10 - resolution: "fabric-network@npm:2.2.10" +"fabric-network@npm:2.2.18": + version: 2.2.18 + resolution: "fabric-network@npm:2.2.18" dependencies: - fabric-common: 2.2.10 - fabric-protos: 2.2.10 - long: ^4.0.0 - nano: ^9.0.3 - checksum: 782435be36fc19daabba079dc71d65d2f8ee03d82b1be99791195ea219bcf68f1f64e9c25864b77e26ed77b5966d106fdeaa27741574a056858d499d0686a4b6 + fabric-common: 2.2.18 + fabric-protos: 2.2.18 + nano: ^9.0.5 + checksum: 192e606f75386b1ffc381bf1b55c3a01aeed4c7f64dd6a48629b11d81d3b83203d657ccec75e709a1ce9502688ff048906d0bdd09de57cdfc51524b1d192f59c languageName: node linkType: hard @@ -21289,28 +21164,6 @@ __metadata: languageName: node linkType: hard -"fabric-network@npm:^2.2.8": - version: 2.2.17 - resolution: "fabric-network@npm:2.2.17" - dependencies: - fabric-common: 2.2.17 - fabric-protos: 2.2.17 - nano: ^9.0.5 - checksum: 11ea17dba155a3c1c6792b095ce2fa64671f88f0a7643453378cf086fa1ea866a88e66b4467da5077481d0a483568f105008577efc5e171407f064b74e0133ae - languageName: node - linkType: hard - -"fabric-protos@npm:2.2.10": - version: 2.2.10 - resolution: "fabric-protos@npm:2.2.10" - dependencies: - "@grpc/grpc-js": ^1.3.4 - "@grpc/proto-loader": ^0.6.2 - protobufjs: ^6.11.2 - checksum: bdb682a72b366018c1dc32791e28ddefc5ac721170bb74c5d0bdcbe69d47470df853a78145d382d9c9cc71ba5eb237af59a81eeeb70affb6abf1405e837b64b1 - languageName: node - linkType: hard - "fabric-protos@npm:2.2.17, fabric-protos@npm:^2.2.8": version: 2.2.17 resolution: "fabric-protos@npm:2.2.17" @@ -23409,20 +23262,6 @@ gluegun@latest: languageName: node linkType: hard -"grpc@npm:1.24.11, grpc@npm:^1.24.3": - version: 1.24.11 - resolution: "grpc@npm:1.24.11" - dependencies: - "@mapbox/node-pre-gyp": ^1.0.4 - "@types/bytebuffer": ^5.0.40 - lodash.camelcase: ^4.3.0 - lodash.clone: ^4.5.0 - nan: ^2.13.2 - protobufjs: ^5.0.3 - checksum: a437525786329ff541d7bbb54e472f52001a4d9b1c2fd896468241e2f070bf558b380b3d19d2b87f401602bd5a319b171e119598f4035958a9519851e91110db - languageName: node - linkType: hard - "grpc_tools_node_protoc_ts@npm:5.3.1": version: 5.3.1 resolution: "grpc_tools_node_protoc_ts@npm:5.3.1" @@ -24355,7 +24194,7 @@ gluegun@latest: languageName: node linkType: hard -"ignore-walk@npm:3.0.4, ignore-walk@npm:^3.0.0, ignore-walk@npm:^3.0.1": +"ignore-walk@npm:3.0.4, ignore-walk@npm:^3.0.1": version: 3.0.4 resolution: "ignore-walk@npm:3.0.4" dependencies: @@ -24545,7 +24384,7 @@ gluegun@latest: languageName: node linkType: hard -"ini@npm:^1.3.0, ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.6, ini@npm:~1.3.0": +"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.6, ini@npm:~1.3.0": version: 1.3.8 resolution: "ini@npm:1.3.8" checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3 @@ -27826,7 +27665,7 @@ gluegun@latest: languageName: node linkType: hard -"js-yaml@npm:3.14.1, js-yaml@npm:^3.13.1, js-yaml@npm:^3.9.0, js-yaml@npm:^3.9.1": +"js-yaml@npm:3.14.1, js-yaml@npm:^3.13.1, js-yaml@npm:^3.9.1": version: 3.14.1 resolution: "js-yaml@npm:3.14.1" dependencies: @@ -28223,7 +28062,7 @@ gluegun@latest: languageName: node linkType: hard -"jsrsasign@npm:10.5.25, jsrsasign@npm:^10.4.0, jsrsasign@npm:^10.4.1": +"jsrsasign@npm:10.5.25, jsrsasign@npm:^10.4.0": version: 10.5.25 resolution: "jsrsasign@npm:10.5.25" checksum: e789cd6d5e6e236edebe91936279cdef886aafaab8d4ebc7d40b8ba0c7b7cd0d6d3c53fba26ea96eb33cc77a05368b369ef31fc9182662bce2344143ad50ea0f @@ -28568,13 +28407,6 @@ gluegun@latest: languageName: node linkType: hard -"klaw@npm:^4.0.1": - version: 4.0.1 - resolution: "klaw@npm:4.0.1" - checksum: 7835649ef632f96099d500f94b38c032acf1432ad5e87da596a2509c2f6a63a7fc346fb357e2227091cc433af5c1378ed448e1c0522ed028981dcd446152291e - languageName: node - linkType: hard - "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -29286,13 +29118,6 @@ gluegun@latest: languageName: node linkType: hard -"lodash.clone@npm:4.5.0, lodash.clone@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.clone@npm:4.5.0" - checksum: 5839f22acf3a43c026ac4325f7bcd378f34967415cd0b9fd7efa9bbbf38dc665900d36e040944c5afab94a51ff8a24f6cfc3781fe439705cbad5c722e9506b16 - languageName: node - linkType: hard - "lodash.clonedeep@npm:^4.5.0": version: 4.5.0 resolution: "lodash.clonedeep@npm:4.5.0" @@ -29342,13 +29167,6 @@ gluegun@latest: languageName: node linkType: hard -"lodash.isempty@npm:^4.4.0": - version: 4.4.0 - resolution: "lodash.isempty@npm:4.4.0" - checksum: a8118f23f7ed72a1dbd176bf27f297d1e71aa1926288449cb8f7cef99ba1bc7527eab52fe7899ab080fa1dc150aba6e4a6367bf49fa4e0b78da1ecc095f8d8c5 - languageName: node - linkType: hard - "lodash.isequal@npm:^4.5.0": version: 4.5.0 resolution: "lodash.isequal@npm:4.5.0" @@ -31185,7 +31003,7 @@ gluegun@latest: languageName: node linkType: hard -"nan@npm:^2.13.2, nan@npm:^2.14.0, nan@npm:^2.14.1, nan@npm:^2.15.0, nan@npm:^2.2.1": +"nan@npm:^2.14.0, nan@npm:^2.14.1, nan@npm:^2.15.0, nan@npm:^2.2.1": version: 2.15.0 resolution: "nan@npm:2.15.0" dependencies: @@ -31228,20 +31046,7 @@ gluegun@latest: languageName: node linkType: hard -"nano@npm:^6.4.4": - version: 6.4.4 - resolution: "nano@npm:6.4.4" - dependencies: - cloudant-follow: ~0.17.0 - debug: ^2.2.0 - errs: ^0.3.2 - lodash.isempty: ^4.4.0 - request: ^2.85.0 - checksum: 4391a47bbade34dbb25391162bff86b6e48008223634d9a745ed449733268dd703a50fb64698433d68d9125f84e576e0ef9fb3c5e413652d66cb62e44a072070 - languageName: node - linkType: hard - -"nano@npm:^9.0.3, nano@npm:^9.0.5": +"nano@npm:^9.0.5": version: 9.0.5 resolution: "nano@npm:9.0.5" dependencies: @@ -31376,30 +31181,6 @@ gluegun@latest: languageName: node linkType: hard -"nconf@npm:^0.10.0": - version: 0.10.0 - resolution: "nconf@npm:0.10.0" - dependencies: - async: ^1.4.0 - ini: ^1.3.0 - secure-keys: ^1.0.0 - yargs: ^3.19.0 - checksum: 14052553bcde03dbdf11bc3ee95b8cdb7fe776ada550763df75c9683335a937545f62e96972ad2fd4bcc85f928d9880fc74b8c5f93eaddef58d6e0f46c0c836f - languageName: node - linkType: hard - -"nconf@npm:^0.11.2": - version: 0.11.3 - resolution: "nconf@npm:0.11.3" - dependencies: - async: ^1.4.0 - ini: ^2.0.0 - secure-keys: ^1.0.0 - yargs: ^16.1.1 - checksum: 708369c9526618936872fc7db4d257dda59cb55fb9e07949afcfac7cf60cdc840027a6bdf5bf3c5703129bea23090de1aa6f6f41aec004086963706c04bf81f5 - languageName: node - linkType: hard - "nconf@npm:^0.12.0": version: 0.12.0 resolution: "nconf@npm:0.12.0" @@ -34958,7 +34739,7 @@ gluegun@latest: languageName: node linkType: hard -"protobufjs@npm:5.0.3, protobufjs@npm:^5.0.3": +"protobufjs@npm:5.0.3": version: 5.0.3 resolution: "protobufjs@npm:5.0.3" dependencies: @@ -36196,7 +35977,7 @@ gluegun@latest: languageName: node linkType: hard -"request@npm:^2.79.0, request@npm:^2.83.0, request@npm:^2.85.0, request@npm:^2.87.0, request@npm:^2.88.0": +"request@npm:^2.79.0, request@npm:^2.87.0, request@npm:^2.88.0": version: 2.88.2 resolution: "request@npm:2.88.2" dependencies: @@ -39710,7 +39491,7 @@ gluegun@latest: languageName: node linkType: hard -"tar-stream@npm:2.2.0, tar-stream@npm:^2.0.0, tar-stream@npm:^2.1.4, tar-stream@npm:^2.2.0": +"tar-stream@npm:2.2.0, tar-stream@npm:^2.0.0, tar-stream@npm:^2.1.4": version: 2.2.0 resolution: "tar-stream@npm:2.2.0" dependencies: @@ -44317,7 +44098,7 @@ gluegun@latest: languageName: node linkType: hard -"winston@npm:^2.4.0, winston@npm:^2.4.5": +"winston@npm:^2.4.5": version: 2.4.5 resolution: "winston@npm:2.4.5" dependencies: @@ -45253,7 +45034,7 @@ gluegun@latest: languageName: node linkType: hard -"yargs@npm:^3.10.0, yargs@npm:^3.19.0": +"yargs@npm:^3.10.0": version: 3.32.0 resolution: "yargs@npm:3.32.0" dependencies: