@sidhujag/sysweb3-keyring 1.0.626 → 1.0.628

package/cjs/transactions/hardware-psbt.js

@@ -0,0 +1,167 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createLedgerPsbtSigner = createLedgerPsbtSigner;
+exports.createTrezorPsbtSigner = createTrezorPsbtSigner;
+const sysweb3_network_1 = require("@sidhujag/sysweb3-network");
+const syscoin_core_1 = require("./syscoin-core");
+const policy_1 = require("../ledger/bitcoin_client/lib/policy");
+const psbtv2_1 = require("../ledger/bitcoin_client/lib/psbtv2");
+const consts_1 = require("../ledger/consts");
+const derivation_paths_1 = require("../utils/derivation-paths");
+const psbt_account_scope_1 = require("../utils/psbt-account-scope");
+/** Legacy device adapter. The software transaction engine never imports it. */
+function createLedgerPsbtSigner(ledger) {
+    return async ({ psbt, account, network: activeNetwork, scope, assertCurrent, getRawTransaction, }) => {
+        if (typeof ledger?.convertToLedgerFormat !== 'function' ||
+            typeof getRawTransaction !== 'function') {
+            throw (0, syscoin_core_1.createHardwareSignerUnavailableError)('Ledger');
+        }
+        // CRITICAL: Enhance PSBT with required Ledger fields
+        const accountXpub = account.xpub;
+        const accountId = account.id;
+        // Enrich PSBT with nonWitnessUtxo for Ledger compatibility
+        const blockbookUrl = activeNetwork.url;
+        // Some unit tests mock PSBTs without bitcoinjs-lib internals (data/txInputs).
+        // Only attempt enrichment when the PSBT looks like a real bitcoinjs-lib Psbt.
+        const psbtAny = psbt;
+        const inputMetas = psbtAny?.data?.inputs;
+        const txInputs = psbtAny?.txInputs;
+        if (Array.isArray(inputMetas) &&
+            Array.isArray(txInputs) &&
+            txInputs.length > 0) {
+            // Fetch and add nonWitnessUtxo where Ledger still needs it.
+            const txFetchPromises = txInputs.map(async (_txInput, index) => {
+                try {
+                    // Keep existing previous transactions, and finalized witness
+                    // inputs that already carry the prevout data needed by Ledger.
+                    const input = inputMetas[index];
+                    if (input?.nonWitnessUtxo ||
+                        (input?.witnessUtxo &&
+                            (input.finalScriptSig || input.finalScriptWitness)))
+                        return { index, success: true };
+                    const tx = txInputs[index];
+                    const prevTxId = Buffer.from(tx.hash).reverse().toString('hex');
+                    // Fetch the raw transaction
+                    const rawTxResponse = await getRawTransaction(blockbookUrl, prevTxId);
+                    // Handle different response formats (string, object with 'hex', or object with 'result')
+                    let rawTxHex;
+                    if (typeof rawTxResponse === 'string') {
+                        rawTxHex = rawTxResponse;
+                    }
+                    else if (rawTxResponse &&
+                        typeof rawTxResponse === 'object' &&
+                        'hex' in rawTxResponse) {
+                        rawTxHex = rawTxResponse.hex;
+                    }
+                    else if (rawTxResponse &&
+                        typeof rawTxResponse === 'object' &&
+                        'result' in rawTxResponse) {
+                        rawTxHex = rawTxResponse.result;
+                    }
+                    else {
+                        throw new Error(`Unexpected response format: ${JSON.stringify(rawTxResponse)}`);
+                    }
+                    if (!rawTxHex || typeof rawTxHex !== 'string') {
+                        throw new Error(`Invalid raw transaction hex received`);
+                    }
+                    // Convert hex to Buffer and add to PSBT
+                    const nonWitnessUtxo = Buffer.from(rawTxHex, 'hex');
+                    if (nonWitnessUtxo.length === 0) {
+                        throw new Error('Converted buffer is empty');
+                    }
+                    psbt.updateInput(index, { nonWitnessUtxo });
+                    return { index, success: true };
+                }
+                catch (error) {
+                    console.error(`[Ledger] Failed to enrich input ${index}:`, error);
+                    return { index, success: false, error };
+                }
+            });
+            // Wait for all inputs to be enriched
+            const results = await Promise.all(txFetchPromises);
+            const failedInputs = results.filter((r) => !r.success);
+            if (failedInputs.length > 0) {
+                throw new Error(`Failed to enrich ${failedInputs.length} of ${results.length} inputs with nonWitnessUtxo. ` +
+                    `Ledger devices require this data for signing.`);
+            }
+        }
+        assertCurrent();
+        const enhancedPsbt = await ledger.convertToLedgerFormat(psbt, accountXpub, accountId, activeNetwork.currency, activeNetwork.slip44);
+        assertCurrent();
+        (0, psbt_account_scope_1.assertPsbtAccountScope)(enhancedPsbt, scope);
+        // Get wallet policy for Ledger
+        const fingerprint = await ledger.ledgerUtxoClient.getMasterFingerprint();
+        const hdPath = (0, derivation_paths_1.getAccountDerivationPath)(activeNetwork.currency, activeNetwork.slip44, accountId);
+        // For policy key preimages, match what the currently-open Ledger app expects.
+        // Prefer the device-reported extended pubkey for this path (silent), and only fall back
+        // to converting the stored xpub/vpub/zpub if needed.
+        let deviceXpub = null;
+        try {
+            deviceXpub = await ledger.ledgerUtxoClient.getExtendedPubkey(hdPath, false);
+        }
+        catch (_e) {
+            // ignore; we'll fall back
+        }
+        if (!deviceXpub) {
+            const devicePubMagicHex = activeNetwork.slip44 === 1 ? '043587cf' : '0488b21e';
+            deviceXpub = (0, derivation_paths_1.convertExtendedKeyVersion)(accountXpub, devicePubMagicHex);
+        }
+        const xpubWithDescriptor = `[${hdPath}]${deviceXpub}`.replace('m', fingerprint);
+        const walletPolicy = new policy_1.WalletPolicy(activeNetwork.currency.toLowerCase(), consts_1.DESCRIPTOR, [xpubWithDescriptor]);
+        // Register lazily and retrieve HMAC for silent operations thereafter
+        let hmac = null;
+        if (typeof ledger.getOrRegisterHmac === 'function') {
+            hmac = await ledger.getOrRegisterHmac(walletPolicy, fingerprint);
+        }
+        // Convert to PsbtV2 for direct signing without intermediate base64 encode/decode
+        const psbtV2 = new psbtv2_1.PsbtV2().fromBitcoinJS(enhancedPsbt);
+        assertCurrent();
+        (0, psbt_account_scope_1.assertPsbtAccountScope)(enhancedPsbt, scope);
+        const signatureEntries = await ledger.ledgerUtxoClient.signPsbt(psbtV2, walletPolicy, hmac);
+        assertCurrent();
+        signatureEntries.forEach(([inputIndex, partialSig]) => {
+            const input = enhancedPsbt.data.inputs[inputIndex];
+            if (!input ||
+                input.finalScriptSig ||
+                input.finalScriptWitness ||
+                !input.bip32Derivation?.some((derivation) => Buffer.from(derivation.pubkey).equals(Buffer.from(partialSig.pubkey)))) {
+                throw new Error('PSBT input is outside the approved account');
+            }
+            enhancedPsbt.updateInput(inputIndex, {
+                partialSig: [partialSig],
+            });
+        });
+        // Preserve external inputs that were finalized before device signing.
+        enhancedPsbt.data.inputs.forEach((input, index) => {
+            if (!input.finalScriptSig && !input.finalScriptWitness)
+                enhancedPsbt.finalizeInput(index);
+        });
+        return enhancedPsbt;
+    };
+}
+/** Keep Trezor conversion and signing outside the software-only import graph. */
+function createTrezorPsbtSigner(trezor) {
+    return async ({ psbt, network: activeNetwork, assertCurrent }) => {
+        if (typeof trezor?.convertToTrezorFormat !== 'function' ||
+            typeof trezor?.signUtxoTransaction !== 'function') {
+            throw (0, syscoin_core_1.createHardwareSignerUnavailableError)('Trezor');
+        }
+        // Handle Trezor signing for UTXO
+        // Get network configuration for Trezor
+        const networkConfig = (0, sysweb3_network_1.getNetworkConfig)(activeNetwork.slip44, activeNetwork.currency);
+        const isTestnet = activeNetwork.slip44 === 1;
+        const bitcoinjsNetwork = isTestnet
+            ? networkConfig?.networks?.testnet
+            : networkConfig?.networks?.mainnet;
+        const trezorTx = trezor.convertToTrezorFormat({
+            psbt,
+            coin: activeNetwork.currency.toLowerCase(),
+            network: bitcoinjsNetwork || undefined, // Pass network config for isScriptHash check
+        });
+        assertCurrent();
+        const signedPsbt = await trezor.signUtxoTransaction(trezorTx, psbt);
+        assertCurrent();
+        return signedPsbt;
+    };
+}
+//# sourceMappingURL=hardware-psbt.js.map

package/cjs/transactions/hardware-psbt.js.map

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