@trezor/connect 9.1.5 → 9.1.6

package/lib/constants/cardano.js

@@ -7,10 +7,10 @@ var PROTOCOL_MAGICS;
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_preprod"] = 1] = "testnet_preprod";
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_preview"] = 2] = "testnet_preview";
     PROTOCOL_MAGICS[PROTOCOL_MAGICS["testnet_legacy"] = 1097911063] = "testnet_legacy";
-})(PROTOCOL_MAGICS = exports.PROTOCOL_MAGICS || (exports.PROTOCOL_MAGICS = {}));
+})(PROTOCOL_MAGICS || (exports.PROTOCOL_MAGICS = PROTOCOL_MAGICS = {}));
 var NETWORK_IDS;
 (function (NETWORK_IDS) {
     NETWORK_IDS[NETWORK_IDS["mainnet"] = 1] = "mainnet";
     NETWORK_IDS[NETWORK_IDS["testnet"] = 0] = "testnet";
-})(NETWORK_IDS = exports.NETWORK_IDS || (exports.NETWORK_IDS = {}));
+})(NETWORK_IDS || (exports.NETWORK_IDS = NETWORK_IDS = {}));
 //# sourceMappingURL=cardano.js.map

package/lib/constants/nem.js

@@ -6,7 +6,7 @@ var Networks;
     Networks[Networks["mainnet"] = 104] = "mainnet";
     Networks[Networks["testnet"] = 152] = "testnet";
     Networks[Networks["mijin"] = 96] = "mijin";
-})(Networks = exports.Networks || (exports.Networks = {}));
+})(Networks || (exports.Networks = Networks = {}));
 var TxType;
 (function (TxType) {
     TxType[TxType["TRANSFER"] = 257] = "TRANSFER";
@@ -18,11 +18,11 @@ var TxType;
     TxType[TxType["PROVISION_NAMESPACE"] = 8193] = "PROVISION_NAMESPACE";
     TxType[TxType["MOSAIC_CREATION"] = 16385] = "MOSAIC_CREATION";
     TxType[TxType["SUPPLY_CHANGE"] = 16386] = "SUPPLY_CHANGE";
-})(TxType = exports.TxType || (exports.TxType = {}));
+})(TxType || (exports.TxType = TxType = {}));
 var TxVersion;
 (function (TxVersion) {
     TxVersion[TxVersion["mainnet"] = 1744830464] = "mainnet";
     TxVersion[TxVersion["testnet"] = -1744830464] = "testnet";
     TxVersion[TxVersion["mijin"] = 1610612736] = "mijin";
-})(TxVersion = exports.TxVersion || (exports.TxVersion = {}));
+})(TxVersion || (exports.TxVersion = TxVersion = {}));
 //# sourceMappingURL=nem.js.map

package/lib/constants/network.d.ts

@@ -8,6 +8,9 @@ export declare const TYPES: {
     readonly ripple: "Ripple";
     readonly tezos: "Tezos";
     readonly binance: "Binance";
+    readonly solana: "Solana";
 };
 export type NetworkType = keyof typeof TYPES;
+export declare const MODULES: readonly ["binance", "cardano", "eos", "ethereum", "nem", "ripple", "solana", "stellar", "tezos"];
+export type ModuleName = (typeof MODULES)[number];
 //# sourceMappingURL=network.d.ts.map

