Skip to content

Commit

Permalink
build(deps): upgrade @grpc/grpc-js to v1.10.3
Browse files Browse the repository at this point in the history
1. This is a pre-requisite for a bigger change that is adding gRPC
endpoint support to the plugins.
2. We've had gRPC support in the API server for a long time, but the
plugins are not yet able to register their own gRPC services as of now.
3. The reason we need the newer version is because some types are not
exported by the older version that we'll be using to implement the
gRPC support for plugins.

Signed-off-by: Peter Somogyvari <[email protected]>
  • Loading branch information
petermetz committed Mar 19, 2024
1 parent f90ca06 commit 154ea7d
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module.exports = {
externals: {
"@fidm/x509": "@fidm/x509",
"@grpc/grpc-js": "@grpc/grpc-js",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "@grpc/proto-loader",
busboy: "busboy",
child_process: "child_process",
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-cmd-api-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
},
"dependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@hyperledger/cactus-common": "2.0.0-alpha.2",
"@hyperledger/cactus-core": "2.0.0-alpha.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-core-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"axios": "1.6.0"
},
"devDependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@types/express": "4.17.19",
"@types/google-protobuf": "3.15.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/cactus-plugin-ledger-connector-iroha/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"webpack:dev:web": "webpack --env=dev --target=web --config ../../webpack.config.js"
},
"dependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@hyperledger/cactus-common": "2.0.0-alpha.2",
"@hyperledger/cactus-core": "2.0.0-alpha.2",
"@hyperledger/cactus-core-api": "2.0.0-alpha.2",
Expand Down
2 changes: 1 addition & 1 deletion weaver/common/protos-js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"google-protobuf": "3.21.2",
"grpc-tools": "1.12.4"
Expand Down
2 changes: 1 addition & 1 deletion weaver/core/drivers/fabric-driver/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@fidm/x509": "1.2.1",
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@hyperledger/cacti-weaver-protos-js": "file:./protos-js",
"@hyperledger/cacti-weaver-sdk-fabric": "file:./cacti-weaver-sdk-fabric",
"dotenv": "8.6.0",
Expand Down
2 changes: 1 addition & 1 deletion weaver/core/drivers/fabric-driver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@fidm/x509": "1.2.1",
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.2",
"@hyperledger/cacti-weaver-sdk-fabric": "2.0.0-alpha.2",
"dotenv": "8.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@fidm/x509": "1.2.1",
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@hyperledger/cacti-weaver-protos-js": "file:./protos-js",
"@hyperledger/cacti-weaver-sdk-fabric": "file:./cacti-weaver-sdk-fabric",
"dotenv": "8.6.0",
Expand Down
2 changes: 1 addition & 1 deletion weaver/core/identity-management/iin-agent/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"dependencies": {
"@fidm/x509": "1.2.1",
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.2",
"@hyperledger/cacti-weaver-sdk-fabric": "2.0.0-alpha.2",
"dotenv": "8.6.0",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/fabric/fabric-cli/package-local.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"y18n": "4.0.3"
},
"devDependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@types/express": "4.17.19",
"@types/jest": "29.5.3",
Expand Down
2 changes: 1 addition & 1 deletion weaver/samples/fabric/fabric-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"y18n": "4.0.3"
},
"devDependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@types/express": "4.17.19",
"@types/jest": "29.5.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
]
},
"dependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@hyperledger/cacti-weaver-protos-js": "file:./protos-js",
"elliptic": "6.5.4",
Expand Down
2 changes: 1 addition & 1 deletion weaver/sdks/fabric/interoperation-node-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
]
},
"dependencies": {
"@grpc/grpc-js": "1.9.5",
"@grpc/grpc-js": "1.10.3",
"@grpc/proto-loader": "0.7.8",
"@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.2",
"elliptic": "6.5.4",
Expand Down
37 changes: 22 additions & 15 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7026,13 +7026,13 @@ __metadata:
languageName: node
linkType: hard

"@grpc/grpc-js@npm:1.9.5":
version: 1.9.5
resolution: "@grpc/grpc-js@npm:1.9.5"
"@grpc/grpc-js@npm:1.10.3":
version: 1.10.3
resolution: "@grpc/grpc-js@npm:1.10.3"
dependencies:
"@grpc/proto-loader": "npm:^0.7.8"
"@types/node": "npm:>=12.12.47"
checksum: 10/5499d964d29601ad1850e45aaeccbfaa980dfffbe6bd4fdd587ef3cf4cc62d69dadf2ee8eb1d6220c468607cef70ae55d24eccfc57a51f453e965a82a3fd1f77
"@grpc/proto-loader": "npm:^0.7.10"
"@js-sdsl/ordered-map": "npm:^4.4.2"
checksum: 10/8217ba9ae6bbc3b25fe6e1fd4494864c75180a408bf33ece88078ab849027483dac480ebc509d2f0838ff77b99e4a0958bd0909fce1a58c380d620c23aeba9f7
languageName: node
linkType: hard

Expand Down Expand Up @@ -7096,7 +7096,7 @@ __metadata:
languageName: node
linkType: hard

"@grpc/proto-loader@npm:^0.7.8":
"@grpc/proto-loader@npm:^0.7.10, @grpc/proto-loader@npm:^0.7.8":
version: 0.7.10
resolution: "@grpc/proto-loader@npm:0.7.10"
dependencies:
Expand Down Expand Up @@ -7355,7 +7355,7 @@ __metadata:
resolution: "@hyperledger/cacti-weaver-driver-fabric@workspace:weaver/core/drivers/fabric-driver"
dependencies:
"@fidm/x509": "npm:1.2.1"
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@hyperledger/cacti-weaver-protos-js": "npm:2.0.0-alpha.2"
"@hyperledger/cacti-weaver-sdk-fabric": "npm:2.0.0-alpha.2"
"@types/node": "npm:18.11.9"
Expand All @@ -7378,7 +7378,7 @@ __metadata:
resolution: "@hyperledger/cacti-weaver-fabric-cli@workspace:weaver/samples/fabric/fabric-cli"
dependencies:
"@fidm/x509": "npm:1.2.1"
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@grpc/proto-loader": "npm:0.7.8"
"@hyperledger/cacti-weaver-protos-js": "npm:2.0.0-alpha.2"
"@hyperledger/cacti-weaver-sdk-fabric": "npm:2.0.0-alpha.2"
Expand Down Expand Up @@ -7417,7 +7417,7 @@ __metadata:
resolution: "@hyperledger/cacti-weaver-iin-agent@workspace:weaver/core/identity-management/iin-agent"
dependencies:
"@fidm/x509": "npm:1.2.1"
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@hyperledger/cacti-weaver-protos-js": "npm:2.0.0-alpha.2"
"@hyperledger/cacti-weaver-sdk-fabric": "npm:2.0.0-alpha.2"
"@types/jsrsasign": "npm:10.5.11"
Expand Down Expand Up @@ -7449,7 +7449,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@hyperledger/cacti-weaver-protos-js@workspace:weaver/common/protos-js"
dependencies:
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@grpc/proto-loader": "npm:0.7.8"
google-protobuf: "npm:3.21.2"
grpc-tools: "npm:1.12.4"
Expand Down Expand Up @@ -7483,7 +7483,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@hyperledger/cacti-weaver-sdk-fabric@workspace:weaver/sdks/fabric/interoperation-node-sdk"
dependencies:
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@grpc/proto-loader": "npm:0.7.8"
"@hyperledger/cacti-weaver-protos-js": "npm:2.0.0-alpha.2"
"@types/node": "npm:18.11.9"
Expand Down Expand Up @@ -7534,7 +7534,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@hyperledger/cactus-cmd-api-server@workspace:packages/cactus-cmd-api-server"
dependencies:
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@grpc/proto-loader": "npm:0.7.8"
"@hyperledger/cactus-common": "npm:2.0.0-alpha.2"
"@hyperledger/cactus-core": "npm:2.0.0-alpha.2"
Expand Down Expand Up @@ -7681,7 +7681,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@hyperledger/cactus-core-api@workspace:packages/cactus-core-api"
dependencies:
"@grpc/grpc-js": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@grpc/proto-loader": "npm:0.7.8"
"@hyperledger/cactus-common": "npm:2.0.0-alpha.2"
"@types/express": "npm:4.17.19"
Expand Down Expand Up @@ -8634,7 +8634,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": "npm:1.9.5"
"@grpc/grpc-js": "npm:1.10.3"
"@hyperledger/cactus-common": "npm:2.0.0-alpha.2"
"@hyperledger/cactus-core": "npm:2.0.0-alpha.2"
"@hyperledger/cactus-core-api": "npm:2.0.0-alpha.2"
Expand Down Expand Up @@ -10337,6 +10337,13 @@ __metadata:
languageName: node
linkType: hard

"@js-sdsl/ordered-map@npm:^4.4.2":
version: 4.4.2
resolution: "@js-sdsl/ordered-map@npm:4.4.2"
checksum: 10/ac64e3f0615ecc015461c9f527f124d2edaa9e68de153c1e270c627e01e83d046522d7e872692fd57a8c514578b539afceff75831c0d8b2a9a7a347fbed35af4
languageName: node
linkType: hard

"@jsdevtools/ono@npm:7.1.3, @jsdevtools/ono@npm:^7.1.3":
version: 7.1.3
resolution: "@jsdevtools/ono@npm:7.1.3"
Expand Down

0 comments on commit 154ea7d

Please sign in to comment.