@sidhujag/sysweb3-keyring 1.0.628 → 2.1.0

package/cjs/trezor/connect.js

@@ -0,0 +1,243 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trezorResponseError = exports.subscribeTrezorEvents = void 0;
+const methods = [
+    'getFeatures',
+    'getAccountInfo',
+    'ethereumGetAddress',
+    'ethereumGetPublicKey',
+    'getPublicKey',
+    'getAddress',
+    'signTransaction',
+    'ethereumSignTransaction',
+    'signMessage',
+    'ethereumSignMessage',
+    'ethereumSignTypedData',
+    'verifyMessage',
+    'ethereumVerifyMessage',
+];
+const listeners = new Set();
+let clientPromise;
+let generation = 0;
+let initialized = false;
+let cleanupPromise = Promise.resolve();
+let cleanupPending = false;
+const inFlight = new Set();
+const pending = new Set();
+const interrupted = () => Object.assign(new Error('Trezor operation cancelled'), {
+    code: 'Method_Interrupted',
+});
+const invalidate = () => {
+    generation++;
+    initialized = false;
+    const error = interrupted();
+    for (const reject of pending)
+        reject(error);
+    pending.clear();
+    emit({ type: 'disconnected' });
+};
+const subscribeTrezorEvents = (listener) => {
+    listeners.add(listener);
+    return () => listeners.delete(listener);
+};
+exports.subscribeTrezorEvents = subscribeTrezorEvents;
+const emit = (event) => {
+    for (const listener of listeners) {
+        try {
+            listener(event);
+        }
+        catch {
+            // Status observers must not turn a completed device call into a retry.
+        }
+    }
+};
+/** Connect 10's webextension module registers Chrome listeners on import. */
+const requireExtensionHost = () => {
+    const chrome = globalThis.chrome;
+    if (!chrome?.runtime?.id ||
+        chrome.runtime.getManifest?.()?.manifest_version !== 3 ||
+        typeof chrome.runtime.onConnect?.addListener !== 'function' ||
+        typeof chrome.runtime.onMessageExternal?.addListener !== 'function' ||
+        typeof chrome.tabs?.get !== 'function' ||
+        typeof chrome.tabs?.create !== 'function' ||
+        typeof chrome.tabs?.update !== 'function' ||
+        typeof chrome.windows?.getCurrent !== 'function') {
+        throw Object.assign(new Error('Trezor requires a supported MV3 extension host'), { code: 'HARDWARE_SIGNER_UNAVAILABLE' });
+    }
+};
+const getClient = () => {
+    requireExtensionHost();
+    if (!clientPromise) {
+        clientPromise = Promise.resolve().then(() => __importStar(require('@trezor/connect-webextension'))).then((module) => module.default)
+            .catch((error) => {
+            clientPromise = undefined;
+            throw error;
+        });
+    }
+    return clientPromise;
+};
+/** Keep the SDK's established failure payload while preserving Connect 10 codes. */
+const normalize = (response, method) => {
+    if (response?.success === false) {
+        const error = response.error;
+        const code = typeof error?.code === 'string' ? error.code : undefined;
+        if (code === 'Device_Disconnected' ||
+            code === 'Device_NotFound' ||
+            code === 'Desktop_ConnectionMissing' ||
+            code === 'Transport_Missing') {
+            invalidate();
+        }
+        return {
+            ...response,
+            payload: {
+                error: typeof error?.message === 'string'
+                    ? error.message
+                    : 'Trezor request failed',
+                code,
+            },
+        };
+    }
+    const model = response?.device?.features?.model ??
+        (method === 'getFeatures' ? response?.payload?.model : undefined);
+    if (response?.success === true && typeof model === 'string') {
+        emit({ type: 'model', model });
+    }
+    return response;
+};
+const withClient = async (operation, requireInitialized = true) => {
+    const captured = generation;
+    const assertCurrent = () => {
+        if (captured !== generation)
+            throw interrupted();
+        if (requireInitialized && !initialized) {
+            throw Object.assign(new Error('TrezorConnect not initialized'), {
+                code: 'Init_NotInitialized',
+            });
+        }
+    };
+    assertCurrent();
+    let rejectPending;
+    const cancelled = new Promise((_resolve, reject) => {
+        rejectPending = reject;
+    });
+    pending.add(rejectPending);
+    try {
+        const result = await Promise.race([
+            (async () => {
+                await cleanupPromise;
+                assertCurrent();
+                const client = await getClient();
+                assertCurrent();
+                const request = Promise.resolve(operation(client));
+                inFlight.add(request);
+                try {
+                    return await request;
+                }
+                finally {
+                    inFlight.delete(request);
+                }
+            })(),
+            cancelled,
+        ]);
+        // A late response must not restore a model/status or return a signature.
+        assertCurrent();
+        return result;
+    }
+    finally {
+        pending.delete(rejectPending);
+    }
+};
+const calls = Object.fromEntries(methods.map((method) => [
+    method,
+    async (...args) => {
+        const captured = generation;
+        const response = await withClient((client) => client[method](...args));
+        if (captured !== generation)
+            throw interrupted();
+        return normalize(response, method);
+    },
+]));
+const TrezorConnect = {
+    ...calls,
+    async init(settings) {
+        if (cleanupPending) {
+            throw Object.assign(new Error('Previous Trezor request is still pending'), {
+                code: 'HARDWARE_SIGNER_BUSY',
+            });
+        }
+        invalidate();
+        const captured = generation;
+        await withClient((client) => client.init({ ...settings, env: 'webextension' }), false);
+        if (captured !== generation)
+            throw interrupted();
+        initialized = true;
+    },
+    dispose() {
+        // Invalidate synchronously, before waiting for import or remote cleanup.
+        // Suite Web's upstream dispose is a no-op; local invalidation is required.
+        invalidate();
+        if (cleanupPending) {
+            return inFlight.size ? Promise.resolve() : cleanupPromise;
+        }
+        const loaded = clientPromise;
+        if (!loaded)
+            return Promise.resolve();
+        const outstanding = [...inFlight];
+        cleanupPending = true;
+        cleanupPromise = cleanupPromise
+            .catch(() => undefined)
+            .then(async () => {
+            // Closing Desktop's socket during a raw call makes Connect auto-open
+            // Suite Web. Let that raw call settle while its result stays fenced.
+            await Promise.allSettled(outstanding);
+            const client = await loaded;
+            // Desktop cancel() discards an internal Promise in Connect 10.0.1;
+            // do not invoke it or claim that Suite Web's no-op dispose closes UI.
+            await client.dispose();
+        })
+            .finally(() => {
+            cleanupPending = false;
+        });
+        // Deferred cleanup may outlive the caller; preserve its failure for future
+        // init while preventing an unhandled rejection when the host is locking.
+        void cleanupPromise.catch(() => undefined);
+        return outstanding.length ? Promise.resolve() : cleanupPromise;
+    },
+};
+const trezorResponseError = (response, prefix = '') => Object.assign(new Error(prefix + (response.payload?.error || 'Trezor request failed')), { code: response.payload?.code });
+exports.trezorResponseError = trezorResponseError;
+exports.default = TrezorConnect;
+//# sourceMappingURL=connect.js.map

package/cjs/trezor/connect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../src/trezor/connect.ts"],"names":[],"mappings":"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"}

package/cjs/trezor/index.js

@@ -39,28 +39,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrezorKeyring = void 0;
 /* eslint-disable camelcase */
 const eth_sig_util_1 = require("@metamask/eth-sig-util");
-const connect_webextension_1 = __importStar(require("@trezor/connect-webextension"));
-const utxo_lib_1 = require("@trezor/utxo-lib");
 const bitcoin_ops_1 = __importDefault(require("bitcoin-ops"));
+const bs58check_1 = __importDefault(require("bs58check"));
 const buffer_1 = require("buffer");
 const syscoinjs = __importStar(require("syscoinjs-lib"));
+const connect_1 = __importStar(require("./connect"));
+const witness_1 = require("./witness");
 const hardware_wallet_manager_1 = require("../hardware-wallet-manager");
 const derivation_paths_1 = require("../utils/derivation-paths");
 const bitcoinjs = syscoinjs.utils.bitcoinjs;
 const { p2wsh } = bitcoinjs.payments;
 const { decompile } = bitcoinjs.script;
-const { fromBase58Check, fromBech32 } = utxo_lib_1.address;
+const { fromBech32 } = bitcoinjs.address;
+const fromBase58Check = (value) => {
+    try {
+        return bitcoinjs.address.fromBase58Check(value);
+    }
+    catch (error) {
+        // The former decoder also accepted a two-byte network version. Preserve
+        // exactly that checksum-verified format without loading the legacy fork.
+        const payload = bs58check_1.default.decode(value);
+        if (payload.length === 22) {
+            return {
+                version: (payload[0] << 8) | payload[1],
+                hash: payload.subarray(2),
+            };
+        }
+        throw error;
+    }
+};
 const initialHDPath = `m/44'/60'/0'/0/0`;
 const DELAY_BETWEEN_POPUPS = 2000; // Increased from 1000ms to 2000ms for more reliable operation
 const stripHexPrefix = (value) => value.startsWith('0x') || value.startsWith('0X') ? value.slice(2) : value;
