@trezor/connect 9.5.0-beta.1 → 9.5.1-beta.1

package/lib/api/solana/api/solanaComposeTransaction.d.ts

@@ -10,8 +10,7 @@ export default class SolanaComposeTransaction extends AbstractMethod<'solanaComp
     run(): Promise<{
         serializedTx: string;
         additionalInfo: {
-            isCreatingAccount: boolean;
-            newTokenAccountProgramName: "spl-token" | "spl-token-2022" | undefined;
+            newAccountProgramName: "spl-token" | "spl-token-2022" | undefined;
             tokenAccountInfo: {
                 baseAddress: string;
                 tokenProgram: string;

package/lib/api/solana/api/solanaComposeTransaction.js

@@ -43,14 +43,11 @@ class SolanaComposeTransaction extends AbstractMethod_1.AbstractMethod {
         const isCreatingAccount = this.params.token &&
             recipientTokenAccounts === undefined &&
             (recipientAccountOwner === solana_1.SYSTEM_PROGRAM_PUBLIC_KEY || recipientAccountOwner == null);
-        const newTokenAccountProgramName = isCreatingAccount
-            ? this.params.token?.program
-            : undefined;
+        const newAccountProgramName = isCreatingAccount ? this.params.token?.program : undefined;
         return {
             serializedTx: tx.serialize(),
             additionalInfo: {
-                isCreatingAccount: !!isCreatingAccount,
-                newTokenAccountProgramName,
+                newAccountProgramName,
                 tokenAccountInfo: tokenTransferTxAndDestinationAddress?.tokenAccountInfo,
             },
         };

package/lib/api/unlockPath.d.ts

@@ -4,7 +4,7 @@ export default class UnlockPath extends AbstractMethod<'unlockPath', PROTO.Unloc
     init(): void;
     run(): Promise<{
         address_n: number[];
-        mac: string | undefined;
+        mac: string;
     }>;
 }
 //# sourceMappingURL=unlockPath.d.ts.map

package/lib/backend/Blockchain.d.ts

@@ -54,6 +54,7 @@ export declare class Blockchain {
         feePerUnit: string;
         feePerTx?: string;
         feeLimit?: string;
+        eip1559?: import("@trezor/blockchain-link-types/lib/blockbook-api").Eip1559Fees;
     }[]>;
     subscribeBlocks(): Promise<{
         subscribed: boolean;

package/lib/core/AbstractMethod.js

@@ -109,7 +109,7 @@ class AbstractMethod {
             this.allowDeviceMode = [events_1.UI.SEEDLESS];
         }
         this.network = 'bitcoin';
-        Object.keys(constants_1.NETWORK.TYPES).forEach(key => {
+        (0, utils_1.typedObjectKeys)(constants_1.NETWORK.TYPES).forEach(key => {
             if (this.name.startsWith(key)) {
                 this.network = key;
             }

package/lib/data/coinInfo.d.ts

@@ -23,8 +23,14 @@ export declare const getBitcoinNetwork: (pathOrName: DerivationPath) => ({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -83,8 +89,14 @@ export declare const getEthereumNetwork: (pathOrNetworkSymbol: DerivationPath) =
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -118,8 +130,14 @@ export declare const getMiscNetwork: (pathOrName: DerivationPath) => ({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -177,8 +195,14 @@ export declare const fixCoinInfoNetwork: (ci: BitcoinNetworkInfo, path: number[]
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -237,8 +261,14 @@ export declare const getCoinInfoByHash: (hash: string, networkInfo: any) => {
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -297,8 +327,14 @@ export declare const getCoinInfo: (currency: string) => ({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -356,8 +392,14 @@ export declare const getCoinInfo: (currency: string) => ({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -390,8 +432,14 @@ export declare const getCoinInfo: (currency: string) => ({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -434,8 +482,14 @@ export declare const getAllNetworks: () => (({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -493,8 +547,14 @@ export declare const getAllNetworks: () => (({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;
@@ -527,8 +587,14 @@ export declare const getAllNetworks: () => (({
     };
     decimals: number;
     defaultFees: {
+        maxFeePerGas?: string | undefined;
+        maxPriorityFeePerGas?: string | undefined;
+        maxWaitTimeEstimate?: number | undefined;
+        minWaitTimeEstimate?: number | undefined;
         feeLimit?: string | undefined;
         feePerTx?: string | undefined;
+        baseFeePerGas?: string | undefined;
+        effectiveGasPrice?: string | undefined;
         label: "normal" | "custom" | "high" | "economy" | "low";
         feePerUnit: string;
         blocks: number;

package/lib/data/connectSettings.js

@@ -39,6 +39,8 @@ const parseManifest = (manifest) => {
 const corsValidator = (url) => {
     if (typeof url !== 'string')
         return;
+    if (url === '../')
+        return url;
     if (url.match(/^https:\/\/([A-Za-z0-9\-_]+\.)*trezor\.io\//))
         return url;
     if (url.match(/^https?:\/\/localhost:[58][0-9]{3}\//))
@@ -62,7 +64,7 @@ const parseConnectSettings = (input = {}) => {
     if (input.trustedHost === false) {
         settings.trustedHost = input.trustedHost;
     }
-    if (typeof input.connectSrc === 'string' && input.connectSrc?.startsWith('http')) {
+    if (typeof input.connectSrc === 'string') {
         settings.connectSrc = (0, exports.corsValidator)(input.connectSrc);
     }
     else if (settings.trustedHost) {
@@ -122,6 +124,9 @@ const parseConnectSettings = (input = {}) => {
     if (typeof input.enableFirmwareHashCheck === 'boolean') {
         settings.enableFirmwareHashCheck = Boolean(input.enableFirmwareHashCheck);
     }
+    if (typeof input.npmVersion === 'string') {
+        settings.npmVersion = input.npmVersion;
+    }
     return settings;
 };
 exports.parseConnectSettings = parseConnectSettings;

package/lib/data/defaultFeeLevels.js

@@ -29,7 +29,7 @@ const getEvmChainGweiGasPrice = (chain) => EVM_GAS_PRICE_PER_CHAIN_IN_GWEI[chain
 const getBitcoinFeeLevels = (coin) => {
     const defaultFees = coin.default_fee_b;
     const shortcut = coin.shortcut.toLowerCase();
-    const keys = Object.keys(defaultFees);
+    const keys = (0, utils_1.typedObjectKeys)(defaultFees);
     const levels = keys
         .sort((levelA, levelB) => defaultFees[levelB] - defaultFees[levelA])
         .map(level => {

package/lib/data/version.d.ts

@@ -1,4 +1,4 @@
-export declare const VERSION = "9.5.0-beta.1";
+export declare const VERSION = "9.5.1-beta.1";
 export declare const DEFAULT_DOMAIN: string;
 export declare const CONTENT_SCRIPT_VERSION = 1;
 export declare const DEEPLINK_VERSION = 1;

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEEPLINK_VERSION = exports.CONTENT_SCRIPT_VERSION = exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.5.0-beta.1';
+exports.VERSION = '9.5.1-beta.1';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 const isBeta = exports.VERSION.includes('beta');
 exports.DEFAULT_DOMAIN = isBeta

package/lib/device/Device.d.ts

@@ -15,6 +15,7 @@ type RunOptions = {
     skipFirmwareChecks?: boolean;
     skipLanguageChecks?: boolean;
 };
+export declare const CANCEL_TIMEOUT = 1000;
 export declare const GET_FEATURES_TIMEOUT = 3000;
 export declare const GET_FEATURES_TIMEOUT_REACT_NATIVE = 20000;
 export interface DeviceEvents {
@@ -39,6 +40,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     readonly transportPath: import("@trezor/transport/lib/types").PathPublic;
     private readonly transportSessionOwner;
     private readonly transportDescriptorType;
+    private readonly bluetoothProps;
     private session;
     private lastAcquiredHere;
     private unreadableError?;
@@ -189,11 +191,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     getUniquePath(): DeviceUniquePath;
     isT1(): boolean;
     hasUnexpectedMode(allow: string[], require: string[]): "ui-device_bootloader_mode" | "ui-device_not_in_bootloader_mode" | "ui-device_not_initialized" | "ui-device_seedless" | null;
-    dispose(): Promise<import("@trezor/transport/lib/types").Success<null> | {
-        success: false;
-        error: "session not found" | "Network request failed" | "Wrong result type." | "device disconnected during action" | "unexpected error" | "Aborted by timeout" | "Aborted by signal" | "This transport can not be used in this environment" | "device not found" | "Unable to open device" | "wrong previous session";
-        message?: string;
-    } | undefined>;
+    dispose(): import("@trezor/transport/lib/types").AsyncResultWithTypedError<null, "session not found" | "Network request failed" | "Wrong result type." | "device disconnected during action" | "unexpected error" | "Aborted by timeout" | "Aborted by signal" | "This transport can not be used in this environment" | "device not found" | "Unable to open device" | "wrong previous session"> | undefined;
     private getMode;
     toMessageObject(): DeviceTyped;
 }

package/lib/device/Device.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Device = exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = exports.GET_FEATURES_TIMEOUT = void 0;
+exports.Device = exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = exports.GET_FEATURES_TIMEOUT = exports.CANCEL_TIMEOUT = void 0;
 const crypto_1 = require("crypto");
 const protocol_1 = require("@trezor/protocol");
 const transport_1 = require("@trezor/transport");
@@ -20,6 +20,7 @@ const types_1 = require("../types");
 const debug_1 = require("../utils/debug");
 const deviceFeaturesUtils_1 = require("../utils/deviceFeaturesUtils");
 const _log = (0, debug_1.initLog)('Device');
+exports.CANCEL_TIMEOUT = 1_000;
 exports.GET_FEATURES_TIMEOUT = 3_000;
 exports.GET_FEATURES_TIMEOUT_REACT_NATIVE = 20_000;
 const parseRunOptions = (options) => {
@@ -33,6 +34,7 @@ class Device extends utils_1.TypedEmitter {
     transportPath;
     transportSessionOwner;
     transportDescriptorType;
+    bluetoothProps;
     session;
     lastAcquiredHere;
     unreadableError;
@@ -89,6 +91,7 @@ class Device extends utils_1.TypedEmitter {
         this.transportPath = descriptor.path;
         this.transportSessionOwner = descriptor.sessionOwner;
         this.transportDescriptorType = descriptor.type;
+        this.bluetoothProps = descriptor.id ? { id: descriptor.id } : undefined;
         this.session = descriptor.session;
         this.lastAcquiredHere = false;
         this.firstRunPromise = (0, utils_1.createDeferred)();
@@ -326,16 +329,22 @@ class Device extends utils_1.TypedEmitter {
                     await this.initialize(!!options.useCardanoDerivation);
                 }
                 else {
-                    const getFeaturesTimeout = DataManager_1.DataManager.getSettings('env') === 'react-native'
+                    const isNative = DataManager_1.DataManager.getSettings('env') === 'react-native';
+                    const getFeaturesTimeout = isNative
                         ? exports.GET_FEATURES_TIMEOUT_REACT_NATIVE
                         : exports.GET_FEATURES_TIMEOUT;
-                    if (['v1', 'bridge'].includes(this.protocol.name)) {
+                    const cancelTimeout = isNative
+                        ? exports.GET_FEATURES_TIMEOUT_REACT_NATIVE
+                        : exports.CANCEL_TIMEOUT;
+                    if (['v1', 'bridge'].includes(this.protocol.name) &&
+                        ![0, 2].includes(this.transportDescriptorType)) {
                         _log.debug('sending a preventive cancel on the first encounter with the device');
-                        try {
-                            await this.getCommands().typedCall('Cancel', 'Failure', {});
-                        }
-                        catch {
-                        }
+                        await Promise.race([
+                            this.getCommands()
+                                .typedCall('Cancel', 'Failure', {})
+                                .catch(() => { }),
+                            new Promise((_, reject) => setTimeout(reject, cancelTimeout)),
+                        ]).catch(() => this.acquire());
                     }
                     let getFeaturesTimeoutId;
                     await Promise.race([
@@ -764,20 +773,14 @@ class Device extends utils_1.TypedEmitter {
         }
         return null;
     }
-    async dispose() {
+    dispose() {
         this.removeAllListeners();
         if (this.session && this.lastAcquiredHere) {
-            try {
-                await this.cancelableAction?.();
-                await this.commands?.cancel();
-                return this.transport.release({
-                    session: this.session,
-                    path: this.transportPath,
-                    onClose: true,
-                });
-            }
-            catch {
-            }
+            return this.transport.release({
+                session: this.session,
+                path: this.transportPath,
+                onClose: true,
+            });
         }
     }
     getMode() {
@@ -808,6 +811,7 @@ class Device extends utils_1.TypedEmitter {
                 label: 'Unacquired device',
                 name: this.name,
                 transportSessionOwner: this.transportSessionOwner,
+                bluetoothProps: this.bluetoothProps,
             };
         }
         const defaultLabel = 'My Trezor';
@@ -832,6 +836,7 @@ class Device extends utils_1.TypedEmitter {
             unavailableCapabilities: this.unavailableCapabilities,
             availableTranslations: this.availableTranslations,
             authenticityChecks: this.authenticityChecks,
+            bluetoothProps: this.bluetoothProps,
         };
     }
 }

package/lib/device/DeviceList.d.ts

@@ -28,13 +28,14 @@ type ConstructorParams = Pick<ConnectSettings, 'priority' | 'debug' | '_sessions
 };
 type InitParams = Pick<ConnectSettings, 'transports' | 'pendingTransportEvent' | 'transportReconnect'>;
 export declare class DeviceList extends TypedEmitter<DeviceListEvents> implements IDeviceList {
-    private readonly transport;
+    private readonly transportManagers;
     private transports;
     private readonly devices;
     private deviceCounter;
     private readonly handshakeLock;
     private readonly authPenaltyManager;
-    private transportCommonArgs;
+    private updateTransports;
+    private getConnectedTransports;
     isConnected(): this is DeviceList;
     pendingConnection(): Promise<void> | undefined;
     getActiveTransports(): {
@@ -43,22 +44,14 @@ export declare class DeviceList extends TypedEmitter<DeviceListEvents> implement
         version: string;
         outdated: boolean;
     }[];
-    private readonly locks;
-    private transportLock;
-    private readonly scheduledUpgradeChecks;
     constructor({ messages, priority, debug, _sessionsBackgroundUrl, manifest, }: ConstructorParams);
-    private tryGetTransport;
-    private getOrCreateTransport;
-    private createTransports;
     private onDeviceConnected;
     private onDeviceDisconnected;
     private onDeviceSessionChanged;
     private onDeviceRequestRelease;
-    init(initParams?: InitParams): Promise<void>;
-    private createInitPromise;
-    private createReconnectDelay;
-    private scheduleUpgradeCheck;
-    private selectTransport;
+    private getOrCreateTransportManager;
+    init({ transports, transportReconnect, pendingTransportEvent }?: InitParams): Promise<void>;
+    private startTransport;
     private initializeTransport;
     private waitForDevices;
     getDeviceCount(): number;