@sidhujag/sysweb3-keyring 1.0.626 → 1.0.628

package/cjs/storage.js

@@ -1,215 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecryptedVault = exports.setEncryptedVault = exports.VaultAuthenticationError = void 0;
+exports.VaultAuthenticationError = exports.getDecryptedVault = exports.setEncryptedVault = void 0;
 const sysweb3_core_1 = require("@sidhujag/sysweb3-core");
-const crypto_js_1 = __importDefault(require("crypto-js"));
+const storage_core_1 = require("./storage-core");
+// Preserve the legacy process-wide storage authority. Host-isolated consumers
+// import storage-core directly and supply their own asynchronous storage port.
 const storage = sysweb3_core_1.sysweb3Di.getStateStorageDb();
-// Simple async mutex implementation to prevent concurrent vault operations
-class AsyncMutex {
-    constructor() {
-        this.mutex = Promise.resolve();
-    }
-    async runExclusive(callback) {
-        const oldMutex = this.mutex;
-        let release;
-        this.mutex = new Promise((resolve) => {
-            release = resolve;
-        });
-        await oldMutex;
-        try {
-            return await callback();
-        }
-        finally {
-            release();
-        }
-    }
-}
-const vaultMutex = new AsyncMutex();
-const isHex = (s) => /^[0-9a-fA-F]+$/.test(s);
-const hexToBytes = (hex) => {
-    const clean = (hex || '').trim();
-    if (!isHex(clean) || clean.length % 2 !== 0) {
-        throw new Error('Invalid hex string');
-    }
-    const out = new Uint8Array(clean.length / 2);
-    for (let i = 0; i < out.length; i++) {
-        out[i] = parseInt(clean.slice(i * 2, i * 2 + 2), 16);
-    }
-    return out;
-};
-const bytesToHex = (bytes) => {
-    const u8 = new Uint8Array(bytes);
-    let hex = '';
-    for (let i = 0; i < u8.length; i++) {
-        hex += u8[i].toString(16).padStart(2, '0');
-    }
-    return hex;
-};
-const maybeParseGcmEnvelope = (raw) => {
-    if (!raw || typeof raw !== 'string')
-        return null;
-    if (!raw.trim().startsWith('{'))
-        return null;
-    try {
-        const parsed = JSON.parse(raw);
-        if (parsed &&
-            parsed.v === 4 &&
-            parsed.alg === 'A256GCM' &&
-            typeof parsed.iv === 'string' &&
-            typeof parsed.ct === 'string') {
-            return parsed;
-        }
-        return null;
-    }
-    catch {
-        return null;
-    }
-};
-const encryptVaultWebCrypto = async (plaintextJson, keyHex) => {
-    const subtle = globalThis.crypto.subtle;
-    const iv = new Uint8Array(12);
-    globalThis.crypto.getRandomValues(iv);
-    const keyBytes = hexToBytes(keyHex);
-    if (keyBytes.length !== 32) {
-        throw new Error('Vault key must be 32 bytes (hex length 64)');
-    }
-    const key = await subtle.importKey('raw', keyBytes, { name: 'AES-GCM' }, false, ['encrypt']);
-    const pt = new TextEncoder().encode(plaintextJson);
-    const ct = await subtle.encrypt({ name: 'AES-GCM', iv: iv }, key, pt);
-    return {
-        v: 4,
-        alg: 'A256GCM',
-        iv: bytesToHex(iv.buffer),
-        ct: bytesToHex(ct),
-    };
-};
-class VaultAuthenticationError extends Error {
-    constructor() {
-        super('Failed to decrypt vault - invalid password or corrupted data');
-        this.code = 'INVALID_PASSWORD';
-        this.name = 'VaultAuthenticationError';
-    }
-}
-exports.VaultAuthenticationError = VaultAuthenticationError;
-const invalidPasswordError = () => new VaultAuthenticationError();
-const decryptVaultWebCrypto = async (envelope, keyHex) => {
-    const subtle = globalThis?.crypto?.subtle;
-    if (!subtle) {
-        throw new Error('WebCrypto is required to decrypt this vault');
-    }
-    const keyBytes = hexToBytes(keyHex);
-    if (keyBytes.length !== 32) {
-        throw new Error('Vault key must be 32 bytes (hex length 64)');
-    }
-    const key = await subtle.importKey('raw', keyBytes, { name: 'AES-GCM' }, false, ['decrypt']);
-    const ivBytes = hexToBytes(envelope.iv);
-    const ctBytes = hexToBytes(envelope.ct);
-    if (ivBytes.length !== 12 || ctBytes.length < 16) {
-        throw new Error('Invalid encrypted vault format');
-    }
-    let pt;
-    try {
-        pt = await subtle.decrypt({ name: 'AES-GCM', iv: ivBytes }, key, ctBytes);
-    }
-    catch (error) {
-        // Only a failed authentication tag is a password/ciphertext failure.
-        // Key import and other platform exceptions must remain operational.
-        if (error?.name === 'OperationError') {
-            throw invalidPasswordError();
-        }
-        throw error;
-    }
-    return new TextDecoder().decode(pt);
-};
-// Single vault for all networks - stores the mnemonic and can derive accounts for any slip44
-const setEncryptedVault = async (decryptedVault, pwd, freshVaultKeys) => {
-    return vaultMutex.runExclusive(async () => {
-        const plaintext = JSON.stringify(decryptedVault);
-        // Writes never downgrade to unauthenticated passphrase AES. Legacy CBC
-        // remains readable below, but missing WebCrypto is an operational failure.
-        const canUseWebCrypto = !!globalThis?.crypto?.subtle &&
-            !!globalThis?.crypto?.getRandomValues;
-        if (!canUseWebCrypto) {
-            throw new Error('WebCrypto is required for vault encryption');
-        }
-        if (typeof pwd !== 'string' || !isHex(pwd) || pwd.length !== 64) {
-            throw new Error('Vault key must be 32 bytes (hex length 64)');
-        }
-        const envelope = await encryptVaultWebCrypto(plaintext, pwd);
-        const toStore = JSON.stringify(envelope);
-        if (freshVaultKeys) {
-            // The backend primitive (or native storage Web Lock) covers both the
-            // absence check and batch commit across independently bundled contexts.
-            const created = await storage.createManyIfAbsent({
-                'vault-keys': freshVaultKeys,
-                vault: toStore,
-            });
-            if (!created)
-                throw new Error('Cannot initialize a new vault over existing wallet storage');
-        }
-        else {
-            // Existing vault updates retain their migration-specific write ordering.
-            await storage.set('vault', toStore);
-        }
-    });
-};
-exports.setEncryptedVault = setEncryptedVault;
-const getDecryptedVault = async (pwd, legacyPassword) => {
-    return vaultMutex.runExclusive(async () => {
-        // Always use single 'vault' key
-        const vault = await storage.get('vault');
-        if (!vault) {
-            throw new Error('Vault not found');
-        }
-        // Prefer WebCrypto AES-GCM when the stored vault is in v4 envelope format.
-        const maybeEnvelope = maybeParseGcmEnvelope(vault);
-        if (!maybeEnvelope &&
-            typeof vault === 'string' &&
-            vault.trim().startsWith('{')) {
-            // Legacy CBC vaults are base64. A JSON-shaped record must be a valid
-            // GCM envelope rather than being misreported as a password failure.
-            throw new Error('Invalid encrypted vault format');
-        }
-        let decryptedVault;
-        if (maybeEnvelope) {
-            decryptedVault = await decryptVaultWebCrypto(maybeEnvelope, pwd);
-        }
-        else {
-            // Legacy CryptoJS passphrase-AES vault (v3 and older v4 canary).
-            // An interrupted migration can already have written CBC with the
-            // derived key while the metadata still selects the legacy password.
-            for (const candidateKey of new Set([legacyPassword ?? pwd, pwd])) {
-                let plaintext;
-                try {
-                    plaintext = crypto_js_1.default.AES.decrypt(vault, candidateKey).toString(crypto_js_1.default.enc.Utf8);
-                }
-                catch (error) {
-                    if (error?.message === 'Malformed UTF-8 data')
-                        continue;
-                    throw error;
-                }
-                if (!plaintext)
-                    continue;
-                try {
-                    return JSON.parse(plaintext);
-                }
-                catch (error) {
-                    // CBC has no authentication tag; invalid plaintext is the only
-                    // available indication of a bad password/ciphertext.
-                    if (!(error instanceof SyntaxError))
-                        throw error;
-                }
-            }
-            throw invalidPasswordError();
-        }
-        if (!decryptedVault) {
-            throw invalidPasswordError();
-        }
-        return JSON.parse(decryptedVault);
-    });
-};
-exports.getDecryptedVault = getDecryptedVault;
+const persistence = (0, storage_core_1.createVaultPersistence)({
+    get: async (key) => storage.get(key),
+    set: async (key, value) => {
+        await storage.set(key, value);
+    },
+    createManyIfAbsent: async (items) => storage.createManyIfAbsent(items),
+});
+exports.setEncryptedVault = persistence.setEncryptedVault;
+exports.getDecryptedVault = persistence.getDecryptedVault;
+var storage_core_2 = require("./storage-core");
+Object.defineProperty(exports, "VaultAuthenticationError", { enumerable: true, get: function () { return storage_core_2.VaultAuthenticationError; } });
 //# sourceMappingURL=storage.js.map

