From cee0fdf32643672f992c339b757976764b8ff5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Bruus=20Zeppelin?= Date: Fri, 2 Feb 2024 15:07:05 +0100 Subject: [PATCH] Expose legacy GRPC client from common-sdk --- packages/browser-wallet-api/package.json | 1 + packages/browser-wallet-api/src/wallet-api.ts | 2 +- yarn.lock | 81 ++++++++++++++++++- 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/packages/browser-wallet-api/package.json b/packages/browser-wallet-api/package.json index 4464c4516..0b9910a05 100644 --- a/packages/browser-wallet-api/package.json +++ b/packages/browser-wallet-api/package.json @@ -9,6 +9,7 @@ "dependencies": { "@concordium/browser-wallet-api-helpers": "workspace:^", "@concordium/browser-wallet-message-hub": "workspace:^", + "@concordium/common-sdk": "^9.5.3", "@concordium/web-sdk": "^7.1.0", "@protobuf-ts/grpcweb-transport": "^2.8.2", "@protobuf-ts/runtime-rpc": "^2.8.2", diff --git a/packages/browser-wallet-api/src/wallet-api.ts b/packages/browser-wallet-api/src/wallet-api.ts index 4d95410e2..91e439fde 100644 --- a/packages/browser-wallet-api/src/wallet-api.ts +++ b/packages/browser-wallet-api/src/wallet-api.ts @@ -28,7 +28,7 @@ import { } from '@concordium/browser-wallet-api-helpers'; import EventEmitter from 'events'; import { IdProofOutput, IdStatement } from '@concordium/web-sdk/id'; -import { ConcordiumGRPCClient } from '@concordium/web-sdk/grpc'; +import { ConcordiumGRPCClient } from '@concordium/common-sdk/lib/GRPCClient'; import { RpcTransport } from '@protobuf-ts/runtime-rpc'; import * as JSONBig from 'json-bigint'; import { stringify } from './util'; diff --git a/yarn.lock b/yarn.lock index 5d2f8a6ed..03cea9b47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2184,6 +2184,7 @@ __metadata: dependencies: "@concordium/browser-wallet-api-helpers": "workspace:^" "@concordium/browser-wallet-message-hub": "workspace:^" + "@concordium/common-sdk": ^9.5.3 "@concordium/web-sdk": ^7.1.0 "@protobuf-ts/grpcweb-transport": ^2.8.2 "@protobuf-ts/runtime-rpc": ^2.8.2 @@ -2285,6 +2286,27 @@ __metadata: languageName: unknown linkType: soft +"@concordium/common-sdk@npm:^9.5.3": + version: 9.5.3 + resolution: "@concordium/common-sdk@npm:9.5.3" + dependencies: + "@concordium/rust-bindings": 1.2.0 + "@grpc/grpc-js": ^1.3.4 + "@noble/ed25519": ^1.7.1 + "@protobuf-ts/runtime-rpc": ^2.8.2 + "@scure/bip39": ^1.1.0 + big.js: ^6.2.0 + bs58check: ^2.1.2 + buffer: ^6.0.3 + cross-fetch: 3.1.5 + hash.js: ^1.1.7 + iso-3166-1: ^2.1.1 + json-bigint: ^1.0.0 + uuid: ^8.3.2 + checksum: 48885be5c80fb7cf99612f641229bd58406b4ec34f39a5874d5875cbcc17f68c96d7e5e814c66a955936152cc2db454e45399b18d5b263898cec06f82846ced6 + languageName: node + linkType: hard + "@concordium/react-components@npm:^0.4.0": version: 0.4.0 resolution: "@concordium/react-components@npm:0.4.0" @@ -2297,6 +2319,13 @@ __metadata: languageName: node linkType: hard +"@concordium/rust-bindings@npm:1.2.0": + version: 1.2.0 + resolution: "@concordium/rust-bindings@npm:1.2.0" + checksum: a0deb7d2a8bea7b32487a85fd9981e40a1e0ad5ca72c625887e7d735933abae9adac34ab3047a0ac2f3e690ac8c5ac5d7a763a5fef9efe2c6d209860aa5cf6ec + languageName: node + linkType: hard + "@concordium/rust-bindings@npm:2.0.1": version: 2.0.1 resolution: "@concordium/rust-bindings@npm:2.0.1" @@ -2825,6 +2854,16 @@ __metadata: languageName: node linkType: hard +"@grpc/grpc-js@npm:^1.3.4": + version: 1.9.14 + resolution: "@grpc/grpc-js@npm:1.9.14" + dependencies: + "@grpc/proto-loader": ^0.7.8 + "@types/node": ">=12.12.47" + checksum: 1e0821876fc55fa1d71a674e65db6227ca398f6ff77735bd44d8d4a554fa97dcddd06e7844c3d7da37350feafd824ec88af04f0ab0e0c2e0bc8f753939935240 + languageName: node + linkType: hard + "@grpc/grpc-js@npm:^1.9.4": version: 1.9.5 resolution: "@grpc/grpc-js@npm:1.9.5" @@ -3431,7 +3470,7 @@ __metadata: languageName: node linkType: hard -"@noble/ed25519@npm:^1.7.0": +"@noble/ed25519@npm:^1.7.0, @noble/ed25519@npm:^1.7.1": version: 1.7.3 resolution: "@noble/ed25519@npm:1.7.3" checksum: 45169927d51de513e47bbeebff3a603433c4ac7579e1b8c5034c380a0afedbe85e6959be3d69584a7a5ed6828d638f8f28879003b9bb2fb5f22d8aa2d88fd5fe @@ -8499,6 +8538,15 @@ __metadata: languageName: node linkType: hard +"base-x@npm:^3.0.2": + version: 3.0.9 + resolution: "base-x@npm:3.0.9" + dependencies: + safe-buffer: ^5.0.1 + checksum: 957101d6fd09e1903e846fd8f69fd7e5e3e50254383e61ab667c725866bec54e5ece5ba49ce385128ae48f9ec93a26567d1d5ebb91f4d56ef4a9cc0d5a5481e8 + languageName: node + linkType: hard + "base-x@npm:^4.0.0": version: 4.0.0 resolution: "base-x@npm:4.0.0" @@ -8890,6 +8938,15 @@ __metadata: languageName: node linkType: hard +"bs58@npm:^4.0.0": + version: 4.0.1 + resolution: "bs58@npm:4.0.1" + dependencies: + base-x: ^3.0.2 + checksum: b3c5365bb9e0c561e1a82f1a2d809a1a692059fae016be233a6127ad2f50a6b986467c3a50669ce4c18929dcccb297c5909314dd347a25a68c21b68eb3e95ac2 + languageName: node + linkType: hard + "bs58@npm:^5.0.0": version: 5.0.0 resolution: "bs58@npm:5.0.0" @@ -8899,6 +8956,17 @@ __metadata: languageName: node linkType: hard +"bs58check@npm:^2.1.2": + version: 2.1.2 + resolution: "bs58check@npm:2.1.2" + dependencies: + bs58: ^4.0.0 + create-hash: ^1.1.0 + safe-buffer: ^5.1.2 + checksum: 43bdf08a5dd04581b78f040bc4169480e17008da482ffe2a6507327bbc4fc5c28de0501f7faf22901cfe57fbca79cbb202ca529003fedb4cb8dccd265b38e54d + languageName: node + linkType: hard + "bs58check@npm:^3.0.1": version: 3.0.1 resolution: "bs58check@npm:3.0.1" @@ -10219,6 +10287,15 @@ __metadata: languageName: node linkType: hard +"cross-fetch@npm:3.1.5": + version: 3.1.5 + resolution: "cross-fetch@npm:3.1.5" + dependencies: + node-fetch: 2.6.7 + checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb + languageName: node + linkType: hard + "cross-spawn@npm:^6.0.0": version: 6.0.5 resolution: "cross-spawn@npm:6.0.5" @@ -17317,7 +17394,7 @@ __metadata: languageName: node linkType: hard -"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": +"node-fetch@npm:2.6.7, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" dependencies: