From 1e2fdfba58cda87e7b12f78f14ee62cf6192be9a Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 10 Nov 2020 22:31:26 +0100 Subject: [PATCH] Swap with USB libs (#400) --- packages/ledger-transports/package.json | 4 +- .../src/ledger-node-hid.d.ts | 16 ++++++ packages/ledger/package.json | 2 +- packages/ui-keyring/package.json | 2 +- yarn.lock | 49 +++++++++---------- 5 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 packages/ledger-transports/src/ledger-node-hid.d.ts diff --git a/packages/ledger-transports/package.json b/packages/ledger-transports/package.json index 959814f1..de4a4b00 100644 --- a/packages/ledger-transports/package.json +++ b/packages/ledger-transports/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/ledger-transports", "version": "0.62.2-8", - "repository": "https://github.com/polkadot-js/ui.git", + "repository": "github:polkadot-js/ui", "author": "Jaco Greeff ", "maintainers": [], "contributors": [], @@ -19,6 +19,6 @@ "@types/ledgerhq__hw-transport-webusb": "^4.70.1" }, "optionalDependencies": { - "@ledgerhq/hw-transport-node-hid": "^5.28.0" + "@ledgerhq/hw-transport-node-hid-singleton": "^5.28.0" } } diff --git a/packages/ledger-transports/src/ledger-node-hid.d.ts b/packages/ledger-transports/src/ledger-node-hid.d.ts new file mode 100644 index 00000000..6d6a34b1 --- /dev/null +++ b/packages/ledger-transports/src/ledger-node-hid.d.ts @@ -0,0 +1,16 @@ +// Copyright 2017-2020 @polkadot/ledger authors & contributors +// SPDX-License-Identifier: Apache-2.0 + + +declare module '@ledgerhq/hw-transport-node-hid-noevents' { + import Transport from '@ledgerhq/hw-transport'; + + export default class TransportNodeHidNoEvents extends Transport {} + export function getDevices(): Array +} + +declare module '@ledgerhq/hw-transport-node-hid-singleton' { + import TransportNodeHidNoEvents, { getDevices } from '@ledgerhq/hw-transport-node-hid-noevents'; + + export default class TransportNodeHid extends TransportNodeHidNoEvents { } +} diff --git a/packages/ledger/package.json b/packages/ledger/package.json index f0aeba77..a33b2e1a 100644 --- a/packages/ledger/package.json +++ b/packages/ledger/package.json @@ -1,7 +1,7 @@ { "name": "@polkadot/ledger", "version": "0.62.2-8", - "repository": "https://github.com/polkadot-js/ui.git", + "repository": "github:polkadot-js/ui", "author": "Jaco Greeff ", "maintainers": [], "contributors": [], diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index efa17e00..1399b76d 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -4,7 +4,7 @@ "main": "index.js", "module": "esm/index.js", "sideEffects": false, - "repository": "https://github.com/polkadot-js/apps.git", + "repository": "github:polkadot-js/apps", "author": "Jaco Greeff ", "maintainers": [], "contributors": [], diff --git a/yarn.lock b/yarn.lock index d7ef5bd4..bc6d5c8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1990,9 +1990,9 @@ __metadata: languageName: node linkType: hard -"@ledgerhq/hw-transport-node-hid@npm:^5.28.0": +"@ledgerhq/hw-transport-node-hid-singleton@npm:^5.28.0": version: 5.28.0 - resolution: "@ledgerhq/hw-transport-node-hid@npm:5.28.0" + resolution: "@ledgerhq/hw-transport-node-hid-singleton@npm:5.28.0" dependencies: "@ledgerhq/devices": ^5.28.0 "@ledgerhq/errors": ^5.28.0 @@ -2001,8 +2001,8 @@ __metadata: "@ledgerhq/logs": ^5.28.0 lodash: ^4.17.20 node-hid: 1.3.0 - usb: ^1.6.3 - checksum: cb9f774d8d16cbccf8c3df65959e0b919ab51d6fa23838e98df9be30b74fdd2ccdd4da980de50f1d7f7b15c533db20e00d87db459eba29259f0efb7ebfc933ed + usb-detection: ^4.10.0 + checksum: ce5005c43b022c5beaf6dac155547afc8013be30489eabb7eea3ad435feb02e79afe9da34156a8d8bfc0db076d1e31399271e5752046b68fcfc3eb9c45e3701a languageName: node linkType: hard @@ -2218,13 +2218,13 @@ __metadata: resolution: "@polkadot/ledger-transports@workspace:packages/ledger-transports" dependencies: "@babel/runtime": ^7.12.5 - "@ledgerhq/hw-transport-node-hid": ^5.28.0 + "@ledgerhq/hw-transport-node-hid-singleton": ^5.28.0 "@ledgerhq/hw-transport-webusb": ^5.28.0 "@polkadot/types": ^2.6.2-5 "@types/ledgerhq__hw-transport-node-hid": ^4.22.2 "@types/ledgerhq__hw-transport-webusb": ^4.70.1 dependenciesMeta: - "@ledgerhq/hw-transport-node-hid": + "@ledgerhq/hw-transport-node-hid-singleton": optional: true languageName: unknown linkType: soft @@ -4365,7 +4365,7 @@ __metadata: languageName: node linkType: hard -"bindings@npm:^1.4.0, bindings@npm:^1.5.0": +"bindings@npm:^1.3.0, bindings@npm:^1.5.0": version: 1.5.0 resolution: "bindings@npm:1.5.0" dependencies: @@ -7011,6 +7011,13 @@ __metadata: languageName: node linkType: hard +"eventemitter2@npm:^5.0.1": + version: 5.0.1 + resolution: "eventemitter2@npm:5.0.1" + checksum: 9f09a225e1d2cda18cfff04c042866b97c298bfca28a1f3224ac0adf4bb237642999135ce98860513c50524d7be1149d5de07c57e89368c00fb75e137ab40df9 + languageName: node + linkType: hard + "eventemitter3@npm:^3.0.0": version: 3.1.2 resolution: "eventemitter3@npm:3.1.2" @@ -11606,16 +11613,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"nan@npm:2.13.2": - version: 2.13.2 - resolution: "nan@npm:2.13.2" - dependencies: - node-gyp: latest - checksum: 6d31ac034f75248c4d6a240c4ba091f1ebdd52eccdef26f94fe8cf6dfe56e476c6d0d4134e022a9fffbfc90cfb10db51a4f575e76d62cfcfe32e3817f1060d25 - languageName: node - linkType: hard - -"nan@npm:^2.12.1, nan@npm:^2.14.0": +"nan@npm:^2.12.1, nan@npm:^2.13.2, nan@npm:^2.14.0": version: 2.14.2 resolution: "nan@npm:2.14.2" dependencies: @@ -12776,7 +12774,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"prebuild-install@npm:^5.3.3, prebuild-install@npm:^5.3.4": +"prebuild-install@npm:^5.3.4, prebuild-install@npm:^5.3.5": version: 5.3.6 resolution: "prebuild-install@npm:5.3.6" dependencies: @@ -15942,15 +15940,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"usb@npm:^1.6.3": - version: 1.6.3 - resolution: "usb@npm:1.6.3" +"usb-detection@npm:^4.10.0": + version: 4.10.0 + resolution: "usb-detection@npm:4.10.0" dependencies: - bindings: ^1.4.0 - nan: 2.13.2 + bindings: ^1.3.0 + eventemitter2: ^5.0.1 + nan: ^2.13.2 node-gyp: latest - prebuild-install: ^5.3.3 - checksum: 5b951e2aedec8467d63ae88f3950810ea204c642da57d503a0506b10637de09318a309218511972748568e7b82bad035b7749b73037b4b3db5a0caa34c74fc30 + prebuild-install: ^5.3.5 + checksum: 17c60db18f268ef679fc3401d39348c0a248b588a46a0b7dde25fb866849511c00503b4cb4dceac02651caf5d6964388c92b46a0fb8b9b53eab3e5e520dd0a44 languageName: node linkType: hard