diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index e33e1efe4..2c4cb2a4d 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -2,7 +2,7 @@ name: 'Lock Threads' on: schedule: - - cron: '4 4 * * *' + - cron: '7 7/5 * * *' jobs: lock: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8526d4180..0a3475147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Changes: +- Add WebHID transport for Ledger - Remove old `Gerald` key for Moonbeam - Cleanup testing keyring semgrep recommendations diff --git a/packages/hw-ledger-transports/package.json b/packages/hw-ledger-transports/package.json index 4eae41066..24d9d1764 100644 --- a/packages/hw-ledger-transports/package.json +++ b/packages/hw-ledger-transports/package.json @@ -16,6 +16,7 @@ }, "dependencies": { "@babel/runtime": "^7.14.0", + "@ledgerhq/hw-transport-webhid": "^5.51.1", "@ledgerhq/hw-transport-webusb": "^5.51.1" }, "devDependencies": { diff --git a/packages/hw-ledger-transports/src/browser.ts b/packages/hw-ledger-transports/src/browser.ts index 120d5ae42..6b95a8382 100644 --- a/packages/hw-ledger-transports/src/browser.ts +++ b/packages/hw-ledger-transports/src/browser.ts @@ -4,7 +4,8 @@ import type Transport from '@ledgerhq/hw-transport'; import type { TransportDef } from './types'; -import LedgerWebUSB from '@ledgerhq/hw-transport-webusb'; +import LedgerWebHid from '@ledgerhq/hw-transport-webhid'; +import LedgerWebUsb from '@ledgerhq/hw-transport-webusb'; export { packageInfo } from './packageInfo'; @@ -18,7 +19,12 @@ export const transports: TransportDef[] = [ // }, { create: (): Promise => - LedgerWebUSB.create(), + LedgerWebUsb.create(), type: 'webusb' + }, + { + create: (): Promise => + LedgerWebHid.create(), + type: 'hid' } ]; diff --git a/packages/hw-ledger-transports/src/ledgerhq.d.ts b/packages/hw-ledger-transports/src/ledgerhq-node.d.ts similarity index 97% rename from packages/hw-ledger-transports/src/ledgerhq.d.ts rename to packages/hw-ledger-transports/src/ledgerhq-node.d.ts index 736ce9a7f..719602ff3 100644 --- a/packages/hw-ledger-transports/src/ledgerhq.d.ts +++ b/packages/hw-ledger-transports/src/ledgerhq-node.d.ts @@ -4,7 +4,7 @@ declare module '@ledgerhq/hw-transport-node-hid-noevents' { import Transport from '@ledgerhq/hw-transport'; - export default class TransportNodeHidNoEvents extends Transport {} + export default class TransportNodeHidNoEvents extends Transport {} export function getDevices(): Array } diff --git a/packages/hw-ledger-transports/src/ledgerhq-web.d.ts b/packages/hw-ledger-transports/src/ledgerhq-web.d.ts new file mode 100644 index 000000000..a0106f8ba --- /dev/null +++ b/packages/hw-ledger-transports/src/ledgerhq-web.d.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +declare module '@ledgerhq/hw-transport-webhid' { + import Transport from '@ledgerhq/hw-transport'; + + export default class TransportWebHid extends Transport {} +} diff --git a/yarn.lock b/yarn.lock index 5e4803de8..81fbcc1de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1713,6 +1713,18 @@ __metadata: languageName: node linkType: hard +"@ledgerhq/hw-transport-webhid@npm:^5.51.1": + version: 5.51.1 + resolution: "@ledgerhq/hw-transport-webhid@npm:5.51.1" + dependencies: + "@ledgerhq/devices": ^5.51.1 + "@ledgerhq/errors": ^5.50.0 + "@ledgerhq/hw-transport": ^5.51.1 + "@ledgerhq/logs": ^5.50.0 + checksum: 5082457cdc60a6600f808d81fba0f7a2754eadad9d841420400325fa8e2d28a7e8467ff361ab55854b098dec2bd84f467ef484e1acf9507e5756686ff3ab8e9c + languageName: node + linkType: hard + "@ledgerhq/hw-transport-webusb@npm:^5.51.1": version: 5.51.1 resolution: "@ledgerhq/hw-transport-webusb@npm:5.51.1" @@ -2014,6 +2026,7 @@ __metadata: dependencies: "@babel/runtime": ^7.14.0 "@ledgerhq/hw-transport-node-hid-singleton": ^5.51.1 + "@ledgerhq/hw-transport-webhid": ^5.51.1 "@ledgerhq/hw-transport-webusb": ^5.51.1 "@types/ledgerhq__hw-transport-node-hid": ^4.22.2 "@types/ledgerhq__hw-transport-webusb": ^4.70.1