@trezor/connect 9.1.2 → 9.1.4

package/lib/types/params.d.ts

@@ -34,8 +34,19 @@ export interface Success<T> {
     payload: T;
 }
 export type Response<T> = Promise<Success<T> | Unsuccessful>;
+export type DerivationPath = string | number[];
+type ProtoWithExtendedAddressN<T, A, R> = Omit<Extract<T, {
+    address_n: A;
+}>, 'address_n'> & {
+    address_n: R;
+};
+type ProtoWithoutAddressN<T, A> = Exclude<T, {
+    address_n: A;
+}>;
+export type ProtoWithDerivationPath<T> = ProtoWithoutAddressN<T, number[]> | ProtoWithExtendedAddressN<T, number[], DerivationPath>;
+export type ProtoWithAddressN<P extends ProtoWithDerivationPath<any>> = P extends ProtoWithDerivationPath<infer T> ? T : unknown;
 export interface GetAddress {
-    path: string | number[];
+    path: DerivationPath;
     address?: string;
     showOnTrezor?: boolean;
 }
@@ -45,8 +56,9 @@ export interface Address {
     serializedPath: string;
 }
 export interface GetPublicKey {
-    path: string | number[];
+    path: DerivationPath;
     showOnTrezor?: boolean;
+    suppressBackupWarning?: boolean;
 }
 export interface PublicKey {
     publicKey: string;

package/lib/utils/deviceFeaturesUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureInternalModelFeature = exports.parseRevision = exports.getUnavailableCapabilities = exports.parseCapabilities = void 0;
-const versionUtils_1 = require("./versionUtils");
+const utils_1 = require("@trezor/utils");
 const config_1 = require("../data/config");
 const types_1 = require("../types");
 const DEFAULT_CAPABILITIES_T1 = [
@@ -78,7 +78,7 @@ const getUnavailableCapabilities = (features, coins) => {
     supported
         .filter(info => !unavailable.includes(info))
         .forEach(info => {
-        if ((0, versionUtils_1.versionCompare)(info.support[key], fw) > 0) {
+        if (utils_1.versionUtils.isNewer(info.support[key], fw.join('.'))) {
             list[info.shortcut.toLowerCase()] = 'update-required';
             unavailable.push(info);
         }
@@ -88,13 +88,13 @@ const getUnavailableCapabilities = (features, coins) => {
             return;
         const min = s.min ? s.min[fw[0] - 1] : null;
         const max = s.max ? s.max[fw[0] - 1] : null;
-        if (min && (min === '0' || (0, versionUtils_1.versionCompare)(min, fw) > 0)) {
+        if (min && (min === '0' || utils_1.versionUtils.isNewer(min, fw.join('.')))) {
             const value = min === '0' ? 'no-support' : 'update-required';
             s.capabilities.forEach(m => {
                 list[m] = value;
             });
         }
-        if (max && (0, versionUtils_1.versionCompare)(max, fw) < 0) {
+        if (max && !utils_1.versionUtils.isNewerOrEqual(max, fw.join('.'))) {
             s.capabilities.forEach(m => {
                 list[m] = 'trezor-connect-outdated';
             });

package/lib/utils/pathUtils.d.ts

@@ -1,5 +1,5 @@
 import { PROTO } from '../constants';
-import type { CoinInfo } from '../types';
+import type { CoinInfo, DerivationPath, ProtoWithDerivationPath, ProtoWithAddressN } from '../types';
 export declare const HD_HARDENED = 2147483648;
 export declare const toHardened: (n: number) => number;
 export declare const fromHardened: (n: number) => number;
@@ -11,10 +11,10 @@ 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 | 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 validatePath: (path: DerivationPath, length?: number, base?: boolean) => number[];
 export declare const getSerializedPath: (path: number[]) => string;
 export declare const getPathFromIndex: (bip44purpose: number, bip44cointype: number, index: number) => number[];
 export declare const getIndexFromPath: (path: number[]) => number;
-export declare const fixPath: <T extends PROTO.TxInputType | PROTO.TxOutputType>(utxo: T) => T;
+export declare const fixPath: <T extends ProtoWithDerivationPath<PROTO.TxInputType> | ProtoWithDerivationPath<PROTO.TxOutputType>>(utxo: T) => ProtoWithAddressN<T>;
 export declare const getLabel: (label: string, coinInfo?: CoinInfo) => string;
 //# sourceMappingURL=pathUtils.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trezor/connect",
-  "version": "9.1.2",
+  "version": "9.1.4",
   "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.",
@@ -49,28 +49,26 @@
     "prepublish": "yarn tsx ../../scripts/prepublish.js"
   },
   "dependencies": {
-    "@trezor/blockchain-link": "2.1.16",
-    "@trezor/blockchain-link-types": "1.0.5",
-    "@trezor/connect-analytics": "1.0.5",
-    "@trezor/connect-common": "0.0.19",
-    "@trezor/protobuf": "1.0.0",
-    "@trezor/protocol": "1.0.0",
-    "@trezor/transport": "1.1.15",
-    "@trezor/utils": "9.0.12",
-    "@trezor/utxo-lib": "1.0.10",
+    "@trezor/blockchain-link": "2.1.17",
+    "@trezor/blockchain-link-types": "1.0.6",
+    "@trezor/connect-analytics": "1.0.7",
+    "@trezor/connect-common": "0.0.21",
+    "@trezor/protobuf": "1.0.1",
+    "@trezor/protocol": "1.0.1",
+    "@trezor/transport": "1.1.16",
+    "@trezor/utils": "9.0.13",
+    "@trezor/utxo-lib": "1.0.11",
     "bignumber.js": "^9.1.1",
     "blakejs": "^1.2.1",
     "bs58": "^5.0.0",
     "bs58check": "^3.0.1",
     "cross-fetch": "^3.1.6",
-    "events": "^3.3.0",
-    "randombytes": "2.1.0"
+    "events": "^3.3.0"
   },
   "devDependencies": {
     "@trezor/trezor-user-env-link": "1.0.2",
     "@types/karma": "^6.3.4",
     "@types/parse-uri": "^1.0.0",
-    "@types/randombytes": "^2.0.0",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "karma": "^6.4.2",

package/lib/utils/deferred.d.ts

@@ -1,18 +0,0 @@
-export type Deferred<T, I = any, D = any> = {
-    id?: I;
-    data?: D;
-    promise: Promise<T>;
-    resolve: (t: T) => void;
-    reject: (e: Error) => void;
-};
-export type AsyncDeferred<T> = {
-    promise: Promise<T>;
-    resolve: (t: T) => void;
-    reject: (e: Error) => void;
-    run: (...args: any[]) => any;
-};
-export declare function create<T, I = any, D = any>(arg?: I, data?: D): Deferred<T, I, D>;
-export declare function createAsync<T>(innerFn: (...args: any[]) => any): AsyncDeferred<T>;
-export declare function resolveTimeoutPromise<T>(delay: number, result: T): Promise<T>;
-export declare const rejectTimeoutPromise: (delay: number, error: Error) => Promise<any>;
-//# sourceMappingURL=deferred.d.ts.map

package/lib/utils/deferred.js

@@ -1,66 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rejectTimeoutPromise = exports.resolveTimeoutPromise = exports.createAsync = exports.create = void 0;
-function create(arg, data) {
-    let localResolve = (_t) => { };
-    let localReject = (_e) => { };
-    let id;
-    const promise = new Promise(async (resolve, reject) => {
-        localResolve = resolve;
-        localReject = reject;
-        if (typeof arg === 'function') {
-            try {
-                await arg();
-            }
-            catch (error) {
-                reject(error);
-            }
-        }
-        if (typeof arg === 'string')
-            id = arg;
-    });
-    return {
-        id,
-        data,
-        resolve: localResolve,
-        reject: localReject,
-        promise,
-    };
-}
-exports.create = create;
-function createAsync(innerFn) {
-    let localResolve = (_t) => { };
-    let localReject = _e => { };
-    const promise = new Promise((resolve, reject) => {
-        localResolve = resolve;
-        localReject = reject;
-    });
-    const inner = async () => {
-        await innerFn();
-    };
-    return {
-        resolve: localResolve,
-        reject: localReject,
-        promise,
-        run: () => {
-            inner();
-            return promise;
-        },
-    };
-}
-exports.createAsync = createAsync;
-function resolveTimeoutPromise(delay, result) {
-    return new Promise(resolve => {
-        setTimeout(() => {
-            resolve(result);
-        }, delay);
-    });
-}
-exports.resolveTimeoutPromise = resolveTimeoutPromise;
-const rejectTimeoutPromise = (delay, error) => new Promise((_resolve, reject) => {
-    setTimeout(() => {
-        reject(error);
-    }, delay);
-});
-exports.rejectTimeoutPromise = rejectTimeoutPromise;
-//# sourceMappingURL=deferred.js.map

package/lib/utils/versionUtils.d.ts

@@ -1,8 +0,0 @@
-import type { VersionArray } from '../types';
-export declare const isValidVersionString: (version: string) => boolean;
-export declare const isValidVersionArray: (version: (number | null)[]) => boolean;
-export declare const isVersionArray: (arr: (number | null)[]) => arr is VersionArray;
-export declare const normalizeVersionArray: (version: number[]) => number[];
-export declare const versionSplit: (version: string) => number[];
-export declare const versionCompare: (a: string | number[], b: string | number[]) => 1 | 0 | -1;
-//# sourceMappingURL=versionUtils.d.ts.map

package/lib/utils/versionUtils.js

@@ -1,75 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.versionCompare = exports.versionSplit = exports.normalizeVersionArray = exports.isVersionArray = exports.isValidVersionArray = exports.isValidVersionString = void 0;
-const VER_NUMS = 3;
-const versionRegex = new RegExp(/^[0-9]{1,3}(\.[0-9]{1,3}){0,2}$/);
-const isValidVersionString = (version) => versionRegex.test(version);
-exports.isValidVersionString = isValidVersionString;
-const isValidVersionArray = (version) => {
-    if (!Array.isArray(version)) {
-        return false;
-    }
-    if (version.length === 0 || version.length > VER_NUMS) {
-        return false;
-    }
-    if (version[0] === 0) {
-        return false;
-    }
-    for (let i = 0; i < version.length; i++) {
-        const versionNumber = version[i];
-        if (typeof versionNumber !== 'number' || versionNumber === null || versionNumber < 0) {
-            return false;
-        }
-    }
-    return true;
-};
-exports.isValidVersionArray = isValidVersionArray;
-const isVersionArray = (arr) => (0, exports.isValidVersionArray)(arr);
-exports.isVersionArray = isVersionArray;
-const normalizeVersionArray = (version) => {
-    if (version.length === VER_NUMS) {
-        return version;
-    }
-    const partialVersion = [...version];
-    for (let i = version.length; i < VER_NUMS; i++) {
-        partialVersion.push(0);
-    }
-    return partialVersion;
-};
-exports.normalizeVersionArray = normalizeVersionArray;
-const versionSplit = (version) => {
-    if (!(0, exports.isValidVersionString)(version)) {
-        return [0, 0, 0];
-    }
-    return version.split('.').map(v => Number(v));
-};
-exports.versionSplit = versionSplit;
-const versionCompare = (a, b) => {
-    if (typeof a === 'string' && typeof b === 'string' && a === b) {
-        return 0;
-    }
-    const pa = typeof a === 'string' ? (0, exports.versionSplit)(a) : a;
-    const pb = typeof b === 'string' ? (0, exports.versionSplit)(b) : b;
-    const vpa = (0, exports.isValidVersionArray)(pa);
-    const vpb = (0, exports.isValidVersionArray)(pb);
-    if (!vpa && !vpb) {
-        return 0;
-    }
-    if (!vpa && vpb) {
-        return -1;
-    }
-    if (vpa && !vpb) {
-        return 1;
-    }
-    const npa = (0, exports.normalizeVersionArray)(pa);
-    const npb = (0, exports.normalizeVersionArray)(pb);
-    for (let i = 0; i < VER_NUMS; i++) {
-        if (npa[i] > npb[i])
-            return 1;
-        if (npb[i] > npa[i])
-            return -1;
-    }
-    return 0;
-};
-exports.versionCompare = versionCompare;
-//# sourceMappingURL=versionUtils.js.map