package/lib/constants/network.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPES = void 0;
+exports.MODULES = exports.TYPES = void 0;
 exports.TYPES = {
     bitcoin: 'Bitcoin',
     ethereum: 'Ethereum',
@@ -11,5 +11,17 @@ exports.TYPES = {
     ripple: 'Ripple',
     tezos: 'Tezos',
     binance: 'Binance',
+    solana: 'Solana',
 };
+exports.MODULES = [
+    'binance',
+    'cardano',
+    'eos',
+    'ethereum',
+    'nem',
+    'ripple',
+    'solana',
+    'stellar',
+    'tezos',
+];
 //# sourceMappingURL=network.js.map

package/lib/core/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import EventEmitter from 'events';
 import { TransportInfo, CoreMessage } from '../events';
+import { AbstractMethod } from './AbstractMethod';
 import { LogWriter } from '../utils/debug';
 import type { ConnectSettings } from '../types';
 export declare const handleMessage: (message: CoreMessage) => void;
@@ -8,8 +9,9 @@ export declare const onCall: (message: CoreMessage) => Promise<void>;
 export declare class Core extends EventEmitter {
     handleMessage(message: any): void;
     dispose(): Promise<void>;
-    getCurrentMethod(): (import("../api").applyFlags | import("../api").applySettings | import("../api").authenticateDevice | import("../api").authorizeCoinjoin | import("../api").cancelCoinjoinAuthorization | import("../api").showDeviceTutorial | import("../api").backupDevice | import("../api").binanceGetAddress | import("../api").binanceGetPublicKey | import("../api").binanceSignTransaction | import("../api").blockchainDisconnect | import("../api").blockchainEstimateFee | import("../api").blockchainGetAccountBalanceHistory | import("../api").blockchainGetCurrentFiatRates | import("../api").blockchainGetFiatRatesForTimestamps | import("../api").blockchainGetTransactions | import("../api").blockchainSetCustomBackend | import("../api").blockchainSubscribe | import("../api").blockchainSubscribeFiatRates | import("../api").blockchainUnsubscribe | import("../api").blockchainUnsubscribeFiatRates | import("../api").cardanoGetAddress | import("../api").cardanoGetNativeScriptHash | import("../api").cardanoGetPublicKey | import("../api").cardanoSignTransaction | import("../api").changePin | import("../api").cipherKeyValue | import("../api").composeTransaction | import("../api").eosGetPublicKey | import("../api").eosSignTransaction | import("../api").ethereumGetAddress | import("../api").ethereumGetPublicKey | import("../api").ethereumSignMessage | import("../api").ethereumSignTransaction | import("../api").ethereumSignTypedData | import("../api").ethereumVerifyMessage | import("../api").firmwareUpdate | import("../api").getAccountInfo | import("../api").getAddress | import("../api").getCoinInfo | import("../api").getDeviceState | import("../api").getFeatures | import("../api").getFirmwareHash | import("../api").getOwnershipId | import("../api").getOwnershipProof | import("../api").getPublicKey | import("../api").getSettings | import("../api").nemGetAddress | import("../api").nemSignTransaction | import("../api").pushTransaction | import("../api").rebootToBootloader | import("../api").recoveryDevice | import("../api").requestLogin | import("../api").resetDevice | import("../api").rippleGetAddress | import("../api").rippleSignTransaction | import("../api").setBusy | import("../api").setProxy | import("../api").signMessage | import("../api").signTransaction | import("../api").stellarGetAddress | import("../api").stellarSignTransaction | import("../api").tezosGetAddress | import("../api").tezosGetPublicKey | import("../api").tezosSignTransaction | import("../api").unlockPath | import("../api").verifyMessage | import("../api").wipeDevice | import("../api").checkFirmwareAuthenticity)[];
+    getCurrentMethod(): Promise<AbstractMethod<any, undefined>>;
     getTransportInfo(): TransportInfo | undefined;
+    enumerate(): void;
 }
 export declare const initCore: (settings: ConnectSettings, logWriterFactory?: () => LogWriter | undefined) => Promise<Core>;
 export declare const initTransport: (settings: ConnectSettings) => Promise<void>;

package/lib/core/index.js

@@ -19,11 +19,12 @@ let _core;
 let _deviceList;
 let _popupPromise;
 const _uiPromises = [];
-const _callMethods = [];
 let _preferredDevice;
+const _callMethods = [];
 let _interactionTimeout;
 let _deviceListInitTimeout;
 let _overridePromise;
+let _getMethodPromise;
 const _log = (0, debug_1.initLog)('Core');
 const postMessage = (message) => {
     if (message.event === events_2.RESPONSE_EVENT) {
@@ -165,7 +166,10 @@ const onCall = async (message) => {
     let method;
     let messageResponse;
     try {
-        method = (0, method_1.getMethod)(message);
+        _log.debug('loading method...');
+        _getMethodPromise = (0, method_1.getMethod)(message);
+        method = await _getMethodPromise;
+        _log.debug('method selected', method.name);
         method.postMessage = postMessage;
         method.getPopupPromise = getPopupPromise;
         method.createUiPromise = createUiPromise;
@@ -622,8 +626,11 @@ class Core extends events_1.default {
             await _deviceList.dispose();
         }
     }
-    getCurrentMethod() {
-        return _callMethods;
+    async getCurrentMethod() {
+        if (_getMethodPromise) {
+            await _getMethodPromise;
+        }
+        return _callMethods[0];
     }
     getTransportInfo() {
         if (!_deviceList) {
@@ -631,6 +638,12 @@ class Core extends events_1.default {
         }
         return _deviceList.getTransportInfo();
     }
+    enumerate() {
+        if (!_deviceList) {
+            return;
+        }
+        _deviceList.enumerate();
+    }
 }
 exports.Core = Core;
 const initCore = async (settings, logWriterFactory) => {

package/lib/core/method.d.ts

@@ -1,6 +1,6 @@
-import * as Methods from '../api';
 import type { IFrameCallMessage } from '../events';
+import type { AbstractMethod } from './AbstractMethod';
 export declare const getMethod: (message: IFrameCallMessage & {
     id?: number;
-}) => Methods.applyFlags | Methods.applySettings | Methods.authenticateDevice | Methods.authorizeCoinjoin | Methods.cancelCoinjoinAuthorization | Methods.showDeviceTutorial | Methods.backupDevice | Methods.binanceGetAddress | Methods.binanceGetPublicKey | Methods.binanceSignTransaction | Methods.blockchainDisconnect | Methods.blockchainEstimateFee | Methods.blockchainGetAccountBalanceHistory | Methods.blockchainGetCurrentFiatRates | Methods.blockchainGetFiatRatesForTimestamps | Methods.blockchainGetTransactions | Methods.blockchainSetCustomBackend | Methods.blockchainSubscribe | Methods.blockchainSubscribeFiatRates | Methods.blockchainUnsubscribe | Methods.blockchainUnsubscribeFiatRates | Methods.cardanoGetAddress | Methods.cardanoGetNativeScriptHash | Methods.cardanoGetPublicKey | Methods.cardanoSignTransaction | Methods.changePin | Methods.cipherKeyValue | Methods.composeTransaction | Methods.eosGetPublicKey | Methods.eosSignTransaction | Methods.ethereumGetAddress | Methods.ethereumGetPublicKey | Methods.ethereumSignMessage | Methods.ethereumSignTransaction | Methods.ethereumSignTypedData | Methods.ethereumVerifyMessage | Methods.firmwareUpdate | Methods.getAccountInfo | Methods.getAddress | Methods.getCoinInfo | Methods.getDeviceState | Methods.getFeatures | Methods.getFirmwareHash | Methods.getOwnershipId | Methods.getOwnershipProof | Methods.getPublicKey | Methods.getSettings | Methods.nemGetAddress | Methods.nemSignTransaction | Methods.pushTransaction | Methods.rebootToBootloader | Methods.recoveryDevice | Methods.requestLogin | Methods.resetDevice | Methods.rippleGetAddress | Methods.rippleSignTransaction | Methods.setBusy | Methods.setProxy | Methods.signMessage | Methods.signTransaction | Methods.stellarGetAddress | Methods.stellarSignTransaction | Methods.tezosGetAddress | Methods.tezosGetPublicKey | Methods.tezosSignTransaction | Methods.unlockPath | Methods.verifyMessage | Methods.wipeDevice | Methods.checkFirmwareAuthenticity;
+}) => Promise<AbstractMethod<any>>;
 //# sourceMappingURL=method.d.ts.map

package/lib/core/method.js

@@ -4,12 +4,18 @@ exports.getMethod = void 0;
 const tslib_1 = require("tslib");
 const Methods = tslib_1.__importStar(require("../api"));
 const errors_1 = require("../constants/errors");
-const getMethod = (message) => {
+const network_1 = require("../constants/network");
+const getMethodModule = (method) => network_1.MODULES.find(module => method.startsWith(module));
+const getMethod = async (message) => {
     const { method } = message.payload;
     if (typeof method !== 'string') {
         throw (0, errors_1.TypedError)('Method_InvalidParameter', 'Message method is not set');
     }
-    const MethodConstructor = Methods[method];
+    const methodModule = getMethodModule(method);
+    const methods = methodModule
+        ? await Promise.resolve(`${`../api/${methodModule}/api`}`).then(s => tslib_1.__importStar(require(s)))
+        : Methods;
+    const MethodConstructor = methods[method];
     if (MethodConstructor) {
         return new MethodConstructor(message);
     }

package/lib/core/method.native.d.ts

@@ -0,0 +1,5 @@
+import type { IFrameCallMessage } from '../events';
+export declare const getMethod: (message: IFrameCallMessage & {
+    id?: number;
+}) => Promise<any>;
+//# sourceMappingURL=method.native.d.ts.map

package/lib/core/method.native.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMethod = void 0;
+const tslib_1 = require("tslib");
+const Methods = tslib_1.__importStar(require("../api"));
+const errors_1 = require("../constants/errors");
+const network_1 = require("../constants/network");
+const moduleMethods = {
+    binance: require('../api/binance/api'),
+    cardano: require('../api/cardano/api'),
+    eos: require('../api/eos/api'),
+    ethereum: require('../api/ethereum/api'),
+    nem: require('../api/nem/api'),
+    ripple: require('../api/ripple/api'),
+    solana: require('../api/solana/api'),
+    stellar: require('../api/stellar/api'),
+    tezos: require('../api/tezos/api'),
+};
+const getMethodModule = (method) => network_1.MODULES.find(module => method.startsWith(module));
+const getMethod = async (message) => {
+    const { method } = message.payload;
+    if (typeof method !== 'string') {
+        throw (0, errors_1.TypedError)('Method_InvalidParameter', 'Message method is not set');
+    }
+    const methodModule = getMethodModule(method);
+    const methods = methodModule ? moduleMethods[methodModule] : Methods;
+    const MethodConstructor = methods[method];
+    if (MethodConstructor) {
+        return new MethodConstructor(message);
+    }
+    throw (0, errors_1.TypedError)('Method_InvalidParameter', `Method ${method} not found`);
+};
+exports.getMethod = getMethod;
+//# sourceMappingURL=method.native.js.map

package/lib/data/DataManager.d.ts

@@ -145,6 +145,17 @@ export declare class DataManager {
             max?: undefined;
             comment?: undefined;
             capabilities?: undefined;
+        } | {
+            methods: string[];
+            min: {
+                T1B1: string;
+                T2T1: string;
+                T2B1: string;
+            };
+            coin?: undefined;
+            max?: undefined;
+            comment?: undefined;
+            capabilities?: undefined;
         })[];
     };
 }

package/lib/data/config.d.ts

@@ -133,6 +133,17 @@ export declare const config: {
         max?: undefined;
         comment?: undefined;
         capabilities?: undefined;
+    } | {
+        methods: string[];
+        min: {
+            T1B1: string;
+            T2T1: string;
+            T2B1: string;
+        };
+        coin?: undefined;
+        max?: undefined;
+        comment?: undefined;
+        capabilities?: undefined;
     })[];
 };
 //# sourceMappingURL=config.d.ts.map

package/lib/data/config.js

@@ -212,6 +212,10 @@ exports.config = {
             methods: ['getFirmwareHash'],
             min: { T1B1: '1.11.1', T2T1: '2.5.1' },
         },
+        {
+            methods: ['solanaGetPublicKey', 'solanaGetAddress', 'solanaSignTransaction'],
+            min: { T1B1: '0', T2T1: '2.7.0', T2B1: '2.7.0' },
+        },
     ],
 };
 //# sourceMappingURL=config.js.map

