@trezor/connect 9.2.1 → 9.2.3

package/lib/api/signTransaction.js

@@ -16,6 +16,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
         const { payload } = this;
         (0, paramsValidator_1.validateParams)(payload, [
             { name: 'coin', type: 'string', required: true },
+            { name: 'identity', type: 'string' },
             { name: 'inputs', type: 'array', required: true },
             { name: 'outputs', type: 'array', required: true },
             { name: 'paymentRequests', type: 'array', allowEmpty: true },
@@ -90,6 +91,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
                 chunkify: typeof payload.chunkify === 'boolean' ? payload.chunkify : false,
             },
             coinInfo,
+            identity: payload.identity,
             push: typeof payload.push === 'boolean' ? payload.push : false,
             unlockPath: payload.unlockPath,
         };
@@ -114,7 +116,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
         return account.addresses;
     }
     async fetchRefTxs(useLegacySignProcess) {
-        const { params: { inputs, outputs, options, coinInfo, addresses }, } = this;
+        const { params: { inputs, outputs, options, coinInfo, identity, addresses }, } = this;
         const requiredRefTxs = (0, bitcoin_1.requireReferencedTransactions)(inputs, options, coinInfo);
         const refTxsIds = requiredRefTxs ? (0, bitcoin_1.getReferencedTransactions)(inputs) : [];
         const origTxsIds = !useLegacySignProcess ? (0, bitcoin_1.getOrigTransactions)(inputs, outputs) : [];
@@ -122,7 +124,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
             return [];
         }
         (0, BlockchainLink_1.isBackendSupported)(coinInfo);
-        const blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage);
+        const blockchain = await (0, BlockchainLink_1.initBlockchain)(coinInfo, this.postMessage, identity);
         const refTxs = !refTxsIds.length
             ? []
             : await blockchain
