@trezor/connect 9.0.2 → 9.0.3

package/lib/factory.js

@@ -94,6 +94,7 @@ const factory = ({ eventEmitter, manifest, init, call, requestLogin, uiResponse,
         }),
         tezosGetPublicKey: params => call({ ...params, method: 'tezosGetPublicKey' }),
         tezosSignTransaction: params => call({ ...params, method: 'tezosSignTransaction' }),
+        unlockPath: params => call({ ...params, method: 'unlockPath' }),
         eosGetPublicKey: params => call({ ...params, method: 'eosGetPublicKey' }),
         eosSignTransaction: params => call({ ...params, method: 'eosSignTransaction' }),
         binanceGetAddress: params => call({

package/lib/types/api/bitcoin/index.d.ts

@@ -65,6 +65,7 @@ export interface SignTransaction {
     push?: boolean;
     preauthorized?: boolean;
     amountUnit?: PROTO.AmountUnit;
+    unlockPath?: PROTO.UnlockPath;
 }
 export declare type SignedTransaction = {
     signatures: string[];

package/lib/types/api/cardano/index.d.ts

@@ -1,4 +1,5 @@
 import type { PROTO } from '../../../constants';
+import type { GetPublicKey, PublicKey } from '../../params';
 export interface CardanoCertificatePointer {
     blockIndex: number;
     txIndex: number;
@@ -46,15 +47,10 @@ export interface CardanoGetNativeScriptHash {
 export interface CardanoNativeScriptHash {
     scriptHash: string;
 }
-export interface CardanoGetPublicKey {
-    path: string | number[];
-    showOnTrezor?: boolean;
+export interface CardanoGetPublicKey extends GetPublicKey {
     derivationType?: PROTO.CardanoDerivationType;
 }
-export interface CardanoPublicKey {
-    path: number[];
-    serializedPath: string;
-    publicKey: string;
+export interface CardanoPublicKey extends PublicKey {
     node: PROTO.HDNodeType;
 }
 export interface CardanoInput {

package/lib/types/api/eos/index.d.ts

@@ -1,8 +1,4 @@
 import { PROTO } from '../../../constants';
-export interface EosGetPublicKey {
-    path: string | number[];
-    showOnTrezor?: boolean;
-}
 export interface EosPublicKey {
     wifPublicKey: string;
     rawPublicKey: string;

package/lib/types/api/eosGetPublicKey.d.ts

@@ -1,5 +1,5 @@
-import type { Params, BundledParams, Response } from '../params';
-import { EosGetPublicKey, EosPublicKey } from './eos';
-export declare function eosGetPublicKey(params: Params<EosGetPublicKey>): Response<EosPublicKey>;
-export declare function eosGetPublicKey(params: BundledParams<EosGetPublicKey>): Response<EosPublicKey[]>;
+import type { Params, GetPublicKey, BundledParams, Response } from '../params';
+import { EosPublicKey } from './eos';
+export declare function eosGetPublicKey(params: Params<GetPublicKey>): Response<EosPublicKey>;
+export declare function eosGetPublicKey(params: BundledParams<GetPublicKey>): Response<EosPublicKey[]>;
 //# sourceMappingURL=eosGetPublicKey.d.ts.map

package/lib/types/api/getAddress.d.ts

@@ -5,6 +5,7 @@ interface GetAddress extends GetAddressShared {
     crossChain?: boolean;
     multisig?: PROTO.MultisigRedeemScriptType;
     scriptType?: PROTO.InternalInputScriptType;
+    unlockPath?: PROTO.UnlockPath;
 }
 declare type Address = AddressShared & PROTO.Address;
 export declare function getAddress(params: Params<GetAddress>): Response<Address>;

package/lib/types/api/getPublicKey.d.ts

@@ -1,7 +1,12 @@
+import type { PROTO } from '../../constants';
 import type { GetPublicKey as GetPublicKeyShared, Params, BundledParams, Response } from '../params';
 export interface GetPublicKey extends GetPublicKeyShared {
     coin?: string;
     crossChain?: boolean;
+    scriptType?: PROTO.InternalInputScriptType;
+    ignoreXpubMagic?: boolean;
+    ecdsaCurveName?: string;
+    unlockPath?: PROTO.UnlockPath;
 }
 export interface HDNodeResponse {
     path: number[];

package/lib/types/api/index.d.ts

@@ -69,6 +69,7 @@ import { tezosGetAddress } from './tezosGetAddress';
 import { tezosGetPublicKey } from './tezosGetPublicKey';
 import { tezosSignTransaction } from './tezosSignTransaction';
 import { uiResponse } from './uiResponse';
+import { unlockPath } from './unlockPath';
 import { verifyMessage } from './verifyMessage';
 import { wipeDevice } from './wipeDevice';
 import { checkFirmwareAuthenticity } from './checkFirmwareAuthenticity';
@@ -144,6 +145,7 @@ export interface TrezorConnect {
     tezosGetPublicKey: typeof tezosGetPublicKey;
     tezosSignTransaction: typeof tezosSignTransaction;
     uiResponse: typeof uiResponse;
+    unlockPath: typeof unlockPath;
     verifyMessage: typeof verifyMessage;
     wipeDevice: typeof wipeDevice;
     checkFirmwareAuthenticity: typeof checkFirmwareAuthenticity;

package/lib/types/api/unlockPath.d.ts

@@ -0,0 +1,8 @@
+import type { PROTO } from '../../constants';
+import type { Params, Response } from '../params';
+export interface UnlockPathParams {
+    path: string | number[];
+    mac?: string;
+}
+export declare function unlockPath(params: Params<UnlockPathParams>): Response<PROTO.UnlockPath>;
+//# sourceMappingURL=unlockPath.d.ts.map

package/lib/types/api/unlockPath.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=unlockPath.js.map

package/lib/utils/pathUtils.d.ts

@@ -4,13 +4,12 @@ export declare const HD_HARDENED = 2147483648;
 export declare const toHardened: (n: number) => number;
 export declare const fromHardened: (n: number) => number;
 export declare const getHDPath: (path: string) => number[];
-export declare const isMultisigPath: (path: number[] | undefined) => boolean;
 export declare const isSegwitPath: (path: number[] | undefined) => boolean;
 export declare const isBech32Path: (path: number[] | undefined) => boolean;
 export declare const isTaprootPath: (path: number[] | undefined) => boolean;
 export declare const getAccountType: (path: number[] | undefined) => "p2pkh" | "p2sh" | "p2tr" | "p2wpkh";
-export declare const getScriptType: (path: number[] | undefined) => PROTO.InternalInputScriptType;
-export declare const getOutputScriptType: (path?: number[]) => PROTO.ChangeOutputScriptType;
+export declare const getScriptType: (path: number[] | undefined) => PROTO.InternalInputScriptType | undefined;
+export declare const getOutputScriptType: (path?: number[]) => PROTO.ChangeOutputScriptType | undefined;
 export declare const validatePath: (path: string | number[], length?: number, base?: boolean) => number[];
 export declare const getSerializedPath: (path: number[]) => string;
 export declare const getPathFromIndex: (bip44purpose: number, bip44cointype: number, index: number) => number[];

package/lib/utils/pathUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLabel = exports.fixPath = exports.getIndexFromPath = exports.getPathFromIndex = exports.getSerializedPath = exports.validatePath = exports.getOutputScriptType = exports.getScriptType = exports.getAccountType = exports.isTaprootPath = exports.isBech32Path = exports.isSegwitPath = exports.isMultisigPath = exports.getHDPath = exports.fromHardened = exports.toHardened = exports.HD_HARDENED = void 0;
+exports.getLabel = exports.fixPath = exports.getIndexFromPath = exports.getPathFromIndex = exports.getSerializedPath = exports.validatePath = exports.getOutputScriptType = exports.getScriptType = exports.getAccountType = exports.isTaprootPath = exports.isBech32Path = exports.isSegwitPath = exports.getHDPath = exports.fromHardened = exports.toHardened = exports.HD_HARDENED = void 0;
 const constants_1 = require("../constants");
 exports.HD_HARDENED = 0x80000000;
 const toHardened = (n) => (n | exports.HD_HARDENED) >>> 0;
@@ -35,13 +35,11 @@ const getHDPath = (path) => {
     });
 };
 exports.getHDPath = getHDPath;
-const isMultisigPath = (path) => Array.isArray(path) && path[0] === (0, exports.toHardened)(48);
-exports.isMultisigPath = isMultisigPath;
 const isSegwitPath = (path) => Array.isArray(path) && path[0] === (0, exports.toHardened)(49);
 exports.isSegwitPath = isSegwitPath;
 const isBech32Path = (path) => Array.isArray(path) && path[0] === (0, exports.toHardened)(84);
 exports.isBech32Path = isBech32Path;
-const isTaprootPath = (path) => Array.isArray(path) && path[0] === (0, exports.toHardened)(86);
+const isTaprootPath = (path) => Array.isArray(path) && (path[0] === (0, exports.toHardened)(86) || path[0] === (0, exports.toHardened)(10025));
 exports.isTaprootPath = isTaprootPath;
 const getAccountType = (path) => {
     if ((0, exports.isTaprootPath)(path))
@@ -55,40 +53,69 @@ const getAccountType = (path) => {
 exports.getAccountType = getAccountType;
 const getScriptType = (path) => {
     if (!Array.isArray(path) || path.length < 1)
-        return 'SPENDADDRESS';
+        return undefined;
     const p1 = (0, exports.fromHardened)(path[0]);
     switch (p1) {
-        case 48:
-            return 'SPENDMULTISIG';
+        case 44:
+            return 'SPENDADDRESS';
+        case 48: {
+            if (path.length < 4)
+                return undefined;
+            const p3 = (0, exports.fromHardened)(path[3]);
+            switch (p3) {
+                case 0:
+                    return 'SPENDMULTISIG';
+                case 1:
+                    return 'SPENDP2SHWITNESS';
+                case 2:
+                    return 'SPENDWITNESS';
+                default:
+                    return undefined;
+            }
+        }
         case 49:
             return 'SPENDP2SHWITNESS';
         case 84:
             return 'SPENDWITNESS';
         case 86:
+        case 10025:
             return 'SPENDTAPROOT';
         default:
-            return 'SPENDADDRESS';
+            return undefined;
     }
 };
 exports.getScriptType = getScriptType;
 const getOutputScriptType = (path) => {
     if (!Array.isArray(path) || path.length < 1)
-        return 'PAYTOADDRESS';
-    if (path[0] === 49) {
-        return 'PAYTOP2SHWITNESS';
-    }
+        return undefined;
     const p = (0, exports.fromHardened)(path[0]);
     switch (p) {
-        case 48:
-            return 'PAYTOMULTISIG';
+        case 44:
+            return 'PAYTOADDRESS';
+        case 48: {
+            if (path.length < 4)
+                return undefined;
+            const p3 = (0, exports.fromHardened)(path[3]);
+            switch (p3) {
+                case 0:
+                    return 'PAYTOMULTISIG';
+                case 1:
+                    return 'PAYTOP2SHWITNESS';
+                case 2:
+                    return 'PAYTOWITNESS';
+                default:
+                    return undefined;
+            }
+        }
         case 49:
             return 'PAYTOP2SHWITNESS';
         case 84:
             return 'PAYTOWITNESS';
         case 86:
+        case 10025:
             return 'PAYTOTAPROOT';
         default:
-            return 'PAYTOADDRESS';
+            return undefined;
     }
 };
 exports.getOutputScriptType = getOutputScriptType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@trezor/connect",
-    "version": "9.0.2",
+    "version": "9.0.3",
     "author": "Trezor <info@trezor.io>",
     "homepage": "https://github.com/trezor/trezor-suite/tree/develop/packages/connect",
     "description": "High-level javascript interface for Trezor hardware wallet.",
@@ -41,7 +41,9 @@
         "version:beta": "tsx scripts/bump-version.ts prerelease",
         "version:patch": "tsx scripts/bump-version.ts patch",
         "version:minor": "tsx scripts/bump-version.ts minor",
-        "version:major": "tsx scripts/bump-version.ts major"
+        "version:major": "tsx scripts/bump-version.ts major",
+        "test:e2e:node": "TESTS_FIRMWARE=$(tsx ../integration-tests/wait-for-env.ts) yarn jest --runInBand --verbose -c e2e/jest.config.js",
+        "test:e2e:web": "TESTS_FIRMWARE=$(tsx ../integration-tests/wait-for-env.ts) yarn karma start e2e/karma.config.js"
     },
     "dependencies": {
         "@trezor/blockchain-link": "^2.1.4",
@@ -59,9 +61,17 @@
         "tslib": "^2.3.1"
     },
     "devDependencies": {
+        "@trezor/trezor-user-env-link": "*",
         "@types/parse-uri": "^1.0.0",
         "@types/randombytes": "^2.0.0",
         "jest": "^26.6.3",
+        "karma": "^6.3.16",
+        "karma-babel-preprocessor": "^8.0.2",
+        "karma-chrome-launcher": "^3.1.0",
+        "karma-jasmine": "4.0.1",
+        "karma-jasmine-async": "^0.0.1",
+        "karma-sourcemap-loader": "^0.3.8",
+        "karma-webpack": "^5.0.0",
         "rimraf": "^3.0.2",
         "tsx": "^3.8.2",
         "typescript": "4.7.4"

package/lib/api/bitcoin/__fixtures__/inputs.d.ts

@@ -1,112 +0,0 @@
-export declare const validateTrezorInputs: ({
-    description: string;
-    params: {
-        address_n: number[];
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-    }[];
-    result: {
-        amount: string;
-    }[];
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-    }[];
-    result: {
-        address_n: number[];
-    }[];
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-        multisig: {
-            pubkeys: {
-                node: string;
-            }[];
-        };
-    }[];
-    result: {
-        multisig: {
-            pubkeys: {
-                node: {
-                    public_key: string;
-                    chain_code: string;
-                    depth: number;
-                };
-            }[];
-        };
-    }[];
-} | {
-    description: string;
-    params: {
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-        script_type: string;
-        script_pubkey: string;
-        witness: string;
-    }[];
-    result: {
-        amount: string;
-    }[];
-} | {
-    description: string;
-    params: {
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-    }[];
-    result?: undefined;
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        amount: string;
-        prev_hash: string;
-    }[];
-    result?: undefined;
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        amount: string;
-        prev_index: number;
-    }[];
-    result?: undefined;
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        prev_index: number;
-        prev_hash: string;
-    }[];
-    result: {
-        prev_index: number;
-    }[];
-} | {
-    description: string;
-    params: {
-        address_n: number[];
-        prev_index: number;
-        prev_hash: string;
-    }[];
-    result?: undefined;
-} | {
-    description: string;
-    params: {
-        amount: string;
-        prev_index: number;
-        prev_hash: string;
-        script_type: string;
-    }[];
-    result?: undefined;
-})[];
-//# sourceMappingURL=inputs.d.ts.map

package/lib/api/bitcoin/__fixtures__/inputs.js

@@ -1,102 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateTrezorInputs = void 0;
-exports.validateTrezorInputs = [
-    {
-        description: 'valid input',
-        params: [
-            {
-                address_n: [1],
-                amount: '1',
-                prev_index: 1,
-                prev_hash: 'txid',
-            },
-        ],
-        result: [{ amount: '1' }],
-    },
-    {
-        description: 'input with fixed path',
-        params: [
-            {
-                address_n: [44 | 0x80000000],
-                amount: '1',
-                prev_index: 1,
-                prev_hash: 'txid',
-            },
-        ],
-        result: [{ address_n: [(44 | 0x80000000) >>> 0] }],
-    },
-    {
-        description: 'input with converted multisig pubkey',
-        params: [
-            {
-                address_n: [0],
-                amount: '1',
-                prev_index: 1,
-                prev_hash: 'txid',
-                multisig: {
-                    pubkeys: [
-                        {
-                            node: 'xpub661MyMwAqRbcF1zGijBb2K6x9YiJPh58xpcCeLvTxMX6spkY3PcpJ4ABcCyWfskq5DDxM3e6Ez5ePCqG5bnPUXR4wL8TZWyoDaUdiWW7bKy',
-                        },
-                    ],
-                },
-            },
-        ],
-        result: [
-            {
-                multisig: {
-                    pubkeys: [
-                        {
-                            node: {
-                                public_key: '03f645ec6544a92f951f3bca16a2bc1c56846d065594db222725d59b9902528385',
-                                chain_code: '2fb77e25cd3e2e034bcbafa1f81ec7e4caf927b06c87db296f1186208315525e',
-                                depth: 0,
-                            },
-                        },
-                    ],
-                },
-            },
-        ],
-    },
-    {
-        description: 'valid EXTERNAL input',
-        params: [
-            {
-                amount: '1',
-                prev_index: 1,
-                prev_hash: 'txid',
-                script_type: 'EXTERNAL',
-                script_pubkey: '0000',
-                witness: '00',
-            },
-        ],
-        result: [{ amount: '1' }],
-    },
-    {
-        description: 'missing address_n',
-        params: [{ amount: '1', prev_index: 1, prev_hash: 'txid' }],
-    },
-    {
-        description: 'missing prev_index',
-        params: [{ address_n: [0], amount: '1', prev_hash: 'txid' }],
-    },
-    {
-        description: 'missing prev_hash',
-        params: [{ address_n: [0], amount: '1', prev_index: 1 }],
-    },
-    {
-        description: 'missing amount on non segwit path. valid only because of legacy reasons',
-        params: [{ address_n: [0], prev_index: 1, prev_hash: 'txid' }],
-        result: [{ prev_index: 1 }],
-    },
-    {
-        description: 'missing amount p2sh',
-        params: [{ address_n: [49 | 0x80000000], prev_index: 1, prev_hash: 'txid' }],
-    },
-    {
-        description: 'missing script_pubkey in EXTERNAL',
-        params: [{ amount: '1', prev_index: 1, prev_hash: 'txid', script_type: 'EXTERNAL' }],
-    },
-];
-//# sourceMappingURL=inputs.js.map

package/lib/api/bitcoin/__fixtures__/signtxVerify.d.ts

@@ -1,147 +0,0 @@
-declare const _default: ({
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        address: string;
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    getHDNode?: undefined;
-    network?: undefined;
-    error?: undefined;
-} | {
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        address_n: number[];
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    getHDNode: () => {
-        xpub: string;
-    };
-    network?: undefined;
-    error?: undefined;
-} | {
-    description: string;
-    network: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        address: string;
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    getHDNode?: undefined;
-    error?: undefined;
-} | {
-    description: string;
-    network: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: ({
-        address: string;
-        amount: string;
-        script_type: string;
-        address_n?: undefined;
-    } | {
-        address_n: number[];
-        amount: string;
-        script_type: string;
-        address?: undefined;
-    })[];
-    tx: string;
-    getHDNode: () => {
-        xpub: string;
-    };
-    error?: undefined;
-} | {
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        op_return_data: string;
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    getHDNode?: undefined;
-    network?: undefined;
-    error?: undefined;
-} | {
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        op_return_data: string;
-        script_type: string;
-    }[];
-    tx: string;
-    getHDNode?: undefined;
-    network?: undefined;
-    error?: undefined;
-} | {
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        address: string;
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    error: string;
-    getHDNode?: undefined;
-    network?: undefined;
-} | {
-    description: string;
-    inputs: {
-        address_n: number[];
-        prev_hash: string;
-        prev_index: number;
-        amount: string;
-    }[];
-    outputs: {
-        amount: string;
-        script_type: string;
-    }[];
-    tx: string;
-    error: string;
-    getHDNode?: undefined;
-    network?: undefined;
-})[];
-export default _default;
-//# sourceMappingURL=signtxVerify.d.ts.map