Switch to current trezor npm package (v9) (#21861)

* npm install / uninstall These are the commands run, in order using npm version 10.4.0 (latest). npm uninstall trezor-connect npm install @trezor/connect@9.1.11 --save-exact npm install @trezor/connect-web@9.1.11 --save-exact * Rewire, add licenses, remove lingering trezor-connect import outside of chrome untrusted.
2024-02-09 08:54:18 -05:00
parent 39f6e2a7d3
commit b2d6b3cf64
8 changed files with 1378 additions and 531 deletions
@@ -11,9 +11,9 @@ import {
  HDNodeResponse,
  EthereumSignedTx,
  EthereumSignMessage,
-  EthereumSignTypedHash
+  EthereumSignTypedHash,
+  MessageSignature
 } from './trezor-connect-types'
-import { MessageSignature } from 'trezor-connect/lib/typescript/trezor/protobuf'
 export const kTrezorBridgeUrl = loadTimeData.getString(
  'braveWalletTrezorBridgeUrl'
 )
@@ -3,12 +3,12 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // you can obtain one at https://mozilla.org/MPL/2.0/.

-import TrezorConnect from 'trezor-connect'
+import TrezorConnect from '@trezor/connect-web'
 import {
  Unsuccessful,
  Success
 } from '../common/hardware/trezor/trezor-connect-types'
-import { EthereumSignedTx } from 'trezor-connect/lib/typescript/networks/ethereum'
+import { EthereumSignedTx } from '@trezor/connect/lib/types/api/ethereum'
 import {
  TrezorCommand,
  UnlockCommand,
@@ -58,7 +58,7 @@ addTrezorCommandHandler(
  (command: UnlockCommand): Promise<UnlockResponsePayload> => {
    return new Promise(async (resolve) => {
      TrezorConnect.init({
-        connectSrc: 'https://connect.trezor.io/8/',
+        connectSrc: 'https://connect.trezor.io/9/',
        lazyLoad: false,
        manifest: {
          email: 'support@brave.com',
@@ -150,7 +150,6 @@
    "teamcity-service-messages": "0.1.14",
    "terser": "5.16.2",
    "timers-browserify": "2.0.12",
-    "trezor-connect": "8.2.12-extended",
    "ts-jest": "26.5.6",
    "ts-loader": "8.4.0",
    "typesafe-actions": "2.2.0",
@@ -174,6 +173,8 @@
    "@ledgerhq/hw-transport-webhid": "6.24.1",
    "@reduxjs/toolkit": "1.8.6",
    "@solana/web3.js": "1.58.0",
+    "@trezor/connect": "9.1.11",
+    "@trezor/connect-web": "9.1.11",
    "@types/jszip": "^3.1.6",
    "@types/parse-torrent": "^5.8.3",
    "@types/react-router-dom": "^5.1.9",
@@ -0,0 +1,50 @@
+# TREZOR REFERENCE SOURCE LICENSE (T-RSL)
+
+This license governs use of the accompanying software. If you use the software,
+you accept this license. If you do not accept the license, do not use the
+software.
+
+## 1. Definitions
+
+The terms "reproduce," "reproduction" and "distribution" have the same meaning
+here as under U.S. copyright law.
+
+"You" means the licensee of the software.
+
+"Your company" means the company you worked for when you downloaded the
+software.
+
+"Reference use" means use of the software within your company as a reference,
+in read only form, for the sole purposes of debugging your products,
+maintaining your products, or enhancing the interoperability of your products
+with the software, and specifically excludes the right to distribute the
+software outside of your company.
+
+"Licensed patents" means any Licensor patent claims which read directly on the
+software as distributed by the Licensor under this license.
+
+## 2. Grant of Rights
+
+(A) Copyright Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free copyright
+license to reproduce the software for reference use.
+
+(B) Patent Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free patent license
+under licensed patents for reference use.
+
+## 3. Limitations
+
+(A) No Trademark License - This license does not grant you any rights to use
+the Licensor's name, logo, or trademarks.
+
+(B) If you begin patent litigation against the Licensor over patents that you
+think may apply to the software (including a cross-claim or counterclaim in
+a lawsuit), your license to the software ends automatically.
+
+(C) The software is licensed "as-is." You bear the risk of using it. The
+Licensor gives no express warranties, guarantees or conditions. You may have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the Licensor excludes
+the implied warranties of merchantability, fitness for a particular purpose and
+non-infringement.
@@ -0,0 +1,50 @@
+# TREZOR REFERENCE SOURCE LICENSE (T-RSL)
+
+This license governs use of the accompanying software. If you use the software,
+you accept this license. If you do not accept the license, do not use the
+software.
+
+## 1. Definitions
+
+The terms "reproduce," "reproduction" and "distribution" have the same meaning
+here as under U.S. copyright law.
+
+"You" means the licensee of the software.
+
+"Your company" means the company you worked for when you downloaded the
+software.
+
+"Reference use" means use of the software within your company as a reference,
+in read only form, for the sole purposes of debugging your products,
+maintaining your products, or enhancing the interoperability of your products
+with the software, and specifically excludes the right to distribute the
+software outside of your company.
+
+"Licensed patents" means any Licensor patent claims which read directly on the
+software as distributed by the Licensor under this license.
+
+## 2. Grant of Rights
+
+(A) Copyright Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free copyright
+license to reproduce the software for reference use.
+
+(B) Patent Grant - Subject to the terms of this license, the Licensor grants
+you a non-transferable, non-exclusive, worldwide, royalty-free patent license
+under licensed patents for reference use.
+
+## 3. Limitations
+
+(A) No Trademark License - This license does not grant you any rights to use
+the Licensor's name, logo, or trademarks.
+
+(B) If you begin patent litigation against the Licensor over patents that you
+think may apply to the software (including a cross-claim or counterclaim in
+a lawsuit), your license to the software ends automatically.
+
+(C) The software is licensed "as-is." You bear the risk of using it. The
+Licensor gives no express warranties, guarantees or conditions. You may have
+additional consumer rights under your local laws which this license cannot
+change. To the extent permitted under your local laws, the Licensor excludes
+the implied warranties of merchantability, fitness for a particular purpose and
+non-infringement.
@@ -0,0 +1,3 @@
+Name: trezor_connect-web
+URL: https://github.com/trezor/trezor-suite
+License: T-RSL