diff --git a/jest.config.js b/jest.config.js index 9e70bd5f..7cb5cfba 100644 --- a/jest.config.js +++ b/jest.config.js @@ -5,6 +5,9 @@ const config = require('@polkadot/dev/config/jest'); module.exports = Object.assign({}, config, { moduleNameMapper: { + '@polkadot/ledger-transports(.*)$': '/packages/ledger-transports/src/node', + // eslint-disable-next-line sort-keys + '@polkadot/ledger(.*)$': '/packages/ledger/src/$1', '@polkadot/react-(identicon|qr)(.*)$': '/packages/react-$1/src/$2', '@polkadot/reactnative-(identicon)(.*)$': '/packages/reactnative-$1/src/$2', '@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '/packages/ui-$1/src/$2', diff --git a/packages/ledger-transports/LICENSE b/packages/ledger-transports/LICENSE new file mode 100644 index 00000000..0d381b2e --- /dev/null +++ b/packages/ledger-transports/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/ledger-transports/README.md b/packages/ledger-transports/README.md new file mode 100644 index 00000000..c3d86d85 --- /dev/null +++ b/packages/ledger-transports/README.md @@ -0,0 +1,2 @@ +# @polkadot/ledger-transports + diff --git a/packages/ledger-transports/package.json b/packages/ledger-transports/package.json new file mode 100644 index 00000000..1d15060d --- /dev/null +++ b/packages/ledger-transports/package.json @@ -0,0 +1,26 @@ +{ + "name": "@polkadot/ledger-transports", + "version": "0.62.2-4", + "repository": "https://github.com/polkadot-js/ui.git", + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "contributors": [], + "license": "Apache-2.0", + "main": "node.js", + "browser": "browser.js", + "react-native": "react-native.js", + "dependencies": { + "@babel/runtime": "^7.12.5", + "@ledgerhq/hw-transport-webusb": "^5.28.0" + }, + "devDependencies": { + "@polkadot/types": "^2.6.2-4", + "@types/ledgerhq__hw-transport-node-hid": "^4.22.2", + "@types/ledgerhq__hw-transport-webusb": "^4.70.1" + }, + "optionalDependencies": { + "@ledgerhq/hw-transport-node-hid": "^5.28.0" + } +} diff --git a/packages/ui-keyring/src/ledger/transportsWeb.ts b/packages/ledger-transports/src/browser.ts similarity index 88% rename from packages/ui-keyring/src/ledger/transportsWeb.ts rename to packages/ledger-transports/src/browser.ts index cb14b4d8..24663a4e 100644 --- a/packages/ui-keyring/src/ledger/transportsWeb.ts +++ b/packages/ledger-transports/src/browser.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// Copyright 2017-2020 @polkadot/ledger authors & contributors // SPDX-License-Identifier: Apache-2.0 import { TransportDef } from './types'; diff --git a/packages/ui-keyring/src/ledger/transportsNode.ts b/packages/ledger-transports/src/node.ts similarity index 83% rename from packages/ui-keyring/src/ledger/transportsNode.ts rename to packages/ledger-transports/src/node.ts index e9bb3b04..3b1e9cca 100644 --- a/packages/ui-keyring/src/ledger/transportsNode.ts +++ b/packages/ledger-transports/src/node.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// Copyright 2017-2020 @polkadot/ledger authors & contributors // SPDX-License-Identifier: Apache-2.0 import { TransportDef } from './types'; diff --git a/packages/ui-keyring/src/ledger/transportsEmpty.ts b/packages/ledger-transports/src/react-native.ts similarity index 68% rename from packages/ui-keyring/src/ledger/transportsEmpty.ts rename to packages/ledger-transports/src/react-native.ts index 7dbc06d2..6a2bd60a 100644 --- a/packages/ui-keyring/src/ledger/transportsEmpty.ts +++ b/packages/ledger-transports/src/react-native.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// Copyright 2017-2020 @polkadot/ledger authors & contributors // SPDX-License-Identifier: Apache-2.0 import { TransportDef } from './types'; diff --git a/packages/ledger-transports/src/types.ts b/packages/ledger-transports/src/types.ts new file mode 100644 index 00000000..b68d8e42 --- /dev/null +++ b/packages/ledger-transports/src/types.ts @@ -0,0 +1,11 @@ +// Copyright 2017-2020 @polkadot/ledger authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import Transport from '@ledgerhq/hw-transport'; + +export type LedgerTypes = 'hid' | 'u2f' | 'webusb'; + +export interface TransportDef { + create (): Promise; + type: LedgerTypes; +} diff --git a/packages/ledger/LICENSE b/packages/ledger/LICENSE new file mode 100644 index 00000000..0d381b2e --- /dev/null +++ b/packages/ledger/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/ledger/README.md b/packages/ledger/README.md new file mode 100644 index 00000000..745d87c7 --- /dev/null +++ b/packages/ledger/README.md @@ -0,0 +1,2 @@ +# @polkadot/ledger + diff --git a/packages/ledger/package.json b/packages/ledger/package.json new file mode 100644 index 00000000..4445afd4 --- /dev/null +++ b/packages/ledger/package.json @@ -0,0 +1,26 @@ +{ + "name": "@polkadot/ledger", + "version": "0.62.2-4", + "repository": "https://github.com/polkadot-js/ui.git", + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "contributors": [], + "license": "Apache-2.0", + "main": "index.js", + "module": "index.mjs", + "sideEffects": false, + "dependencies": { + "@babel/runtime": "^7.12.5", + "@polkadot/ledger-transports": "0.62.2-4", + "@polkadot/util": "^4.0.2-8", + "@zondax/ledger-polkadot": "^0.11.0" + }, + "devDependencies": { + "@polkadot/types": "^2.6.2-4" + }, + "peerDependencies": { + "@polkadot/util": "*" + } +} diff --git a/packages/ui-keyring/src/ledger/index.ts b/packages/ledger/src/index.ts similarity index 95% rename from packages/ui-keyring/src/ledger/index.ts rename to packages/ledger/src/index.ts index 64b45840..5cc9339c 100644 --- a/packages/ui-keyring/src/ledger/index.ts +++ b/packages/ledger/src/index.ts @@ -1,15 +1,13 @@ -// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// Copyright 2017-2020 @polkadot/ledger authors & contributors // SPDX-License-Identifier: Apache-2.0 import Transport from '@ledgerhq/hw-transport'; import { AccountOptions, LedgerAddress, LedgerSignature, LedgerTypes, LedgerVersion } from './types'; import { ResponseBase, SubstrateApp, newKusamaApp, newPolkadotApp } from '@zondax/ledger-polkadot'; +import transports from '@polkadot/ledger-transports'; import { assert, bufferToU8a, u8aToBuffer, u8aToHex } from '@polkadot/util'; -import allNode from './transportsNode'; -import allWeb from './transportsWeb'; - export const LEDGER_DEFAULT_ACCOUNT = 0x80000000; export const LEDGER_DEFAULT_CHANGE = 0x80000000; @@ -18,8 +16,6 @@ export const LEDGER_DEFAULT_INDEX = 0x80000000; const SUCCESS_CODE = 0x9000; -const transports = allNode.concat(allWeb); - const APPS: Record SubstrateApp> = { kusama: newKusamaApp, polkadot: newPolkadotApp diff --git a/packages/ui-keyring/src/ledger/types.ts b/packages/ledger/src/types.ts similarity index 68% rename from packages/ui-keyring/src/ledger/types.ts rename to packages/ledger/src/types.ts index 21afe29f..745abc96 100644 --- a/packages/ui-keyring/src/ledger/types.ts +++ b/packages/ledger/src/types.ts @@ -1,8 +1,6 @@ -// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// Copyright 2017-2020 @polkadot/ledger authors & contributors // SPDX-License-Identifier: Apache-2.0 -import Transport from '@ledgerhq/hw-transport'; - export type LedgerTypes = 'hid' | 'u2f' | 'webusb'; export interface AccountOptions { @@ -25,8 +23,3 @@ export interface LedgerVersion { isTestMode: boolean; version: [number, number, number]; } - -export interface TransportDef { - create (): Promise; - type: LedgerTypes; -} diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index ff15f2b4..3e21b3ad 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -11,34 +11,21 @@ ], "contributors": [], "license": "Apache-2.0", - "browser": { - "./ledger/transportsNode": "./ledger/transportsEmpty" - }, - "react-native": { - "./ledger/transportsNode": "./ledger/transportsEmpty", - "./ledger/transportsWeb": "./ledger/transportsEmpty" - }, "dependencies": { "@babel/runtime": "^7.12.5", - "@ledgerhq/hw-transport-webusb": "^5.28.0", "@polkadot/keyring": "^4.0.2-8", + "@polkadot/ledger": "^0.62.2-4", "@polkadot/ui-settings": "0.62.2-4", "@polkadot/util": "^4.0.2-8", - "@zondax/ledger-polkadot": "^0.11.0", "mkdirp": "^1.0.4", "rxjs": "^6.6.3", "store": "^2.0.12" }, "devDependencies": { "@polkadot/types": "^2.6.2-4", - "@types/ledgerhq__hw-transport-node-hid": "^4.22.2", - "@types/ledgerhq__hw-transport-webusb": "^4.70.1", "@types/mkdirp": "^1.0.1", "@types/store": "^2.0.2" }, - "optionalDependencies": { - "@ledgerhq/hw-transport-node-hid": "^5.28.0" - }, "peerDependencies": { "@polkadot/keyring": "*", "@polkadot/ui-settings": "*", diff --git a/packages/ui-keyring/src/detectPackage.ts b/packages/ui-keyring/src/detectPackage.ts new file mode 100644 index 00000000..56786032 --- /dev/null +++ b/packages/ui-keyring/src/detectPackage.ts @@ -0,0 +1,7 @@ +// Copyright 2017-2020 @polkadot/ui-keyring authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { detectPackage } from '@polkadot/util'; + +// eslint-disable-next-line @typescript-eslint/no-var-requires +detectPackage(require('./package.json'), typeof __dirname !== 'undefined' && __dirname); diff --git a/packages/ui-keyring/src/index.ts b/packages/ui-keyring/src/index.ts index 1bfd8804..9467d8ef 100644 --- a/packages/ui-keyring/src/index.ts +++ b/packages/ui-keyring/src/index.ts @@ -1,17 +1,12 @@ // Copyright 2017-2020 @polkadot/ui-keyring authors & contributors // SPDX-License-Identifier: Apache-2.0 -import { detectPackage } from '@polkadot/util'; +import './detectPackage'; import keyring, { Keyring } from './Keyring'; -import Ledger from './ledger'; -// eslint-disable-next-line @typescript-eslint/no-var-requires -detectPackage(require('./package.json'), typeof __dirname !== 'undefined' && __dirname); +export { default as Ledger } from '@polkadot/ledger'; export default keyring; -export { - Keyring, - Ledger -}; +export { Keyring }; diff --git a/tsconfig.json b/tsconfig.json index 70608a6c..417820f7 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,10 @@ "compilerOptions": { "baseUrl": ".", "paths": { + "@polkadot/ledger": [ "packages/ledger/src" ], + "@polkadot/ledger/*": [ "packages/ledger/src/*" ], + "@polkadot/ledger-transports": [ "packages/ledger-transports/src/browser" ], + "@polkadot/ledger-transports/*": [ "packages/ledger-transports/src/browser" ], "@polkadot/react-identicon": [ "packages/react-identicon/src" ], "@polkadot/react-identicon/*": [ "packages/react-identicon/src/*" ], "@polkadot/react-qr": [ "packages/react-qr/src" ], diff --git a/yarn.lock b/yarn.lock index 57f7ce7d..9a4d1ee9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2213,6 +2213,36 @@ __metadata: languageName: node linkType: hard +"@polkadot/ledger-transports@0.62.2-4, @polkadot/ledger-transports@workspace:packages/ledger-transports": + version: 0.0.0-use.local + 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-webusb": ^5.28.0 + "@polkadot/types": ^2.6.2-4 + "@types/ledgerhq__hw-transport-node-hid": ^4.22.2 + "@types/ledgerhq__hw-transport-webusb": ^4.70.1 + dependenciesMeta: + "@ledgerhq/hw-transport-node-hid": + optional: true + languageName: unknown + linkType: soft + +"@polkadot/ledger@^0.62.2-4, @polkadot/ledger@workspace:packages/ledger": + version: 0.0.0-use.local + resolution: "@polkadot/ledger@workspace:packages/ledger" + dependencies: + "@babel/runtime": ^7.12.5 + "@polkadot/ledger-transports": 0.62.2-4 + "@polkadot/types": ^2.6.2-4 + "@polkadot/util": ^4.0.2-8 + "@zondax/ledger-polkadot": ^0.11.0 + peerDependencies: + "@polkadot/util": "*" + languageName: unknown + linkType: soft + "@polkadot/metadata@npm:2.6.2-4": version: 2.6.2-4 resolution: "@polkadot/metadata@npm:2.6.2-4" @@ -2355,17 +2385,13 @@ __metadata: resolution: "@polkadot/ui-keyring@workspace:packages/ui-keyring" dependencies: "@babel/runtime": ^7.12.5 - "@ledgerhq/hw-transport-node-hid": ^5.28.0 - "@ledgerhq/hw-transport-webusb": ^5.28.0 "@polkadot/keyring": ^4.0.2-8 + "@polkadot/ledger": ^0.62.2-4 "@polkadot/types": ^2.6.2-4 "@polkadot/ui-settings": 0.62.2-4 "@polkadot/util": ^4.0.2-8 - "@types/ledgerhq__hw-transport-node-hid": ^4.22.2 - "@types/ledgerhq__hw-transport-webusb": ^4.70.1 "@types/mkdirp": ^1.0.1 "@types/store": ^2.0.2 - "@zondax/ledger-polkadot": ^0.11.0 mkdirp: ^1.0.4 rxjs: ^6.6.3 store: ^2.0.12 @@ -2373,9 +2399,6 @@ __metadata: "@polkadot/keyring": "*" "@polkadot/ui-settings": "*" "@polkadot/util": "*" - dependenciesMeta: - "@ledgerhq/hw-transport-node-hid": - optional: true languageName: unknown linkType: soft