package/cjs/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../src/storage.ts"],"names":[],"mappings":";;;AAAA,yDAAmD;AAEnD,iDAAwD;AAExD,8EAA8E;AAC9E,+EAA+E;AAC/E,MAAM,OAAO,GAAG,wBAAS,CAAC,iBAAiB,EAAE,CAAC;AAC9C,MAAM,WAAW,GAAG,IAAA,qCAAsB,EAAC;IACzC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IACpC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;QACxB,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IACD,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC;CACvE,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;AAClD,QAAA,iBAAiB,GAAG,WAAW,CAAC,iBAAiB,CAAC;AAC/D,+CAA0D;AAAjD,wHAAA,wBAAwB,OAAA"}

package/cjs/transactions/ethereum.js

@@ -14,6 +14,9 @@ const providers_1 = require("../providers");
 const types_1 = require("../types");
 const evm_local_signer_1 = require("./evm-local-signer");
 const derivation_paths_1 = require("../utils/derivation-paths");
+const hardwareSignerUnavailable = (hardware) => Object.assign(new Error(`${hardware} signer is unavailable in this host`), {
+    code: 'HARDWARE_SIGNER_UNAVAILABLE',
+});
 const stripHexPrefix = (value) => value.startsWith('0x') || value.startsWith('0X') ? value.slice(2) : value;
 const normalizeEthersOverrideValue = (value) => (0, ethers_v6_1.normalizeTxValue)(value);
 const nonNegativeFeeQuantity = (value, label) => {
@@ -131,7 +134,28 @@ class EthereumTransactions {
     constructor(getNetwork, getDecryptedPrivateKey, getState, ledgerSigner, trezorSigner, captureSigningContext) {
         // Allow manual override of gas parameters when automatic estimation fails
         this.gasOverrides = {};
+        this.requireLedgerSigner = () => {
+            if (!this.ledgerSigner)
+                throw hardwareSignerUnavailable('Ledger');
+            return this.ledgerSigner;
+        };
+        this.requireTrezorSigner = () => {
+            if (!this.trezorSigner)
+                throw hardwareSignerUnavailable('Trezor');
+            return this.trezorSigner;
+        };
+        this.assertHardwareSignerAvailable = (targetAccount) => {
+            const state = this.getState();
+            const type = targetAccount?.type ?? state.activeAccountType;
+            const id = targetAccount?.id ?? state.activeAccountId;
+            const account = state.accounts[type]?.[id];
+            if (type === types_1.KeyringAccountType.Ledger || account?.isLedgerWallet)
+                this.requireLedgerSigner();
+            if (type === types_1.KeyringAccountType.Trezor || account?.isTrezorWallet)
+                this.requireTrezorSigner();
+        };
         this.captureEvmSigningContext = () => {
+            this.assertHardwareSignerAvailable();
             const { activeAccountType, activeAccountId, accounts, activeNetwork } = this.getState();
             const selectedAccount = accounts[activeAccountType]?.[activeAccountId];
             if (!selectedAccount)
@@ -192,7 +216,7 @@ class EthereumTransactions {
                     throw {
                         message: 'Decrypting for wrong address, change activeAccount maybe',
                     };
-                return await this.ledgerSigner.evm.signTypedData({
+                return await this.requireLedgerSigner().evm.signTypedData({
                     version,
                     accountIndex: activeAccountId,
                     data: typedData,
@@ -203,7 +227,7 @@ class EthereumTransactions {
                     throw {
                         message: 'Decrypting for wrong address, change activeAccount maybe',
                     };
-                return await this.trezorSigner.signTypedData({
+                return await this.requireTrezorSigner().signTypedData({
                     version,
                     address: addr,
                     data: typedData,
@@ -225,9 +249,9 @@ class EthereumTransactions {
             const { activeAccountType } = this.getState();
             switch (activeAccountType) {
                 case types_1.KeyringAccountType.Ledger:
-                    return await this.ledgerSigner.verifyUtxoAddress(accountIndex, currency, slip44);
+                    return await this.requireLedgerSigner().verifyUtxoAddress(accountIndex, currency, slip44);
                 case types_1.KeyringAccountType.Trezor:
-                    return await this.trezorSigner.verifyUtxoAddress(accountIndex, currency, slip44);
+                    return await this.requireTrezorSigner().verifyUtxoAddress(accountIndex, currency, slip44);
                 default:
                     throw new Error('verifyUtxoAddress is only available for hardware wallet accounts');
             }
@@ -284,7 +308,7 @@ class EthereumTransactions {
             };
             const signWithLedger = async () => {
                 try {
-                    const response = await this.ledgerSigner.evm.signPersonalMessage({
+                    const response = await this.requireLedgerSigner().evm.signPersonalMessage({
                         accountIndex: activeAccountId,
                         message: msg,
                     });
@@ -298,7 +322,7 @@ class EthereumTransactions {
                 try {
                     // For EVM networks, Trezor expects 'eth' regardless of the network's currency
                     const trezorCoin = activeNetwork.slip44 === 60 ? 'eth' : activeNetwork.currency;
-                    const response = await this.trezorSigner.signMessage({
+                    const response = await this.requireTrezorSigner().signMessage({
                         coin: trezorCoin,
                         address: activeAccount.address,
                         index: activeAccountId,
@@ -377,7 +401,7 @@ class EthereumTransactions {
                         // Message is plain text, convert to hex
                         messageForLedger = Buffer.from(msg, 'utf8').toString('hex');
                     }
-                    const response = await this.ledgerSigner.evm.signPersonalMessage({
+                    const response = await this.requireLedgerSigner().evm.signPersonalMessage({
                         accountIndex: activeAccountId,
                         message: messageForLedger,
                     });
@@ -401,7 +425,7 @@ class EthereumTransactions {
                     }
                     // For EVM networks, Trezor expects 'eth' regardless of the network's currency
                     const trezorCoin = activeNetwork.slip44 === 60 ? 'eth' : activeNetwork.currency;
-                    const response = await this.trezorSigner.signMessage({
+                    const response = await this.requireTrezorSigner().signMessage({
                         coin: trezorCoin,
                         address: activeAccount.address,
                         index: activeAccountId,
@@ -674,9 +698,52 @@ class EthereumTransactions {
                 (!Number.isSafeInteger(fallbackNonce) || fallbackNonce < 0)) {
                 throw new Error('Invalid cancellation fallback nonce');
             }
+            const previewOnly = options.previewOnly === true;
+            const approvedMaximumFee = options.approvedMaximumFee;
+            if (!previewOnly &&
+                (typeof approvedMaximumFee !== 'string' ||
+                    !/^(0|[1-9][0-9]{0,77})$/.test(approvedMaximumFee))) {
+                throw new Error('Cancellation fee approval required');
+            }
             const assertHostContext = options.assertCurrentContext;
             assertHostContext();
-            const { activeAccount, activeAccountType, activeAccountId, activeNetwork, provider, assertCurrent: assertKeyringContext, } = this.captureEvmSigningContext();
+            const state = this.getState();
+            const selectedType = state.activeAccountType;
+            const selectedId = state.activeAccountId;
+            const selectedAddress = state.accounts?.[selectedType]?.[selectedId]?.address;
+            const activeAccountType = options.targetAccount?.type ?? selectedType;
+            const activeAccountId = options.targetAccount?.id ?? selectedId;
+            const targetAccount = options.targetAccount
+                ? { type: activeAccountType, id: activeAccountId }
+                : undefined;
+            const activeAccount = {
+                ...state.accounts?.[activeAccountType]?.[activeAccountId],
+            };
+            const activeNetwork = { ...state.activeNetwork };
+            if (!selectedAddress ||
+                !activeAccount.address ||
+                (targetAccount && activeAccountType === types_1.KeyringAccountType.SmartAccount)) {
+                throw new Error('Cancellation signing account is unavailable');
+            }
+            if (!previewOnly)
+                this.assertHardwareSignerAvailable(targetAccount);
+            const provider = this.web3Provider;
+            const assertSession = this.captureSigningContext?.();
+            const assertKeyringContext = () => {
+                assertSession?.();
+                const current = this.getState();
+                if (current.activeAccountType !== selectedType ||
+                    current.activeAccountId !== selectedId ||
+                    current.accounts?.[selectedType]?.[selectedId]?.address?.toLowerCase() !== selectedAddress.toLowerCase() ||
+                    current.accounts?.[activeAccountType]?.[activeAccountId]?.address?.toLowerCase() !== activeAccount.address.toLowerCase() ||
+                    [current.activeNetwork, this.getNetwork()].some((selected) => selected.kind !== activeNetwork.kind ||
+                        selected.chainId !== activeNetwork.chainId ||
+                        selected.slip44 !== activeNetwork.slip44 ||
+                        selected.url !== activeNetwork.url) ||
+                    this.web3Provider !== provider) {
+                    throw new Error('Wallet signing context changed');
+                }
+            };
             const assertCurrent = () => {
                 assertHostContext();
                 assertKeyringContext();
@@ -798,6 +865,22 @@ class EthereumTransactions {
                         maxPriorityFeePerGas: bumpCancelFee(oldTxsGasValues.maxPriorityFeePerGas),
                     }),
             };
+            const maximumFee = newGasValues.gasLimit.mul(isLegacy ? newGasValues.gasPrice : newGasValues.maxFeePerGas);
+            assertCurrent();
+            if (previewOnly)
+                return {
+                    isCanceled: false,
+                    error: false,
+                    maximumFee: maximumFee.toString(),
+                };
+            if (maximumFee.gt(approvedMaximumFee))
+                throw new Error('Cancellation fee exceeds approval');
+            const assertApprovedEnvelope = (transaction) => {
+                const gas = nonNegativeFeeQuantity(transaction.gasLimit, 'cancellation gas limit');
+                const cap = nonNegativeFeeQuantity(isLegacy ? transaction.gasPrice : transaction.maxFeePerGas, 'cancellation maximum fee');
+                if (!gas.eq(42000) || gas.mul(cap).gt(approvedMaximumFee))
+                    throw new Error('Cancellation fee exceeds approval');
+            };
             // Base cancel transaction parameters (same for all wallet types)
             const baseCancelTx = {
                 nonce: tx.nonce,
@@ -841,8 +924,9 @@ class EthereumTransactions {
                             chainId: activeNetwork.chainId,
                             type: 2, // Need explicit type for hardware wallet serialization
                         };
+                    assertApprovedEnvelope(txFormattedForEthers);
                     const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
-                    const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                    const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
                     });
@@ -908,7 +992,8 @@ class EthereumTransactions {
                                 ? formattedTx.maxPriorityFeePerGas
                                 : this.toHex0x(formattedTx.maxPriorityFeePerGas, 'maxPriorityFeePerGas');
                     }
-                    const signature = await this.trezorSigner.signEthTransaction({
+                    assertApprovedEnvelope(txFormattedForTrezor);
+                    const signature = await this.requireTrezorSigner().signEthTransaction({
                         coin: trezorCoin,
                         tx: txFormattedForTrezor,
                         index: activeAccountId.toString(),
@@ -942,11 +1027,11 @@ class EthereumTransactions {
             const cancelWithPrivateKey = async () => {
                 try {
                     assertCurrent();
-                    const { address, decryptedPrivateKey } = this.getDecryptedPrivateKey();
+                    const { address, decryptedPrivateKey } = this.getDecryptedPrivateKey(targetAccount);
                     if (address?.toLowerCase() !== activeAccount.address.toLowerCase()) {
                         throw new Error('Wallet signing context changed');
                     }
-                    const transactionResponse = await (0, evm_local_signer_1.sendLocalEvmTransaction)(provider, decryptedPrivateKey, changedTxToCancel, assertCurrent, assertCurrent);
+                    const transactionResponse = await (0, evm_local_signer_1.sendLocalEvmTransaction)(provider, decryptedPrivateKey, changedTxToCancel, assertCurrent, assertCurrent, assertApprovedEnvelope);
                     if (transactionResponse) {
                         return {
                             isCanceled: true,
@@ -1107,7 +1192,7 @@ class EthereumTransactions {
                         type: 2, // Need explicit type for hardware wallet serialization
                     };
                 const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
-                const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                     rawTx: rawTx.replace('0x', ''),
                     accountIndex: activeAccountId,
                 });
@@ -1180,7 +1265,7 @@ class EthereumTransactions {
                         };
                         break;
                 }
-                const signature = await this.trezorSigner.signEthTransaction({
+                const signature = await this.requireTrezorSigner().signEthTransaction({
                     index: `${activeAccountId}`,
                     tx: txFormattedForTrezor,
                     coin: activeNetwork.currency,
@@ -1252,6 +1337,8 @@ class EthereumTransactions {
         this.sendTransactionWithEditedFee = async (txHash, isLegacy = false, options = {}) => {
             const { assertCurrentContext, validateOriginal, beforeBroadcast, approvedMaximumFee, } = options;
             const previewOnly = options.previewOnly === true;
+            if (!previewOnly)
+                this.assertHardwareSignerAvailable(options.targetAccount);
             if (!previewOnly &&
                 (typeof approvedMaximumFee !== 'string' ||
                     !/^\d{1,78}$/.test(approvedMaximumFee))) {
@@ -1366,7 +1453,6 @@ class EthereumTransactions {
                 newGasValues.maxPriorityFeePerGas.gt(newGasValues.maxFeePerGas))
                 throw new Error('Invalid replacement fee');
             const maximumFee = newGasValues.gasLimit.mul(isLegacy ? newGasValues.gasPrice : newGasValues.maxFeePerGas);
-            let adjustedValue = txValue;
             if (isLikelyMaxSend && txValue.add(maximumFee).gt(currentBalance)) {
                 if (isContractCall) {
                     console.error('[SpeedUp] Cannot adjust value for contract call - rejecting speedup');
@@ -1377,16 +1463,19 @@ class EthereumTransactions {
                         message: 'Cannot speed up a likely max-send contract call; value cannot be adjusted to fit new gas',
                     };
                 }
-                adjustedValue = currentBalance.gt(maximumFee)
-                    ? currentBalance.sub(maximumFee)
-                    : ethers_v6_1.Zero;
+                return {
+                    isSpeedUp: false,
+                    error: true,
+                    code: 'REPLACEMENT_VALUE_WOULD_CHANGE',
+                    message: 'Add funds before speeding up this transaction; the original amount will not be changed',
+                };
             }
             const txWithEditedFee = {
                 chainId: activeNetwork.chainId,
                 from: tx.from,
                 to: tx.to,
                 nonce: tx.nonce,
-                value: adjustedValue,
+                value: txValue,
                 data: txData,
                 gasLimit: newGasValues.gasLimit,
                 ...(tx.accessList != null ? { accessList: tx.accessList } : {}),
@@ -1424,7 +1513,7 @@ class EthereumTransactions {
                         };
                     const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
                     assertCurrent();
-                    const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                    const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
                     });
@@ -1505,7 +1594,7 @@ class EthereumTransactions {
                                 : this.toHex0x(formattedTx.maxPriorityFeePerGas, 'maxPriorityFeePerGas');
                     }
                     assertCurrent();
-                    const signature = await this.trezorSigner.signEthTransaction({
+                    const signature = await this.requireTrezorSigner().signEthTransaction({
                         coin: trezorCoin,
                         tx: txFormattedForTrezor,
                         index: activeAccountId.toString(),
@@ -1688,7 +1777,7 @@ class EthereumTransactions {
                         };
                     }
                     const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
-                    const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                    const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
                     });
@@ -1756,7 +1845,7 @@ class EthereumTransactions {
                             data: txData,
                         };
                     }
-                    const signature = await this.trezorSigner.signEthTransaction({
+                    const signature = await this.requireTrezorSigner().signEthTransaction({
                         index: `${activeAccountId}`,
                         tx: txToBeSignedByTrezor,
                         coin: activeNetwork.currency,
@@ -1909,7 +1998,7 @@ class EthereumTransactions {
                         };
                     }
                     const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
-                    const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                    const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
                     });
@@ -1978,7 +2067,7 @@ class EthereumTransactions {
                     }
                     // For EVM networks, Trezor expects 'eth' regardless of the network's currency
                     const trezorCoin = activeNetwork.slip44 === 60 ? 'eth' : activeNetwork.currency;
-                    const signature = await this.trezorSigner.signEthTransaction({
+                    const signature = await this.requireTrezorSigner().signEthTransaction({
                         index: `${activeAccountId}`,
                         tx: txToBeSignedByTrezor,
                         coin: trezorCoin,
@@ -2127,7 +2216,7 @@ class EthereumTransactions {
                         };
                     }
                     const rawTx = (0, ethers_v6_1.serializeTransaction)(txFormattedForEthers);
-                    const signature = await this.ledgerSigner.evm.signEVMTransaction({
+                    const signature = await this.requireLedgerSigner().evm.signEVMTransaction({
                         rawTx: rawTx.replace('0x', ''),
                         accountIndex: activeAccountId,
                     });
@@ -2190,7 +2279,7 @@ class EthereumTransactions {
                             data: txData,
                         };
                     }
-                    const signature = await this.trezorSigner.signEthTransaction({
+                    const signature = await this.requireTrezorSigner().signEthTransaction({
                         index: `${activeAccountId}`,
                         tx: txToBeSignedByTrezor,
                         coin: activeNetwork.currency,
@@ -2403,7 +2492,10 @@ class EthereumTransactions {
             };
         };
         this.getNetwork = getNetwork;
-        this.getDecryptedPrivateKey = getDecryptedPrivateKey;
+        this.getDecryptedPrivateKey = (targetAccount) => {
+            this.assertHardwareSignerAvailable(targetAccount);
+            return getDecryptedPrivateKey(targetAccount);
+        };
         this.abortController = new AbortController();
         // NOTE: Defer network access until vault state getter is initialized
         // The web3Provider will be created lazily when first accessed via getters