-const serializeWitness = (witness) => {
-    const stack = witness.map((item) => buffer_1.Buffer.from(item));
-    const size = utxo_lib_1.bufferutils.varIntSize(stack.length) +
-        stack.reduce((total, item) => total + utxo_lib_1.bufferutils.varIntSize(item.length) + item.length, 0);
-    const writer = new utxo_lib_1.bufferutils.BufferWriter(buffer_1.Buffer.alloc(size));
-    writer.writeVector(stack);
-    return writer.buffer;
-};
 const finalizedFields = (input) => {
     if (!input.finalScriptSig && !input.finalScriptWitness)
         return null;
@@ -76,6 +86,19 @@ class TrezorKeyring {
         this.hdPath = initialHDPath;
         this.paths = {};
         this.initialized = false;
+        this.lifecycleGeneration = 0;
+        this.onTrezorConnected = ({ type, }) => {
+            if (type === hardware_wallet_manager_1.HardwareWalletType.TREZOR) {
+                console.log('Trezor connected');
+                this.initialized = true;
+            }
+        };
+        this.onTrezorDisconnected = ({ type, }) => {
+            if (type === hardware_wallet_manager_1.HardwareWalletType.TREZOR) {
+                console.log('Trezor disconnected');
+                this.initialized = false;
+            }
+        };
         this._transformTypedData = (data, version) => {
             const { types, primaryType, domain, message } = this._sanitizeData(data);
             const domainSeparatorHash = eth_sig_util_1.TypedDataUtils.hashStruct('EIP712Domain', this._sanitizeData(domain), types, version).toString('hex');
@@ -94,36 +117,42 @@ class TrezorKeyring {
         this.hdPath = '';
         this.paths = {};
         this.hardwareWalletManager = new hardware_wallet_manager_1.HardwareWalletManager();
-        // Set up event listeners
-        this.hardwareWalletManager.on('connected', ({ type }) => {
-            if (type === hardware_wallet_manager_1.HardwareWalletType.TREZOR) {
-                console.log('Trezor connected');
-                this.initialized = true;
-            }
-        });
-        this.hardwareWalletManager.on('disconnected', ({ type }) => {
-            if (type === hardware_wallet_manager_1.HardwareWalletType.TREZOR) {
-                console.log('Trezor disconnected');
-                this.initialized = false;
-            }
-        });
-        connect_webextension_1.default.on(connect_webextension_1.DEVICE_EVENT, (event) => {
-            if (event.payload.features) {
-                this.model = event.payload.features.model;
-            }
-        });
+        this.observeTrezor();
+    }
+    observeTrezor() {
+        // Manager destruction removes its listeners. Reusing an unlocked keyring
+        // must restore these same callbacks without multiplying them on each init.
+        if (!this.hardwareWalletManager
+            .listeners('connected')
+            .includes(this.onTrezorConnected))
+            this.hardwareWalletManager.on('connected', this.onTrezorConnected);
+        if (!this.hardwareWalletManager
+            .listeners('disconnected')
+            .includes(this.onTrezorDisconnected))
+            this.hardwareWalletManager.on('disconnected', this.onTrezorDisconnected);
+        if (!this.unsubscribeTrezor)
+            this.unsubscribeTrezor = (0, connect_1.subscribeTrezorEvents)((event) => {
+                if (event.type === 'model')
+                    this.model = event.model;
+            });
     }
     /**
      * Initialize Trezor script.
      */
     async init() {
+        const generation = this.lifecycleGeneration;
+        this.observeTrezor();
         if (this.initialized) {
             return true;
         }
         // Add a small delay to ensure Chrome extension context is ready
         // This helps prevent "waiting for handshake" errors
         await new Promise((resolve) => setTimeout(resolve, 100));
+        if (generation !== this.lifecycleGeneration)
+            return false;
         const result = await this.hardwareWalletManager.initializeTrezor();
+        if (generation !== this.lifecycleGeneration)
+            return false;
         if (result) {
             this.initialized = true;
         }
@@ -150,15 +179,17 @@ class TrezorKeyring {
         // Use hardware wallet manager's retry mechanism with custom config
         return this.hardwareWalletManager
             .retryOperation(operation, operationName, trezorRetryConfig)
-            .catch((error) => {
+            .catch(async (error) => {
             // Clean up Trezor state on failure
-            if (error.message?.includes('Popup closed') ||
-                error.message?.includes('cancelled') ||
-                error.message?.includes('denied')) {
+            const message = String(error.message || '').toLowerCase();
+            if (message.includes('popup closed') ||
+                message.includes('cancelled') ||
+                message.includes('canceled') ||
+                message.includes('denied')) {
                 this.initialized = false;
                 // Dispose Trezor connection to clean up
                 try {
-                    connect_webextension_1.default.dispose();
+                    await connect_1.default.dispose();
                 }
                 catch (disposeError) {
                     console.log('Failed to dispose Trezor on error:', disposeError);
@@ -185,12 +216,12 @@ class TrezorKeyring {
             // For EVM networks, getAccountInfo is not supported
             // We need to use getAddress instead
             if (slip44 === 60) {
-                const addressResponse = await connect_webextension_1.default.ethereumGetAddress({
+                const addressResponse = await connect_1.default.ethereumGetAddress({
                     path: this.hdPath,
                     showOnTrezor: false,
                 });
                 if (!addressResponse.success) {
-                    throw new Error(addressResponse.payload.error || 'Failed to get EVM address');
+                    throw (0, connect_1.trezorResponseError)(addressResponse);
                 }
                 // Return a compatible AccountInfo structure
                 return {
@@ -204,14 +235,14 @@ class TrezorKeyring {
                 };
             }
             // For UTXO networks, use the standard getAccountInfo
-            const response = await connect_webextension_1.default.getAccountInfo({
-                coin,
+            const response = await connect_1.default.getAccountInfo({
+                coin: coin,
                 path: this.hdPath,
             });
             if (response.success) {
                 return response.payload;
             }
-            throw new Error(response.payload.error);
+            throw (0, connect_1.trezorResponseError)(response);
         }, 'getAccountInfo');
     }
     /**
@@ -224,13 +255,16 @@ class TrezorKeyring {
         return this.model;
     }
     /**
-     * This removes the Trezor Connect iframe from the DOM
+     * This disposes the active Trezor Suite connection
      *
      * @returns void
      */
     dispose() {
+        this.lifecycleGeneration++;
         try {
-            connect_webextension_1.default.dispose();
+            void connect_1.default.dispose().catch((error) => {
+                console.log('Error disposing Trezor:', error);
+            });
             this.initialized = false;
             // Clear any cached data
             this.publicKey = buffer_1.Buffer.from('', 'hex');
@@ -262,7 +296,7 @@ class TrezorKeyring {
                     method = 'verifyMessage';
             }
             // @ts-ignore
-            const { success, payload } = await connect_webextension_1.default[method]({
+            const { success, payload } = await connect_1.default[method]({
                 coin,
                 address,
                 message,
@@ -271,7 +305,7 @@ class TrezorKeyring {
             if (success) {
                 return { success, payload };
             }
-            throw new Error(payload.error);
+            throw (0, connect_1.trezorResponseError)({ payload });
         }, 'verifyMessage');
     }
     /**
@@ -290,7 +324,7 @@ class TrezorKeyring {
         try {
             // For EVM networks, use ethereumGetPublicKey
             if (slip44 === 60) {
-                const { success, payload } = await connect_webextension_1.default.ethereumGetPublicKey({
+                const { success, payload } = await connect_1.default.ethereumGetPublicKey({
                     path: this.hdPath,
                     showOnTrezor: false,
                 });
@@ -306,7 +340,7 @@ class TrezorKeyring {
                 return { success: false, payload };
             }
             // For UTXO networks, use standard getPublicKey
-            const { success, payload } = await connect_webextension_1.default.getPublicKey({
+            const { success, payload } = await connect_1.default.getPublicKey({
                 coin: coin,
                 path: this.hdPath,
             });
@@ -355,9 +389,9 @@ class TrezorKeyring {
         const approvedTransaction = unsignedSnapshot(psbt);
         const approvedFinalInputs = psbt.data.inputs.map(finalizedFields);
         const payload = await this.executeWithRetry(async () => {
-            const response = await connect_webextension_1.default.signTransaction(utxoTransaction);
+            const response = await connect_1.default.signTransaction(utxoTransaction);
             if (!response.success) {
-                throw new Error('Trezor sign failed: ' + response.payload.error);
+                throw (0, connect_1.trezorResponseError)(response, 'Trezor sign failed: ');
             }
             return response.payload;
         }, 'signUtxoTransaction');
@@ -377,7 +411,7 @@ class TrezorKeyring {
                 current.witness !== approved.witness ||
                 buffer_1.Buffer.from(tx.ins[index].script).toString('hex') !==
                     approved.scriptSig ||
-                serializeWitness(tx.ins[index].witness || []).toString('hex') !==
+                (0, witness_1.serializeWitness)(tx.ins[index].witness || []).toString('hex') !==
                     approved.witness);
         })) {
             throw new Error('Trezor changed an already-finalized input');
@@ -671,14 +705,14 @@ class TrezorKeyring {
             await new Promise((resolve) => setTimeout(resolve, DELAY_BETWEEN_POPUPS));
             // Use dynamic path generation based on actual network parameters
             this.setHdPath(coin, Number(index) || 0, slip44);
-            const response = await connect_webextension_1.default.ethereumSignTransaction({
+            const response = await connect_1.default.ethereumSignTransaction({
                 path: this.hdPath,
                 transaction: tx,
             });
             if (response.success) {
                 return response;
             }
-            throw new Error(response.payload.error);
+            throw (0, connect_1.trezorResponseError)(response);
         }, 'signEthTransaction');
     }
     /**
@@ -702,12 +736,14 @@ class TrezorKeyring {
     }
     async _signUtxoPersonalMessage({ coin, index, slip44, message, }) {
         try {
+            if (typeof message !== 'string')
+                throw new Error('Message must be a string');
             // Use dynamic path generation instead of hardcoded switch
             this.setHdPath(coin, index || 0, slip44);
-            const { success, payload } = await connect_webextension_1.default.signMessage({
+            const { success, payload } = await connect_1.default.signMessage({
                 path: this.hdPath,
                 coin: coin,
-                message: message,
+                message,
             });
             if (success) {
                 return { success, payload };
@@ -724,7 +760,7 @@ class TrezorKeyring {
             setTimeout(async () => {
                 try {
                     this.setHdPath('eth', index, 60);
-                    connect_webextension_1.default.ethereumSignMessage({
+                    connect_1.default.ethereumSignMessage({
                         path: this.hdPath,
                         message: stripHexPrefix(message),
                         hex: true,
@@ -742,11 +778,11 @@ class TrezorKeyring {
                         else {
                             reject(
                             // @ts-ignore
-                            new Error(response.payload.error || 'Unknown error'));
+                            (0, connect_1.trezorResponseError)(response));
                         }
                     })
                         .catch((e) => {
-                        reject(new Error(e.toString() || 'Unknown error'));
+                        reject(e instanceof Error ? e : new Error(String(e)));
                     });
                 }
                 catch (error) {
@@ -797,7 +833,7 @@ class TrezorKeyring {
              } = dataWithHashes;
             // This is necessary to avoid popup collision
             // between the unlock & sign trezor popups
-            const response = await connect_webextension_1.default.ethereumSignTypedData({
+            const response = await connect_1.default.ethereumSignTypedData({
                 path: this.hdPath,
                 data: {
                     types: {
@@ -820,7 +856,7 @@ class TrezorKeyring {
                 return response.payload.signature;
             }
             // @ts-ignore
-            throw new Error(response.payload.error || 'Unknown error');
+            throw (0, connect_1.trezorResponseError)(response);
         }, 'signTypedData');
     }
     /**
@@ -835,7 +871,7 @@ class TrezorKeyring {
             const fullPath = (0, derivation_paths_1.getAddressDerivationPath)(currency, slip44, accountIndex, false, // Not a change address
             0);
             try {
-                const { payload, success } = await connect_webextension_1.default.getAddress({
+                const { payload, success } = await connect_1.default.getAddress({
                     path: fullPath,
                     coin: currency,
                     showOnTrezor: true, // This displays the address on device for verification
@@ -862,6 +898,8 @@ class TrezorKeyring {
      * Clean up resources
      */
     async destroy() {
+        this.unsubscribeTrezor?.();
+        this.unsubscribeTrezor = undefined;
         try {
             // First dispose Trezor Connect
             this.dispose();