Merge pull request #2991 from input-output-hk/chore/ddw-1102-update-minor-trezor-connect

[DDW-1102] Trezor firmware 2.5.1 support

Author: danielmain

CHANGELOG.md

@@ -14,6 +14,7 @@
 
 ### Chores
 
+- Added support for Trezor firmware 2.5.1 ([PR 2991](https://github.com/input-output-hk/daedalus/pull/2991))
 - Added steps on how to link with `react-polymorph` and other external UI libraries ([PR 2948](https://github.com/input-output-hk/daedalus/pull/2948))
 - Published selfnode installers for all 3 platforms ([PR 2971](https://github.com/input-output-hk/daedalus/pull/2971))
 

installers/common/MacInstaller.hs

@@ -151,11 +151,6 @@ sign_cmd "$ABS_PATH/Contents/Frameworks/Electron Framework.framework/Versions/A/
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/usb_bindings.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/HID.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/build/detection.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-x64-"*"/keccak.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/bin/darwin-arm64-"*"/keccak.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/build/Release/addon.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-x64/node.napi.node"
-sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/keccak/prebuilds/darwin-arm64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-x64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/prebuilds/darwin-arm64/node.napi.node"
 sign_cmd "$ABS_PATH/Contents/Resources/app/node_modules/blake-hash/bin/darwin-x64-"*"/blake-hash.node"
@@ -239,21 +234,22 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "bignumber.js"
       , "bip66"
       , "bitcoin-ops"
-      , "blake2b"
-      , "blake2"
       , "blake-hash"
+      , "blake2"
+      , "blake2b"
       , "blake2b-wasm"
       , "bn.js"
       , "brorand"
       , "bs58"
       , "bs58check"
+      , "buffer"
       , "bytebuffer"
       , "call-bind"
       , "cashaddrjs"
-      , "cbor-web"
       , "create-hash"
       , "create-hmac"
       , "cross-fetch"
+      , "decimal.js"
       , "define-properties"
       , "elliptic"
       , "es-abstract"
@@ -266,13 +262,15 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "ieee754"
       , "inherits"
       , "int64-buffer"
+      , "ip"
       , "js-chain-libs-node"
       , "json-stable-stringify"
-      , "keccak"
+      , "jsonschema"
+      , "lodash"
       , "long"
-      , "ms"
       , "minimalistic-assert"
       , "minimalistic-crypto-utils"
+      , "ms"
       , "nanoassert"
       , "node-fetch"
       , "object-keys"
@@ -282,12 +280,19 @@ buildElectronApp darwinConfig@DarwinConfig{dcAppName, dcAppNameApp} installerCon
       , "pushdata-bitcoin"
       , "randombytes"
       , "regenerator-runtime"
+      , "ripple-address-codec"
+      , "ripple-binary-codec"
+      , "ripple-keypairs"
+      , "ripple-lib"
+      , "ripple-lib-transactionparser"
       , "runtypes"
       , "safe-buffer"
       , "semver-compare"
-      , "tiny-worker"
-      , "trezor-connect"
+      , "smart-buffer"
+      , "socks"
+      , "socks-proxy-agent"
       , "tiny-secp256k1"
+      , "trezor-connect"
       , "typeforce"
       , "util-deprecate"
       , "varuint-bitcoin"

package.json

@@ -102,6 +102,7 @@
     "@types/react": "^17.0.38",
     "@types/react-svg-inline": "^2.1.3",
     "@types/react-table": "^7.7.9",
+    "@types/trezor-connect": "8.1.18",
     "@typescript-eslint/eslint-plugin": "^5.10.1",
     "@typescript-eslint/parser": "^5.10.1",
     "asar": "2.1.0",
@@ -277,7 +278,7 @@
     "spectron-fake-dialog": "0.0.1",
     "tail": "2.2.4",
     "tcp-port-used": "1.0.1",
-    "trezor-connect": "8.2.4-extended",
+    "trezor-connect": "8.2.8-extended",
     "unorm": "1.6.0",
     "usb-detection": "4.13.0",
     "validator": "13.7.0"

source/common/ipc/api.ts

@@ -1,3 +1,10 @@
+import {
+  CardanoSignedTxData,
+  CardanoSignTransaction,
+  CommonParams,
+  Success,
+  Unsuccessful,
+} from 'trezor-connect';
 import type {
   BugReportRequestHttpOptions,
   BugReportRequestPayload,
@@ -32,39 +39,37 @@ import type {
 } from '../types/logging.types';
 import type { Locale } from '../types/locales.types';
 import type {
+  CheckFileExistsRequest,
+  ClearDownloadLocalDataRequest,
+  ClearDownloadLocalDataResponse,
+  DeleteDownloadedFileRequest,
+  DeleteDownloadedFileResponse,
   DownloadLocalDataRequest,
   DownloadLocalDataResponse,
-  DownloadsLocalDataRequest,
-  DownloadsLocalDataResponse,
   DownloadRequest,
   DownloadResponse,
+  DownloadsLocalDataRequest,
+  DownloadsLocalDataResponse,
   ResumeDownloadRequest,
   ResumeDownloadResponse,
-  ClearDownloadLocalDataRequest,
-  ClearDownloadLocalDataResponse,
-  DeleteDownloadedFileRequest,
-  DeleteDownloadedFileResponse,
-  CheckFileExistsRequest,
 } from '../types/downloadManager.types';
 import type { StoreMessage } from '../types/electron-store.types';
 import type {
   IntrospectAddressRequest,
   IntrospectAddressResponse,
 } from '../types/address-introspection.types';
 import type {
-  HardwareWalletTransportDeviceRequest,
-  HardwareWalletTransportDeviceResponse,
+  HardwareWalletCardanoAdaAppResponse,
+  HardwareWalletConnectionRequest,
   HardwareWalletExtendedPublicKeyRequest,
   HardwareWalletExtendedPublicKeyResponse,
-  HardwareWalletCardanoAdaAppResponse,
+  HardwareWalletTransportDeviceRequest,
+  HardwareWalletTransportDeviceResponse,
+  LedgerDevicePayload,
   LedgerSignTransactionRequest,
   LedgerSignTransactionResponse,
-  TrezorSignTransactionRequest,
-  TrezorSignTransactionResponse,
-  HardwareWalletConnectionRequest,
-  LedgerDevicePayload,
-  TrezorDevicePayload,
   TrezorDeviceErrorPayload,
+  TrezorDevicePayload,
 } from '../types/hardware-wallets.types';
 
 /**
@@ -492,8 +497,11 @@ export type signTransactionLedgerRendererRequest = LedgerSignTransactionRequest;
 export type signTransactionLedgerMainResponse = LedgerSignTransactionResponse;
 export const SIGN_TRANSACTION_TREZOR_CHANNEL =
   'SIGN_TRANSACTION_TREZOR_CHANNEL';
-export type signTransactionTrezorRendererRequest = TrezorSignTransactionRequest;
-export type signTransactionTrezorMainResponse = TrezorSignTransactionResponse;
+export type signTransactionTrezorRendererRequest = CommonParams &
+  CardanoSignTransaction;
+export type signTransactionTrezorMainResponse =
+  | Success<CardanoSignedTxData>
+  | Unsuccessful;
 export const GET_INIT_TREZOR_CONNECT_CHANNEL =
   'GET_INIT_TREZOR_CONNECT_CHANNEL';
 export type handleInitTrezorConnectRendererRequest = void;

source/common/types/hardware-wallets.types.ts

@@ -77,29 +77,6 @@ export const DeviceEvents: {
   UNREADABLE: 'unreadable-device',
 };
 export type AddressTypeNibble = 0 | 4 | 6 | 8 | 14;
-export const AddressTypeNibbles: {
-  BASE: AddressTypeNibble;
-  POINTER: AddressTypeNibble;
-  ENTERPRISE: AddressTypeNibble;
-  BYRON: AddressTypeNibble;
-  REWARD: AddressTypeNibble;
-} = {
-  BASE: 0b0000,
-  POINTER: 0b0100,
-  ENTERPRISE: 0b0110,
-  BYRON: 0b1000,
-  REWARD: 0b1110,
-};
-export type CertificateType = 0 | 1 | 2;
-export const CertificateTypes: {
-  STAKE_REGISTRATION: CertificateType;
-  STAKE_DEREGISTRATION: CertificateType;
-  STAKE_DELEGATION: CertificateType;
-} = {
-  STAKE_REGISTRATION: 0,
-  STAKE_DEREGISTRATION: 1,
-  STAKE_DELEGATION: 2,
-};
 
 export type LedgerTransportDevice = {
   deviceId: string | null | undefined;
@@ -175,40 +152,6 @@ export type LedgerAuxiliaryDataType = {
     nonce: string;
   };
 };
-export type TrezorAuxiliaryDataType = {
-  catalystRegistrationParameters: {
-    votingPublicKey: string;
-    stakingPath: string | Array<number>;
-    rewardAddressParameters: {
-      addressType: number;
-      path: string;
-    };
-    nonce: string;
-  };
-};
-export type TrezorSignTransactionInputType = {
-  path: string;
-  prev_hash: number;
-  prev_index: number;
-};
-export type TrezorOutputTypeAddress = {
-  address: string;
-  amount: string;
-};
-export type TrezorOutputTypeChange = {
-  amount: string;
-  addressParameters: {
-    addressType: number;
-    path: string;
-    stakingPath: string;
-  };
-};
-export type TrezorSignTransactionInputsType = Array<
-  TrezorSignTransactionInputType
->;
-export type TrezorSignTransactionOutputsType = Array<
-  TrezorOutputTypeAddress | TrezorOutputTypeChange
->;
 export type Witness = {
   path: BIP32Path;
   witnessSignatureHex: string;
@@ -252,21 +195,6 @@ export type LedgerSignTransactionRequest = {
   auxiliaryData: LedgerAuxiliaryDataType | null | undefined;
   additionalWitnessPaths: Array<BIP32Path | null | undefined>;
 };
-export type TrezorSignTransactionRequest = {
-  inputs: TrezorSignTransactionInputsType;
-  outputs: TrezorSignTransactionOutputsType;
-  fee?: string;
-  ttl: string;
-  networkId: number;
-  protocolMagic: number;
-  certificates: Array<Certificate | null | undefined>;
-  withdrawals: Array<Withdrawal | null | undefined>;
-  reset?: boolean;
-  devicePath: string;
-  validityIntervalStartStr?: string;
-  signingMode: number;
-  auxiliaryData: TrezorAuxiliaryDataType | null | undefined;
-};
 export type LedgerSignTransactionResponse = {
   txHashHex: string;
   witnesses: Array<Witness>;
@@ -282,21 +210,6 @@ export type TrezorWitness = {
   signature: string;
   chainCode: string | null | undefined;
 };
-export type TrezorSerializedTxPayload = {
-  serializedTx: string;
-};
-export type TrezorRawTxPayload = {
-  witnesses: Array<TrezorWitness>;
-  auxiliaryDataSupplement?: {
-    type: number;
-    auxiliaryDataHash: string;
-    catalystSignature: string;
-  };
-};
-export type TrezorSignTransactionResponse = {
-  success: boolean;
-  payload: TrezorSerializedTxPayload | TrezorRawTxPayload;
-};
 
 export type LedgerDevicePayload = {
   disconnected: boolean;