package/lib/data/connectSettings.js

@@ -20,6 +20,7 @@ const initialSettings = {
     lazyLoad: false,
     timestamp: new Date().getTime(),
     interactionTimeout: 600,
+    sharedLogger: true,
 };
 const parseManifest = (manifest) => {
     if (!manifest)
@@ -103,6 +104,9 @@ const parseConnectSettings = (input = {}) => {
     if (typeof input.manifest === 'object') {
         settings.manifest = parseManifest(input.manifest);
     }
+    if (typeof input.sharedLogger === 'boolean') {
+        settings.sharedLogger = input.sharedLogger;
+    }
     return settings;
 };
 exports.parseConnectSettings = parseConnectSettings;

package/lib/data/defaultFeeLevels.js

@@ -64,11 +64,19 @@ const CARDANO_FEE_INFO = {
     maxFee: 16384 * 44 + 155381,
     dustLimit: -1,
 };
+const SOLANA_FEE_INFO = {
+    blockTime: -1,
+    defaultFees: [{ label: 'normal', feePerUnit: '5000', blocks: -1 }],
+    minFee: -1,
+    maxFee: -1,
+    dustLimit: -1,
+};
 const MISC_FEE_LEVELS = {
     xrp: RIPPLE_FEE_INFO,
     txrp: RIPPLE_FEE_INFO,
     ada: CARDANO_FEE_INFO,
     tada: CARDANO_FEE_INFO,
+    sol: SOLANA_FEE_INFO,
 };
 const getMiscFeeLevels = (data) => {
     const shortcut = data.shortcut.toLowerCase();

package/lib/data/version.d.ts

@@ -1,3 +1,3 @@
-export declare const VERSION = "9.1.5";
+export declare const VERSION = "9.1.6";
 export declare const DEFAULT_DOMAIN: string;
 //# sourceMappingURL=version.d.ts.map

package/lib/data/version.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_DOMAIN = exports.VERSION = void 0;
-exports.VERSION = '9.1.5';
+exports.VERSION = '9.1.6';
 const versionN = exports.VERSION.split('.').map(s => parseInt(s, 10));
 exports.DEFAULT_DOMAIN = `https://connect.trezor.io/${versionN[0]}/`;
 //# sourceMappingURL=version.js.map

package/lib/device/Device.d.ts

@@ -90,7 +90,7 @@ export declare class Device extends TypedEmitter<DeviceEvents> {
     dispose(): import("packages/transport/lib/types").AbortableCall<void, "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" | "session not found"> | undefined;
     getMode(): "normal" | "bootloader" | "initialize" | "seedless";
     toMessageObject(): DeviceTyped;
-    _getNetworkTypeState(): "bitcoin" | "ethereum" | "nem" | "eos" | "stellar" | "cardano" | "ripple" | "tezos" | "binance";
+    _getNetworkTypeState(): "binance" | "cardano" | "eos" | "ethereum" | "nem" | "ripple" | "solana" | "stellar" | "tezos" | "bitcoin";
     _setNetworkTypeState(networkType?: NETWORK.NetworkType): void;
     _altModeChange(networkType?: NETWORK.NetworkType): boolean;
     _isAltModeNetworkType(networkType?: keyof typeof NETWORK.TYPES): boolean;

package/lib/device/Device.js

@@ -117,7 +117,10 @@ class Device extends typedEventEmitter_1.TypedEmitter {
         options = parseRunOptions(options);
         const runPromise = (0, utils_1.createDeferred)();
         this.runPromise = runPromise;
-        return Promise.race([this._runInner(fn, options), runPromise.promise]);
+        this._runInner(fn, options).catch(err => {
+            runPromise.reject(err);
+        });
+        return runPromise.promise;
     }
     async override(error) {
         if (this.acquirePromise) {
@@ -327,7 +330,13 @@ class Device extends typedEventEmitter_1.TypedEmitter {
         }
         this.features = feat;
         this.featuresNeedsReload = false;
-        if (this.getMode() !== 'bootloader') {
+        if (feat.fw_vendor === 'Trezor Bitcoin-only') {
+            this.firmwareType = types_1.FirmwareType.BitcoinOnly;
+        }
+        else if (feat.fw_vendor === 'Trezor') {
+            this.firmwareType = types_1.FirmwareType.Regular;
+        }
+        else if (this.getMode() !== 'bootloader') {
             this.firmwareType =
                 feat.capabilities &&
                     feat.capabilities.length > 0 &&

package/lib/device/DeviceCommands.js

@@ -474,6 +474,15 @@ class DeviceCommands {
                 address_n,
             };
         }
+        if (coinInfo.shortcut === 'SOL' || coinInfo.shortcut === 'DSOL') {
+            const { message } = await this.typedCall('SolanaGetAddress', 'SolanaAddress', {
+                address_n,
+            });
+            return {
+                descriptor: message.address,
+                address_n,
+            };
+        }
         throw constants_1.ERRORS.TypedError('Runtime', 'DeviceCommands.getAccountDescriptor: unsupported coinInfo.type');
     }
     async cancel() {

package/lib/device/DeviceList.js

@@ -60,7 +60,10 @@ class DeviceList extends typedEventEmitter_1.TypedEmitter {
                 }
             }
             else if (transportType instanceof transport_1.Transport) {
-                this.transports.unshift(transportType);
+                if (!transportType.getMessage()) {
+                    transportType.updateMessages(this.messages);
+                }
+                this.transports.push(transportType);
             }
             else {
                 throw constants_1.ERRORS.TypedError('Runtime', 'DeviceList.init: transports[] of unexpected type');

package/lib/events/popup.d.ts

@@ -5,6 +5,7 @@ import type { MessageFactoryFn } from '../types/utils';
 export declare const POPUP: {
     readonly BOOTSTRAP: "popup-bootstrap";
     readonly LOADED: "popup-loaded";
+    readonly CORE_LOADED: "popup-core-loaded";
     readonly INIT: "popup-init";
     readonly ERROR: "popup-error";
     readonly EXTENSION_USB_PERMISSIONS: "open-usb-permissions";
@@ -13,6 +14,8 @@ export declare const POPUP: {
     readonly CANCEL_POPUP_REQUEST: "ui-cancel-popup-request";
     readonly CLOSE_WINDOW: "window.close";
     readonly ANALYTICS_RESPONSE: "popup-analytics-response";
+    readonly CONTENT_SCRIPT_LOADED: "popup-content-script-loaded";
+    readonly METHOD_INFO: "popup-method-info";
 };
 export interface PopupInit {
     type: typeof POPUP.INIT;
@@ -20,13 +23,13 @@ export interface PopupInit {
         settings: ConnectSettings;
         useBroadcastChannel: boolean;
         systemInfo: SystemInfo;
+        useCore?: boolean;
     };
 }
 export interface PopupHandshake {
     type: typeof POPUP.HANDSHAKE;
     payload: {
         settings: ConnectSettings;
-        method?: string;
         transport?: TransportInfo;
     };
 }
@@ -48,10 +51,23 @@ export interface PopupAnalyticsResponse {
         enabled: boolean;
     };
 }
+export interface PopupMethodInfo {
+    type: typeof POPUP.METHOD_INFO;
+    payload: {
+        info: string;
+        method: string;
+    };
+}
+export interface PopupContentScriptLoaded {
+    type: typeof POPUP.CONTENT_SCRIPT_LOADED;
+    payload: {
+        id: string;
+    };
+}
 export type PopupEvent = {
-    type: typeof POPUP.LOADED | typeof POPUP.CANCEL_POPUP_REQUEST;
+    type: typeof POPUP.LOADED | typeof POPUP.CORE_LOADED | typeof POPUP.CANCEL_POPUP_REQUEST;
     payload?: typeof undefined;
-} | PopupInit | PopupHandshake | PopupError | PopupClosedMessage | PopupAnalyticsResponse;
+} | PopupInit | PopupHandshake | PopupError | PopupClosedMessage | PopupAnalyticsResponse | PopupContentScriptLoaded | PopupMethodInfo;
 export type PopupEventMessage = PopupEvent & {
     event: typeof UI_EVENT;
 };

package/lib/events/popup.js

@@ -5,6 +5,7 @@ const ui_request_1 = require("./ui-request");
 exports.POPUP = {
     BOOTSTRAP: 'popup-bootstrap',
     LOADED: 'popup-loaded',
+    CORE_LOADED: 'popup-core-loaded',
     INIT: 'popup-init',
     ERROR: 'popup-error',
     EXTENSION_USB_PERMISSIONS: 'open-usb-permissions',
@@ -13,6 +14,8 @@ exports.POPUP = {
     CANCEL_POPUP_REQUEST: 'ui-cancel-popup-request',
     CLOSE_WINDOW: 'window.close',
     ANALYTICS_RESPONSE: 'popup-analytics-response',
+    CONTENT_SCRIPT_LOADED: 'popup-content-script-loaded',
+    METHOD_INFO: 'popup-method-info',
 };
 const createPopupMessage = (type, payload) => ({
     event: ui_request_1.UI_EVENT,

package/lib/factory.js

@@ -42,6 +42,7 @@ const factory = ({ eventEmitter, manifest, init, call, requestLogin, uiResponse,
         cardanoGetNativeScriptHash: params => call({ ...params, method: 'cardanoGetNativeScriptHash' }),
         cardanoGetPublicKey: params => call({ ...params, method: 'cardanoGetPublicKey' }),
         cardanoSignTransaction: params => call({ ...params, method: 'cardanoSignTransaction' }),
+        cardanoComposeTransaction: params => call({ ...params, method: 'cardanoComposeTransaction' }),
         cipherKeyValue: params => call({ ...params, method: 'cipherKeyValue' }),
         composeTransaction: params => call({ ...params, method: 'composeTransaction' }),
         ethereumGetAddress: params => call({
@@ -54,6 +55,7 @@ const factory = ({ eventEmitter, manifest, init, call, requestLogin, uiResponse,
         ethereumSignTransaction: params => call({ ...params, method: 'ethereumSignTransaction' }),
         ethereumSignTypedData: params => call({ ...params, method: 'ethereumSignTypedData' }),
         ethereumVerifyMessage: params => call({ ...params, method: 'ethereumVerifyMessage' }),
+        getAccountDescriptor: params => call({ ...params, method: 'getAccountDescriptor' }),
         getAccountInfo: params => call({ ...params, method: 'getAccountInfo' }),
         getAddress: params => call({
             ...params,
@@ -81,6 +83,9 @@ const factory = ({ eventEmitter, manifest, init, call, requestLogin, uiResponse,
         rippleSignTransaction: params => call({ ...params, method: 'rippleSignTransaction' }),
         signMessage: params => call({ ...params, method: 'signMessage' }),
         signTransaction: params => call({ ...params, method: 'signTransaction' }),
+        solanaGetPublicKey: params => call({ ...params, method: 'solanaGetPublicKey' }),
+        solanaGetAddress: params => call({ ...params, method: 'solanaGetAddress' }),
+        solanaSignTransaction: params => call({ ...params, method: 'solanaSignTransaction' }),
         stellarGetAddress: params => call({
             ...params,
             method: 'stellarGetAddress',

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

@@ -0,0 +1,44 @@
+import type { types, trezorUtils } from '@fivebinaries/coin-selection';
+import type { AccountAddresses, AccountUtxo } from '../../exports';
+import type { Params, Response } from '../params';
+import type { CardanoCertificate, CardanoInput, CardanoOutput } from './cardano';
+import type { PrecomposeResultFinal, PrecomposeResultNonFinal, PrecomposeResultError } from './composeTransaction';
+export type PrecomposedTransactionFinalCardano = Omit<PrecomposeResultFinal, 'inputs' | 'outputs' | 'outputsPermutation'> & {
+    deposit?: string;
+    ttl?: number;
+    inputs: CardanoInput[];
+    outputs: CardanoOutput[];
+    unsignedTx: {
+        body: string;
+        hash: string;
+    };
+};
+export type PrecomposedTransactionNonFinalCardano = Omit<PrecomposeResultNonFinal, 'inputs'> & {
+    deposit?: string;
+};
+export type PrecomposedTransactionErrorCardano = PrecomposeResultError | {
+    type: 'error';
+    error: 'UTXO_BALANCE_INSUFFICIENT' | 'UTXO_VALUE_TOO_SMALL';
+};
+export type PrecomposedTransactionCardano = PrecomposedTransactionFinalCardano | PrecomposedTransactionNonFinalCardano | PrecomposedTransactionErrorCardano;
+export type CardanoComposeTransactionParams = {
+    account: {
+        descriptor: string;
+        addresses: AccountAddresses;
+        utxo: AccountUtxo[];
+    };
+    feeLevels?: {
+        feePerUnit?: string;
+    }[];
+    outputs?: types.UserOutput[];
+    certificates?: CardanoCertificate[];
+    withdrawals?: types.Withdrawal[];
+    changeAddress: {
+        address: string;
+        path: string;
+    };
+    addressParameters: Parameters<(typeof trezorUtils)['transformToTrezorOutputs']>[1];
+    testnet?: boolean;
+};
+export declare function cardanoComposeTransaction(params: Params<CardanoComposeTransactionParams>): Response<PrecomposedTransactionCardano[]>;
+//# sourceMappingURL=cardanoComposeTransaction.d.ts.map

package/lib/types/api/cardanoComposeTransaction.js

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

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

@@ -1,4 +1,13 @@
 import type { Params, Response } from '../params';
 import type { CardanoSignTransaction, CardanoSignedTxData } from './cardano';
 export declare function cardanoSignTransaction(params: Params<CardanoSignTransaction>): Response<CardanoSignedTxData>;
+export declare function cardanoSignTransaction(params: Params<CardanoSignTransaction & {
+    unsignedTx: {
+        body: string;
+        hash: string;
+    };
+    testnet: boolean;
+}>): Response<CardanoSignedTxData & {
+    serializedTx: string;
+}>;
 //# sourceMappingURL=cardanoSignTransaction.d.ts.map