@@ -184,7 +186,7 @@ class SignTransaction extends AbstractMethod_1.AbstractMethod {
         }
         if (params.push) {
             (0, BlockchainLink_1.isBackendSupported)(params.coinInfo);
-            const blockchain = await (0, BlockchainLink_1.initBlockchain)(params.coinInfo, this.postMessage);
+            const blockchain = await (0, BlockchainLink_1.initBlockchain)(params.coinInfo, this.postMessage, params.identity);
             const txid = await blockchain.pushTransaction(response.serializedTx);
             return {
                 ...response,

package/lib/api/stellar/stellarSignTx.d.ts

@@ -1,7 +1,7 @@
 import type { TypedCall } from '../../device/DeviceCommands';
 import { StellarTransaction } from '../../types/api/stellar';
 export declare const stellarSignTx: (typedCall: TypedCall, address_n: number[], networkPassphrase: string, tx: StellarTransaction) => Promise<{
-    public_key: string;
     signature: string;
+    public_key: string;
 }>;
 //# sourceMappingURL=stellarSignTx.d.ts.map

package/lib/api/tezos/tezosSignTx.d.ts

@@ -18,31 +18,20 @@ export declare const createTx: (address_n: number[], branch: string, operation:
         source: Uint8Array;
         amount: string | number;
         fee: string | number;
-        gas_limit: number;
         destination: {
             hash: Uint8Array;
             tag: number;
         };
         counter: number;
+        gas_limit: number;
         storage_limit: number;
     } | undefined;
-    proposal?: {
-        source: string;
-        period: number;
-        proposals: string[];
-    } | undefined;
-    ballot?: {
-        source: string;
-        period: number;
-        proposal: string;
-        ballot: PROTO.TezosBallotType;
-    } | undefined;
     reveal?: {
-        public_key: Uint8Array;
         source: Uint8Array;
+        public_key: Uint8Array;
         fee: string | number;
-        gas_limit: number;
         counter: number;
+        gas_limit: number;
         storage_limit: number;
     } | undefined;
     origination?: {
@@ -51,20 +40,31 @@ export declare const createTx: (address_n: number[], branch: string, operation:
         spendable?: boolean | undefined;
         delegatable?: boolean | undefined;
         source: Uint8Array;
-        script: string | number[];
         fee: string | number;
-        gas_limit: number;
+        script: string | number[];
         counter: number;
+        gas_limit: number;
         storage_limit: number;
         balance: number;
     } | undefined;
     delegation?: {
         source: Uint8Array;
         fee: string | number;
-        delegate: Uint8Array;
-        gas_limit: number;
         counter: number;
+        gas_limit: number;
         storage_limit: number;
+        delegate: Uint8Array;
+    } | undefined;
+    proposal?: {
+        source: string;
+        period: number;
+        proposals: string[];
+    } | undefined;
+    ballot?: {
+        source: string;
+        period: number;
+        proposal: string;
+        ballot: PROTO.TezosBallotType;
     } | undefined;
     address_n: number[];
     branch: Uint8Array;

package/lib/backend/BackendManager.d.ts

@@ -1,15 +1,16 @@
 import { Blockchain, BlockchainOptions } from './Blockchain';
 import type { CoinInfo, BlockchainLink } from '../types';
 type CoinShortcut = CoinInfo['shortcut'];
+type BackendParams = Pick<BlockchainOptions, 'coinInfo' | 'postMessage' | 'identity'>;
 export declare class BackendManager {
     private readonly instances;
+    private readonly reconnect;
     private readonly custom;
     private readonly preferred;
-    private readonly reconnect;
-    get(shortcut: CoinShortcut): Blockchain | null;
-    getOrConnect(coinInfo: CoinInfo, postMessage: BlockchainOptions['postMessage']): Promise<Blockchain>;
+    get(shortcut: CoinShortcut, identity?: string): Blockchain | null;
+    getOrConnect({ coinInfo, postMessage, identity }: BackendParams): Promise<Blockchain>;
     dispose(): void;
-    reconnectAll(): Promise<Blockchain[]>;
+    reconnectAll(coin?: CoinInfo): Promise<Blockchain[]>;
     isSupported(coinInfo: CoinInfo): void;
     setCustom(shortcut: CoinShortcut, blockchainLink: BlockchainLink): void;
     removeCustom(shortcut: CoinShortcut): void;
@@ -18,6 +19,7 @@ export declare class BackendManager {
     private onDisconnect;
     private clearReconnect;
     private patchCoinInfo;
+    private getReconnectFilter;
 }
 export {};
 //# sourceMappingURL=BackendManager.d.ts.map

package/lib/backend/BackendManager.js

@@ -5,52 +5,56 @@ const DataManager_1 = require("../data/DataManager");
 const constants_1 = require("../constants");
 const Blockchain_1 = require("./Blockchain");
 const events_1 = require("../events");
+const DEFAULT_IDENTITY = 'default';
 class BackendManager {
     constructor() {
         this.instances = {};
+        this.reconnect = {};
         this.custom = {};
         this.preferred = {};
-        this.reconnect = {};
     }
-    get(shortcut) {
+    get(shortcut, identity = DEFAULT_IDENTITY) {
         var _a;
-        return (_a = this.instances[shortcut]) !== null && _a !== void 0 ? _a : null;
+        return (_a = this.instances[`${shortcut}/${identity}`]) !== null && _a !== void 0 ? _a : null;
     }
-    async getOrConnect(coinInfo, postMessage) {
-        let backend = this.instances[coinInfo.shortcut];
+    async getOrConnect({ coinInfo, postMessage, identity }) {
+        const coinIdentity = `${coinInfo.shortcut}/${identity !== null && identity !== void 0 ? identity : DEFAULT_IDENTITY}`;
+        let backend = this.instances[coinIdentity];
         if (!backend) {
             backend = new Blockchain_1.Blockchain({
                 coinInfo: this.patchCoinInfo(coinInfo),
-                postMessage,
+                identity,
                 debug: DataManager_1.DataManager.getSettings('debug'),
                 proxy: DataManager_1.DataManager.getSettings('proxy'),
+                postMessage,
                 onDisconnected: pendingSubscriptions => {
                     const reconnectAttempts = pendingSubscriptions ? 0 : undefined;
-                    this.onDisconnect(coinInfo, postMessage, reconnectAttempts);
+                    this.onDisconnect({ coinInfo, postMessage, identity }, reconnectAttempts);
                 },
             });
-            this.setInstance(coinInfo.shortcut, backend);
+            this.setInstance(coinIdentity, backend);
         }
-        const reconnect = this.clearReconnect(coinInfo.shortcut);
+        const reconnect = this.clearReconnect(coinIdentity);
         try {
             const info = await backend.init();
             this.setPreferred(coinInfo.shortcut, info.url);
             return backend;
         }
         catch (error) {
-            this.onDisconnect(coinInfo, postMessage, reconnect === null || reconnect === void 0 ? void 0 : reconnect.attempts);
+            this.onDisconnect({ coinInfo, postMessage, identity }, reconnect === null || reconnect === void 0 ? void 0 : reconnect.attempts);
             throw error;
         }
     }
     dispose() {
-        Object.keys(this.reconnect).forEach(this.clearReconnect, this);
+        Object.keys(this.reconnect)
+            .filter(this.getReconnectFilter())
+            .forEach(this.clearReconnect, this);
         Object.values(this.instances).forEach(i => i.disconnect());
     }
-    reconnectAll() {
-        Object.keys(this.reconnect).forEach(this.clearReconnect, this);
-        const params = Object.values(this.instances).map(i => [i.coinInfo, i.postMessage]);
-        Object.values(this.instances).forEach(i => i.disconnect());
-        return Promise.all(params.map(p => this.getOrConnect(...p)));
+    reconnectAll(coin) {
+        const backends = Object.values(this.instances).filter(backend => !coin || coin.shortcut === backend.coinInfo.shortcut);
+        backends.forEach(i => i.disconnect());
+        return Promise.all(backends.map(this.getOrConnect, this));
     }
     isSupported(coinInfo) {
         const info = this.custom[coinInfo.shortcut] || coinInfo.blockchainLink;
@@ -66,11 +70,11 @@ class BackendManager {
         this.setPreferred(shortcut, undefined);
         delete this.custom[shortcut];
     }
-    setInstance(shortcut, instance) {
+    setInstance(coinIdentity, instance) {
         if (!instance)
-            delete this.instances[shortcut];
+            delete this.instances[coinIdentity];
         else
-            this.instances[shortcut] = instance;
+            this.instances[coinIdentity] = instance;
     }
     setPreferred(shortcut, url) {
         if (!url)
@@ -78,9 +82,10 @@ class BackendManager {
         else
             this.preferred[shortcut] = url;
     }
-    onDisconnect(coinInfo, postMessage, reconnectAttempt) {
+    onDisconnect({ coinInfo, postMessage, identity }, reconnectAttempt) {
         var _a;
-        this.setInstance(coinInfo.shortcut, undefined);
+        const coinIdentity = `${coinInfo.shortcut}/${identity !== null && identity !== void 0 ? identity : DEFAULT_IDENTITY}`;
+        this.setInstance(coinIdentity, undefined);
         if (reconnectAttempt === undefined || reconnectAttempt === 4) {
             this.setPreferred(coinInfo.shortcut, undefined);
         }
@@ -90,16 +95,16 @@ class BackendManager {
         const timeout = Math.min(2500 * reconnectAttempt, 20000);
         const time = Date.now() + timeout;
         const handle = setTimeout(() => {
-            this.getOrConnect(coinInfo, postMessage).catch(() => { });
+            this.getOrConnect({ coinInfo, postMessage, identity }).catch(() => { });
         }, timeout);
-        clearTimeout((_a = this.reconnect[coinInfo.shortcut]) === null || _a === void 0 ? void 0 : _a.handle);
-        this.reconnect[coinInfo.shortcut] = { attempts: reconnectAttempt + 1, handle };
-        postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.RECONNECTING, { coin: coinInfo, time }));
+        clearTimeout((_a = this.reconnect[coinIdentity]) === null || _a === void 0 ? void 0 : _a.handle);
+        this.reconnect[coinIdentity] = { attempts: reconnectAttempt + 1, handle };
+        postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.RECONNECTING, { coin: coinInfo, identity, time }));
     }
-    clearReconnect(shortcut) {
-        const reconnect = this.reconnect[shortcut];
+    clearReconnect(coinIdentity) {
+        const reconnect = this.reconnect[coinIdentity];
         clearTimeout(reconnect === null || reconnect === void 0 ? void 0 : reconnect.handle);
-        delete this.reconnect[shortcut];
+        delete this.reconnect[coinIdentity];
         return reconnect;
     }
     patchCoinInfo(coinInfo) {
@@ -116,6 +121,9 @@ class BackendManager {
             },
         };
     }
+    getReconnectFilter(coinInfo) {
+        return (key) => !coinInfo || key.startsWith(`${coinInfo.shortcut}/`);
+    }
 }
 exports.BackendManager = BackendManager;
 //# sourceMappingURL=BackendManager.js.map

package/lib/backend/Blockchain.d.ts

@@ -7,13 +7,15 @@ export type BlockchainOptions = {
     postMessage: (message: CoreEventMessage) => void;
     proxy?: Proxy;
     debug?: boolean;
+    identity?: string;
     onDisconnected?: (pendingSubscriptions?: boolean) => void;
 };
 export declare class Blockchain {
     link: BlockchainLink;
     serverInfo?: ServerInfo;
-    coinInfo: BlockchainOptions['coinInfo'];
-    postMessage: BlockchainOptions['postMessage'];
+    readonly identity?: string;
+    readonly coinInfo: BlockchainOptions['coinInfo'];
+    readonly postMessage: BlockchainOptions['postMessage'];
     feeForBlock: BlockchainLinkResponse<'estimateFee'>;
     feeTimestamp: number;
     private onDisconnected;
@@ -50,18 +52,27 @@ export declare class Blockchain {
         feePerTx?: string | undefined;
         feeLimit?: string | undefined;
     }[]>;
-    subscribe(accounts?: SubscriptionAccountInfo[]): Promise<{
+    subscribeBlocks(): Promise<{
+        subscribed: boolean;
+    }>;
+    subscribeAccounts(accounts: SubscriptionAccountInfo[]): Promise<{
         subscribed: boolean;
     }>;
     subscribeFiatRates(_currency?: string): Promise<{
         subscribed: boolean;
     }>;
-    unsubscribe(accounts?: SubscriptionAccountInfo[]): Promise<{
+    unsubscribeBlocks(): Promise<{
+        subscribed: boolean;
+    }>;
+    unsubscribeAccounts(accounts: SubscriptionAccountInfo[]): Promise<{
         subscribed: boolean;
     }>;
     unsubscribeFiatRates(): Promise<{
         subscribed: boolean;
     }>;
+    unsubscribeAll(): Promise<{
+        subscribed: boolean;
+    }>;
     pushTransaction(tx: string): Promise<string>;
     disconnect(): void;
 }

package/lib/backend/Blockchain.js

@@ -26,6 +26,7 @@ class Blockchain {
     constructor(options) {
         this.feeForBlock = [];
         this.feeTimestamp = 0;
+        this.identity = options.identity;
         this.coinInfo = options.coinInfo;
         this.postMessage = options.postMessage;
         this.onDisconnected = options.onDisconnected;
@@ -55,6 +56,7 @@ class Blockchain {
         this.link.dispose();
         this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.ERROR, {
             coin: this.coinInfo,
+            identity: this.identity,
             error: error.message,
             code: error.code,
         }));
@@ -74,10 +76,6 @@ class Blockchain {
         if (info.shortcut.toLowerCase() !== shortcut.toLowerCase()) {
             throw constants_1.ERRORS.TypedError('Backend_Invalid');
         }
-        this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.CONNECT, {
-            coin: this.coinInfo,
-            ...info,
-        }));
         this.link.on('disconnected', () => {
             this.onError(constants_1.ERRORS.TypedError('Backend_Disconnected'));
         });
@@ -87,10 +85,21 @@ class Blockchain {
         if (!this.initPromise) {
             this.initPromise = this.initLink()
                 .then(info => {
+                this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.CONNECT, {
+                    coin: this.coinInfo,
+                    identity: this.identity,
+                    ...info,
+                }));
                 this.initPromise = Promise.resolve(info);
                 return info;
             })
                 .catch(error => {
+                this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.ERROR, {
+                    coin: this.coinInfo,
+                    identity: this.identity,
+                    error: error.message,
+                    code: error.code,
+                }));
                 this.initPromise = Promise.reject(error);
                 this.link.dispose();
                 return this.initPromise;
@@ -143,7 +152,7 @@ class Blockchain {
         }
         return this.link.estimateFee(request);
     }
-    async subscribe(accounts) {
+    subscribeBlocks() {
         if (this.link.listenerCount('block') === 0) {
             this.link.on('block', block => {
                 this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.BLOCK, {
@@ -152,6 +161,9 @@ class Blockchain {
                 }));
             });
         }
+        return this.link.subscribe({ type: 'block' });
+    }
+    subscribeAccounts(accounts) {
         if (this.link.listenerCount('notification') === 0) {
             this.link.on('notification', notification => {
                 this.postMessage((0, events_1.createBlockchainMessage)(events_1.BLOCKCHAIN.NOTIFICATION, {
@@ -160,10 +172,6 @@ class Blockchain {
                 }));
             });
         }
-        const blockSubscription = await this.link.subscribe({ type: 'block' });
-        if (!accounts) {
-            return blockSubscription;
-        }
         return this.link.subscribe({
             type: 'accounts',
             accounts,
@@ -182,20 +190,22 @@ class Blockchain {
             type: 'fiatRates',
         });
     }
-    async unsubscribe(accounts) {
-        if (!accounts) {
-            this.link.removeAllListeners('block');
-            this.link.removeAllListeners('fiatRates');
-            this.link.removeAllListeners('notification');
-            await this.link.unsubscribe({ type: 'fiatRates' });
-            return this.link.unsubscribe({ type: 'block' });
-        }
+    unsubscribeBlocks() {
+        this.link.removeAllListeners('block');
+        return this.link.unsubscribe({ type: 'block' });
+    }
+    unsubscribeAccounts(accounts) {
         return this.link.unsubscribe({ type: 'accounts', accounts });
     }
     unsubscribeFiatRates() {
         this.link.removeAllListeners('fiatRates');
         return this.link.unsubscribe({ type: 'fiatRates' });
     }
+    async unsubscribeAll() {
+        this.link.removeAllListeners('notification');
+        await this.unsubscribeFiatRates();
+        return this.unsubscribeBlocks();
+    }
     pushTransaction(tx) {
         return this.link.pushTransaction(tx);
     }

package/lib/backend/BlockchainLink.d.ts

@@ -1,10 +1,10 @@
 import type { BlockchainOptions as Options } from './Blockchain';
 import type { CoinInfo } from '../types';
 export { Blockchain } from './Blockchain';
-export declare const findBackend: (coin: string) => import("./Blockchain").Blockchain | null;
+export declare const findBackend: (coin: string, identity?: string) => import("./Blockchain").Blockchain | null;
 export declare const setCustomBackend: (coinInfo: CoinInfo, blockchainLink: CoinInfo['blockchainLink']) => void;
 export declare const isBackendSupported: (coinInfo: CoinInfo) => void;
-export declare const initBlockchain: (coinInfo: CoinInfo, postMessage: Options['postMessage']) => Promise<import("./Blockchain").Blockchain>;
-export declare const reconnectAllBackends: () => Promise<import("./Blockchain").Blockchain[]>;
+export declare const initBlockchain: (coinInfo: CoinInfo, postMessage: Options['postMessage'], identity?: string) => Promise<import("./Blockchain").Blockchain>;
+export declare const reconnectAllBackends: (coinInfo?: CoinInfo) => Promise<import("./Blockchain").Blockchain[]>;
 export declare const dispose: () => void;
 //# sourceMappingURL=BlockchainLink.d.ts.map

package/lib/backend/BlockchainLink.js

@@ -5,7 +5,7 @@ const BackendManager_1 = require("./BackendManager");
 var Blockchain_1 = require("./Blockchain");
 Object.defineProperty(exports, "Blockchain", { enumerable: true, get: function () { return Blockchain_1.Blockchain; } });
 const backends = new BackendManager_1.BackendManager();
-const findBackend = (coin) => backends.get(coin);
+const findBackend = (coin, identity) => backends.get(coin, identity);
 exports.findBackend = findBackend;
 const setCustomBackend = (coinInfo, blockchainLink) => (blockchainLink === null || blockchainLink === void 0 ? void 0 : blockchainLink.url.length)
     ? backends.setCustom(coinInfo.shortcut, blockchainLink)
@@ -13,9 +13,9 @@ const setCustomBackend = (coinInfo, blockchainLink) => (blockchainLink === null
 exports.setCustomBackend = setCustomBackend;
 const isBackendSupported = (coinInfo) => backends.isSupported(coinInfo);
 exports.isBackendSupported = isBackendSupported;
-const initBlockchain = (coinInfo, postMessage) => backends.getOrConnect(coinInfo, postMessage);
+const initBlockchain = (coinInfo, postMessage, identity) => backends.getOrConnect({ coinInfo, identity, postMessage });
 exports.initBlockchain = initBlockchain;
-const reconnectAllBackends = () => backends.reconnectAll();
+const reconnectAllBackends = (coinInfo) => backends.reconnectAll(coinInfo);
 exports.reconnectAllBackends = reconnectAllBackends;
 const dispose = () => backends.dispose();
 exports.dispose = dispose;

package/lib/core/AbstractMethod.js

@@ -11,6 +11,7 @@ exports.DEFAULT_FIRMWARE_RANGE = {
     T1B1: { min: '1.0.0', max: '0' },
     T2T1: { min: '2.0.0', max: '0' },
     T2B1: { min: '2.6.1', max: '0' },
+    T3T1: { min: '2.7.1', max: '0' },
 };
 class AbstractMethod {
     get info() {

package/lib/core/index.js

@@ -114,6 +114,7 @@ const initDevice = async (method) => {
     let showDeviceSelection = isWebUsb;
     const isUsingPopup = DataManager_1.DataManager.getSettings('popup');
     const origin = DataManager_1.DataManager.getSettings('origin');
+    const useCoreInPopup = DataManager_1.DataManager.getSettings('useCoreInPopup');
     const { preferredDevice } = connect_common_1.storage.load().origin[origin] || {};
     const preferredDeviceInList = preferredDevice && _deviceList.getDevice(preferredDevice.path);
     if (preferredDevice && !preferredDeviceInList) {
@@ -129,9 +130,10 @@ const initDevice = async (method) => {
     }
     else {
         const devices = _deviceList.asArray();
-        if (devices.length === 1 && !isWebUsb) {
+        if (devices.length === 1 && (!isWebUsb || !isUsingPopup)) {
             device = _deviceList.getDevice(devices[0].path);
-            showDeviceSelection = !!(device === null || device === void 0 ? void 0 : device.unreadableError) || device.isUnacquired();
+            showDeviceSelection =
+                !!(device === null || device === void 0 ? void 0 : device.unreadableError) || device.isUnacquired() || !!useCoreInPopup;
         }
         else {
             showDeviceSelection = true;
@@ -147,7 +149,8 @@ const initDevice = async (method) => {
         if (devices.length === 1 &&
             devices[0].type !== 'unreadable' &&
             devices[0].features &&
-            !isWebUsb) {
+            !isWebUsb &&
+            !useCoreInPopup) {
             device = _deviceList.getDevice(devices[0].path);
         }
         else {
@@ -159,11 +162,11 @@ const initDevice = async (method) => {
             if (uiPromise) {
                 const { payload } = await uiPromise.promise;
                 if (payload.remember) {
-                    const { path, state } = payload.device;
+                    const { label, path, state } = payload.device;
                     connect_common_1.storage.save(store => {
                         store.origin[origin] = {
                             ...store.origin[origin],
-                            preferredDevice: { path, state },
+                            preferredDevice: { label, path, state },
                         };
                         return store;
                     });
@@ -186,6 +189,8 @@ const onCall = async (message) => {
     const trustedHost = DataManager_1.DataManager.getSettings('trustedHost');
     const isUsingPopup = DataManager_1.DataManager.getSettings('popup');
     const origin = DataManager_1.DataManager.getSettings('origin');
+    const env = DataManager_1.DataManager.getSettings('env');
+    const useCoreInPopup = DataManager_1.DataManager.getSettings('useCoreInPopup');
     const { preferredDevice } = connect_common_1.storage.loadForOrigin(origin) || {};
     if (preferredDevice && !message.payload.device) {
         message.payload.device = preferredDevice;
@@ -294,6 +299,30 @@ const onCall = async (message) => {
     device.on(events_2.DEVICE.PASSPHRASE_ON_DEVICE, () => {
         postMessage((0, events_2.createUiMessage)(events_2.UI.REQUEST_PASSPHRASE_ON_DEVICE, { device: device.toMessageObject() }));
     });
+    device.on(events_2.DEVICE.SAVE_STATE, (state) => {
+        if (useCoreInPopup && env === 'webextension') {
+            connect_common_1.storage.saveForOrigin(store => {
+                return {
+                    ...store,
+                    preferredDevice: store.preferredDevice
+                        ? {
+                            ...store.preferredDevice,
+                            internalState: state,
+                            internalStateExpiration: Date.now() + 1000 * 60 * 15,
+                        }
+                        : undefined,
+                };
+            }, origin);
+        }
+    });
+    if (!device.getInternalState() && useCoreInPopup && env === 'webextension') {
+        const { preferredDevice } = connect_common_1.storage.loadForOrigin(origin) || {};
+        if ((preferredDevice === null || preferredDevice === void 0 ? void 0 : preferredDevice.internalState) &&
+            (preferredDevice === null || preferredDevice === void 0 ? void 0 : preferredDevice.internalStateExpiration) &&
+            preferredDevice.internalStateExpiration > new Date().getTime()) {
+            device.setInternalState(preferredDevice.internalState);
+        }
+    }
     try {
         let PIN_TRIES = 1;
         const MAX_PIN_TRIES = 3;

package/lib/data/DataManager.d.ts

@@ -64,6 +64,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             max: undefined;
             comment: string[];
@@ -74,6 +75,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             comment: string[];
             methods?: undefined;
@@ -85,6 +87,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             comment: string[];
             coin?: undefined;
@@ -96,6 +99,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             comment: string[];
             coin?: undefined;
@@ -108,6 +112,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             comment: string[];
             max?: undefined;
@@ -119,6 +124,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             coin?: undefined;
             max?: undefined;
@@ -129,6 +135,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1: string;
+                T3T1?: undefined;
             };
             comment: string[];
             coin?: undefined;
@@ -140,6 +147,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1?: undefined;
+                T3T1?: undefined;
             };
             coin?: undefined;
             max?: undefined;
@@ -151,6 +159,7 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1: string;
+                T3T1?: undefined;
             };
             coin?: undefined;
             max?: undefined;
@@ -162,11 +171,24 @@ export declare class DataManager {
                 T1B1: string;
                 T2T1: string;
                 T2B1: string;
+                T3T1?: undefined;
             };
             comment: string[];
             coin?: undefined;
             methods?: undefined;
             max?: undefined;
+        } | {
+            methods: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1: string;
+                T3T1: string;
+            };
+            coin?: undefined;
+            max?: undefined;
+            comment?: undefined;
+            capabilities?: undefined;
         })[];
     };
 }