@sidhujag/sysweb3-keyring 2.0.0 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## Unreleased — API removal pending release-version decision
+
+- Remove the duplicate public BIP84 and bounded native-transfer APIs introduced in 2.1.0. Existing descriptor, SJS/HD and generic PSBT paths remain. This removes published exports and is **not** a compatible 2.1.1 patch. Historical 2.1.0 notes below describe the already-published package.
+
+## 2.1.1
+
+- Share the existing successful gas-estimate 20% buffer/minimum calculation through `bufferedEvmGasLimit`; SDK and mobile can use the same integer rounding without copying the formula.
+
+- Expose dependency-free `cjs/evm-fees` for the existing standard EVM fee recommendation and make `EthereumTransactions` use the same implementation.
+- Keep observed legacy/EIP-1559 behavior, zero tips, configured floors/multipliers, and unsupported-method-only history fallback. Add uint256/history bounds, snapshot options, synchronous host guards and cancellation checks for restricted hosts.
+
+## 2.1.0
+
+- Add the standalone `cjs/public-bip84` entry for strict Bitcoin/Syscoin mainnet account parsing and native SegWit address derivation. It returns public data only; an account public key does not prove ancestry or ownership.
+- Add `SoftwareKeyring.deriveBip84HdPublicAccount` for guarded public derivation from an unlocked software HD wallet, without selecting accounts, writing storage or discovering addresses.
+- Add the standalone `cjs/bip84-native` planner for bounded native-coin P2WPKH transactions with explicit parent data, change, RBF and exact fee limits. Asset, special and coinbase parents are excluded.
+- Add `SoftwareKeyring.signPreparedBip84Transaction` for the selected Bitcoin/Syscoin mainnet HD account. It binds the account, network and synchronous host guard, verifies the rebuilt transaction and signatures, and returns immutable signed bytes, identifiers and exact fee/size data.
+- These offline APIs do not unlock, access a provider, persist records or broadcast. Hosts still own input eligibility, fresh approval, change reservations and durable journaling before broadcast. Existing vault, EVM, generic PSBT and hardware APIs remain unchanged; native and live qualification remain separate.
+
 ## 2.0.0
 
 - Add `SoftwareKeyring.deriveEvmHdRuntimeAccount` for host-allocated Ethereum BIP44 indices. It returns the existing password-encrypted runtime account record without installing an account, writing storage or querying a network. The method binds session, selection and network identity and requires a synchronous host guard. Hosts must strip encrypted `xprv` before producing public metadata.

package/README.md

@@ -359,3 +359,49 @@ Signatures are checked against the expected account; UTXO signatures must also
 match the approved PSBT and its requested sighash coverage. The custom UTXO host
 supports the existing Syscoin and Bitcoin app protocols. Physical-device and
 firmware qualification remain separate from source and mocked-device tests.
+
+
+## Shared standard EVM fees
+
+`cjs/evm-fees` is a dependency-free read-only entry. Both the existing
+`EthereumTransactions.getFeeDataWithDynamicMaxPriorityFeePerGas` method and
+restricted hosts use the same calculation:
+
+```ts
+import { getEvmFeeData } from '@sidhujag/sysweb3-keyring/cjs/evm-fees';
+
+const fees = await getEvmFeeData(readOnlyProvider, {
+  signal,
+  assertCurrent: () => assertSameAccountAndNetwork(),
+});
+```
+
+The reader supplies only `getGasPrice()`, `getBlock('latest')`, and
+`send('eth_maxPriorityFeePerGas' | 'eth_feeHistory', params)`. It must validate
+its RPC responses and bind its endpoint/chain; this helper does not instantiate
+a provider, estimate gas, select an account, sign or broadcast. The host must
+retain request deadlines and perform its ordinary account/network/session
+checks before signing.
+
+Results are frozen bigint fields: `gasPrice`, `maxFeePerGas`, and
+`maxPriorityFeePerGas`, with `baseFeePerGas` only when the observed header has
+that field. An absent base fee produces the existing legacy zero sentinels for
+the two EIP-1559 fields. A zero base fee or zero tip remains valid EIP-1559 data.
+An explicitly unsupported priority method may use actual recent fee-history
+rewards; other failures never turn into fallback fees. Quantities and calculated
+fees are bounded to uint256, history to the requested five blocks, and no
+signing authority or dependencies are loaded by this entry.
+
+The optional `minPriorityFee` and whole-percent `feeMultiplier` preserve the
+existing configured recommendation policy (default multiplier 250). Options
+are snapshotted before asynchronous reads. The synchronous `assertCurrent`
+callback must return `undefined`; an async callback is rejected. Cancellation
+rejects pending discovery without permitting later results to produce a quote.
+
+`bufferedEvmGasLimit(estimate: bigint, minimum?: bigint)` shares the existing
+successful gas estimate policy used by `EthereumTransactions.getTxGasLimit`:
+floor the estimate times120/100 and apply the configured minimum if larger.
+It includes ordinary native transfers. The helper performs no estimation,
+fallback request, transaction cap selection or broadcasting; callers enforce
+the selected network's limits after applying it. The SDK's existing estimation
+failure/fallback behavior is unchanged.

package/cjs/evm-fees.js

@@ -0,0 +1,223 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvmGasLimitError = void 0;
+exports.assertEvmGasLimit = assertEvmGasLimit;
+exports.parseEvmFeeQuantity = parseEvmFeeQuantity;
+exports.bufferedEvmGasLimit = bufferedEvmGasLimit;
+exports.getEvmFeeData = getEvmFeeData;
+/** Standard EVM fee discovery shared by extension and restricted native hosts. */
+const evm_js_1 = require("@sidhujag/sysweb3-network/cjs/evm.js");
+const MAX_FEE = (1n << 256n) - 1n;
+/** A validated limit failed its wire bounds or an activated protocol bound. */
+class EvmGasLimitError extends Error {
+    constructor(code) {
+        super(code === 'SYSWEB3_EVM_GAS_LIMIT_INVALID'
+            ? 'Invalid EVM gas limit'
+            : 'EVM gas limit exceeds the network limit');
+        this.code = code;
+        this.name = 'EvmGasLimitError';
+    }
+}
+exports.EvmGasLimitError = EvmGasLimitError;
+/** The host supplies a verified chain and, if sampled, its block gas limit. */
+function assertEvmGasLimit(gasLimit, chainId, sampledBlockGasLimit) {
+    if (typeof gasLimit !== 'bigint' ||
+        gasLimit <= 0n ||
+        gasLimit > MAX_FEE ||
+        typeof chainId !== 'bigint' ||
+        chainId < 0n ||
+        chainId > MAX_FEE ||
+        (sampledBlockGasLimit !== undefined &&
+            (typeof sampledBlockGasLimit !== 'bigint' ||
+                sampledBlockGasLimit <= 0n ||
+                sampledBlockGasLimit > MAX_FEE)))
+        throw new EvmGasLimitError('SYSWEB3_EVM_GAS_LIMIT_INVALID');
+    const { maxTransactionGas } = (0, evm_js_1.getEvmProtocolLimits)(chainId);
+    if ((maxTransactionGas !== undefined && gasLimit > BigInt(maxTransactionGas)) ||
+        (sampledBlockGasLimit !== undefined && gasLimit > sampledBlockGasLimit))
+        throw new EvmGasLimitError('SYSWEB3_EVM_GAS_LIMIT_EXCEEDED');
+    return gasLimit;
+}
+/** Accept the SDK's existing BigNumberish forms without permissive zero coercion. */
+function parseEvmFeeQuantity(value, label = 'fee quantity') {
+    if (value !== null && typeof value === 'object') {
+        const object = value;
+        value =
+            object._hex ??
+                object.hex ??
+                (typeof object.toString === 'function' ? object.toString() : undefined);
+        if (typeof value !== 'string')
+            throw new Error(`Invalid ${label}`);
+    }
+    if (!((typeof value === 'string' &&
+        value.length <= 80 &&
+        /^(?:0x[\da-f]+|\d+)$/i.test(value)) ||
+        (typeof value === 'number' &&
+            Number.isSafeInteger(value) &&
+            value >= 0) ||
+        (typeof value === 'bigint' && value >= 0n)))
+        throw new Error(`Invalid ${label}`);
+    const quantity = BigInt(value);
+    if (quantity > MAX_FEE)
+        throw new Error(`Invalid ${label}`);
+    return quantity;
+}
+/**
+ * The existing successful-estimate policy: floor(estimate * 120 / 100), then
+ * the configured minimum if larger. Callers retain chain/resource bounds.
+ */
+function bufferedEvmGasLimit(estimate, minimum) {
+    if (typeof estimate !== 'bigint' ||
+        estimate < 0n ||
+        (minimum !== undefined && typeof minimum !== 'bigint'))
+        throw new Error('Invalid gas estimate');
+    const buffered = (estimate * 120n) / 100n;
+    return minimum !== undefined && minimum > buffered ? minimum : buffered;
+}
+function unsupportedPriorityMethod(error) {
+    const unsupportedCode = (code) => code === -32601 || code === 4200;
+    if (unsupportedCode(error?.code))
+        return true;
+    if (!['UNKNOWN_ERROR', 'UNSUPPORTED_OPERATION'].includes(error?.code))
+        return false;
+    if (error?.operation != null &&
+        error.operation !== 'eth_maxPriorityFeePerGas')
+        return false;
+    return [
+        { cause: error.error, payload: error.payload },
+        { cause: error.info?.error, payload: error.info?.payload },
+    ].some(({ cause, payload }) => cause?.name !== 'AbortError' &&
+        unsupportedCode(cause?.code) &&
+        payload?.method === 'eth_maxPriorityFeePerGas' &&
+        Array.isArray(payload.params) &&
+        payload.params.length === 0);
+}
+/**
+ * No signer, transport, network registry or provider implementation is imported.
+ * Reads are serialized and guarded; RPC failures never become fabricated fees.
+ */
+async function getEvmFeeData(reader, options = {}) {
+    const signals = [options.signal, reader.signal].filter((signal) => signal !== undefined);
+    const assertCurrent = options.assertCurrent;
+    const check = () => {
+        if (signals.some((signal) => signal.aborted)) {
+            const error = new Error('EVM fee discovery aborted');
+            error.name = 'AbortError';
+            throw error;
+        }
+        if (assertCurrent) {
+            const result = assertCurrent();
+            if (result !== undefined) {
+                // A void callback type also accepts async functions. Never await one.
+                void Promise.resolve(result).catch(() => undefined);
+                throw new Error('EVM fee guard must be synchronous');
+            }
+        }
+        if (signals.some((signal) => signal.aborted)) {
+            const error = new Error('EVM fee discovery aborted');
+            error.name = 'AbortError';
+            throw error;
+        }
+    };
+    check();
+    const minPriorityFee = options.minPriorityFee == null
+        ? undefined
+        : parseEvmFeeQuantity(options.minPriorityFee, 'minimum priority fee');
+    // Retain the existing zero/absent override behavior.
+    const multiplier = options.feeMultiplier || 250;
+    if (!Number.isSafeInteger(multiplier) || multiplier < 1)
+        throw new Error('Invalid fee multiplier');
+    const getGasPrice = reader.getGasPrice.bind(reader);
+    const getBlock = reader.getBlock.bind(reader);
+    const send = reader.send.bind(reader);
+    const read = async (operation) => {
+        check();
+        let cleanup = () => undefined;
+        try {
+            const interrupted = new Promise((_, reject) => {
+                const abort = () => {
+                    const error = new Error('EVM fee discovery aborted');
+                    error.name = 'AbortError';
+                    reject(error);
+                };
+                signals.forEach((signal) => signal.addEventListener('abort', abort, { once: true }));
+                cleanup = () => {
+                    signals.forEach((signal) => signal.removeEventListener('abort', abort));
+                    return undefined;
+                };
+            });
+            // No asynchronous gap between the current-owner check and dispatch.
+            const result = await Promise.race([operation(), interrupted]);
+            check();
+            return result;
+        }
+        catch (error) {
+            check();
+            throw error;
+        }
+        finally {
+            cleanup();
+        }
+    };
+    const gasPrice = parseEvmFeeQuantity(await read(getGasPrice), 'gas price');
+    const block = await read(() => getBlock('latest'));
+    if (!block)
+        throw new Error('Block not found');
+    if (typeof block !== 'object' || Array.isArray(block))
+        throw new Error('Invalid block');
+    const rawBaseFee = block.baseFeePerGas;
+    if (rawBaseFee == null) {
+        check();
+        return Object.freeze({
+            gasPrice,
+            maxFeePerGas: 0n,
+            maxPriorityFeePerGas: 0n,
+        });
+    }
+    const baseFeePerGas = parseEvmFeeQuantity(rawBaseFee, 'base fee');
+    let maxPriorityFeePerGas;
+    try {
+        maxPriorityFeePerGas = parseEvmFeeQuantity(await read(() => send('eth_maxPriorityFeePerGas', [])), 'priority fee');
+    }
+    catch (error) {
+        check();
+        if (error?.code === 'SYSWEB3_RPC_RESPONSE_INVALID' ||
+            error?.name === 'AbortError' ||
+            !unsupportedPriorityMethod(error))
+            throw error;
+        const history = await read(() => send('eth_feeHistory', ['0x5', 'latest', [25, 50, 75]]));
+        const rewards = history?.reward;
+        if (!Array.isArray(rewards) || rewards.length < 1 || rewards.length > 5)
+            throw new Error('Priority fee history unavailable');
+        const recentFees = rewards
+            .map((reward) => {
+            if (!Array.isArray(reward) || reward.length !== 3)
+                throw new Error('Invalid priority fee history');
+            const parsed = reward.map((value) => parseEvmFeeQuantity(value, 'priority fee history'));
+            return parsed[1];
+        })
+            .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+        maxPriorityFeePerGas =
+            (recentFees[Math.floor(recentFees.length / 2)] * 150n) / 100n;
+    }
+    if (minPriorityFee !== undefined && maxPriorityFeePerGas < minPriorityFee)
+        maxPriorityFeePerGas = minPriorityFee;
+    const baseline = (gasPrice * 120n) / 100n;
+    const calculated = (baseFeePerGas * BigInt(multiplier)) / 100n + maxPriorityFeePerGas;
+    let maxFeePerGas = calculated > baseline ? calculated : baseline;
+    const minimum = (maxPriorityFeePerGas * 120n) / 100n;
+    if (maxFeePerGas < minimum)
+        maxFeePerGas = minimum;
+    if (maxFeePerGas === 0n)
+        throw new Error('Invalid EIP-1559 maximum fee');
+    parseEvmFeeQuantity(maxFeePerGas, 'maximum fee');
+    parseEvmFeeQuantity(maxPriorityFeePerGas, 'priority fee');
+    check();
+    return Object.freeze({
+        gasPrice,
+        baseFeePerGas,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+    });
+}
+//# sourceMappingURL=evm-fees.js.map

package/cjs/evm-fees.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evm-fees.js","sourceRoot":"","sources":["../../src/evm-fees.ts"],"names":[],"mappings":";;;AAiDA,8CAyBC;AAGD,kDA+BC;AAMD,kDAYC;AA6BD,sCA0IC;AArSD,kFAAkF;AAClF,iEAA4E;AA6B5E,MAAM,OAAO,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;AAElC,+EAA+E;AAC/E,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YACkB,IAEoB;QAEpC,KAAK,CACH,IAAI,KAAK,+BAA+B;YACtC,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,yCAAyC,CAC9C,CAAC;QARc,SAAI,GAAJ,IAAI,CAEgB;QAOpC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAbD,4CAaC;AAED,+EAA+E;AAC/E,SAAgB,iBAAiB,CAC/B,QAAgB,EAChB,OAAe,EACf,oBAA6B;IAE7B,IACE,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,IAAI,EAAE;QACd,QAAQ,GAAG,OAAO;QAClB,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,GAAG,EAAE;QACZ,OAAO,GAAG,OAAO;QACjB,CAAC,oBAAoB,KAAK,SAAS;YACjC,CAAC,OAAO,oBAAoB,KAAK,QAAQ;gBACvC,oBAAoB,IAAI,EAAE;gBAC1B,oBAAoB,GAAG,OAAO,CAAC,CAAC;QAEpC,MAAM,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;IAC9D,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,CAAC,CAAC;IAC5D,IACE,CAAC,iBAAiB,KAAK,SAAS,IAAI,QAAQ,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACzE,CAAC,oBAAoB,KAAK,SAAS,IAAI,QAAQ,GAAG,oBAAoB,CAAC;QAEvE,MAAM,IAAI,gBAAgB,CAAC,gCAAgC,CAAC,CAAC;IAC/D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,qFAAqF;AACrF,SAAgB,mBAAmB,CACjC,KAAc,EACd,KAAK,GAAG,cAAc;IAEtB,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG,KAId,CAAC;QACF,KAAK;YACH,MAAM,CAAC,IAAI;gBACX,MAAM,CAAC,GAAG;gBACV,CAAC,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAC1E,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,IACE,CAAC,CACC,CAAC,OAAO,KAAK,KAAK,QAAQ;QACxB,KAAK,CAAC,MAAM,IAAI,EAAE;QAClB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC,OAAO,KAAK,KAAK,QAAQ;YACxB,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;YAC3B,KAAK,IAAI,CAAC,CAAC;QACb,CAAC,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,EAAE,CAAC,CAC3C;QAED,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAiC,CAAC,CAAC;IAC3D,IAAI,QAAQ,GAAG,OAAO;QAAE,MAAM,IAAI,KAAK,CAAC,WAAW,KAAK,EAAE,CAAC,CAAC;IAC5D,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;GAGG;AACH,SAAgB,mBAAmB,CACjC,QAAgB,EAChB,OAAgB;IAEhB,IACE,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,GAAG,EAAE;QACb,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,QAAQ,CAAC;QAEtD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC1E,CAAC;AAED,SAAS,yBAAyB,CAAC,KAAU;IAC3C,MAAM,eAAe,GAAG,CAAC,IAAa,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,IAAI,KAAK,IAAI,CAAC;IAC5E,IAAI,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,CAAC,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,IACE,KAAK,EAAE,SAAS,IAAI,IAAI;QACxB,KAAK,CAAC,SAAS,KAAK,0BAA0B;QAE9C,OAAO,KAAK,CAAC;IACf,OAAO;QACL,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE;QAC9C,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE;KAC3D,CAAC,IAAI,CACJ,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,CACrB,KAAK,EAAE,IAAI,KAAK,YAAY;QAC5B,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC;QAC5B,OAAO,EAAE,MAAM,KAAK,0BAA0B;QAC9C,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,aAAa,CACjC,MAAoB,EACpB,UAAyB,EAAE;IAE3B,MAAM,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CACpD,CAAC,MAAM,EAAyB,EAAE,CAAC,MAAM,KAAK,SAAS,CACxD,CAAC;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;IAC5C,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,MAAM,GAAY,aAAa,EAAE,CAAC;YACxC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACzB,sEAAsE;gBACtE,KAAK,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;gBACpD,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7C,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;YAC1B,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,KAAK,EAAE,CAAC;IACR,MAAM,cAAc,GAClB,OAAO,CAAC,cAAc,IAAI,IAAI;QAC5B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,EAAE,sBAAsB,CAAC,CAAC;IAC1E,qDAAqD;IACrD,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,IAAI,GAAG,CAAC;IAChD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,UAAU,GAAG,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,KAAK,EAAK,SAA2B,EAAc,EAAE;QAChE,KAAK,EAAE,CAAC;QACR,IAAI,OAAO,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC;QAC9B,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,OAAO,CAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACnD,MAAM,KAAK,GAAG,GAAG,EAAE;oBACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;oBACrD,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;oBAC1B,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChB,CAAC,CAAC;gBACF,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACzB,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CACxD,CAAC;gBACF,OAAO,GAAG,GAAG,EAAE;oBACb,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACzB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAC3C,CAAC;oBACF,OAAO,SAAS,CAAC;gBACnB,CAAC,CAAC;YACJ,CAAC,CAAC,CAAC;YACH,oEAAoE;YACpE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC;YAC9D,KAAK,EAAE,CAAC;YACR,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,KAAK,EAAE,CAAC;YACR,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3E,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAC/C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACnC,MAAM,UAAU,GAAG,KAAK,CAAC,aAAa,CAAC;IACvC,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACvB,KAAK,EAAE,CAAC;QACR,OAAO,MAAM,CAAC,MAAM,CAAC;YACnB,QAAQ;YACR,YAAY,EAAE,EAAE;YAChB,oBAAoB,EAAE,EAAE;SACzB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,aAAa,GAAG,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;IAClE,IAAI,oBAA4B,CAAC;IACjC,IAAI,CAAC;QACH,oBAAoB,GAAG,mBAAmB,CACxC,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC,EACtD,cAAc,CACf,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,EAAE,CAAC;QACR,IACE,KAAK,EAAE,IAAI,KAAK,8BAA8B;YAC9C,KAAK,EAAE,IAAI,KAAK,YAAY;YAC5B,CAAC,yBAAyB,CAAC,KAAK,CAAC;YAEjC,MAAM,KAAK,CAAC;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,EAAE,CAC9B,IAAI,CAAC,gBAAgB,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CACxD,CAAC;QACF,MAAM,OAAO,GAAI,OAAuC,EAAE,MAAM,CAAC;QACjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YACrE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,MAAM,UAAU,GAAG,OAAO;aACvB,GAAG,CAAC,CAAC,MAAe,EAAE,EAAE;YACvB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;gBAC/C,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAClC,mBAAmB,CAAC,KAAK,EAAE,sBAAsB,CAAC,CACnD,CAAC;YACF,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,oBAAoB;YAClB,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,CAAC;IACD,IAAI,cAAc,KAAK,SAAS,IAAI,oBAAoB,GAAG,cAAc;QACvE,oBAAoB,GAAG,cAAc,CAAC;IACxC,MAAM,QAAQ,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1C,MAAM,UAAU,GACd,CAAC,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,GAAG,oBAAoB,CAAC;IACrE,IAAI,YAAY,GAAG,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;IACjE,MAAM,OAAO,GAAG,CAAC,oBAAoB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACrD,IAAI,YAAY,GAAG,OAAO;QAAE,YAAY,GAAG,OAAO,CAAC;IACnD,IAAI,YAAY,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;IACzE,mBAAmB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IACjD,mBAAmB,CAAC,oBAAoB,EAAE,cAAc,CAAC,CAAC;IAC1D,KAAK,EAAE,CAAC;IACR,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,QAAQ;QACR,aAAa;QACb,YAAY;QACZ,oBAAoB;KACrB,CAAC,CAAC;AACL,CAAC"}

package/cjs/keyring-core.js

@@ -1257,7 +1257,7 @@ class KeyringCore {
         this.initialTrezorAccountState = initial_state_1.initialActiveTrezorAccountState;
         this.initialLedgerAccountState = initial_state_1.initialActiveLedgerAccountState;
         this.syscoinTransaction = this.createSyscoinTransactions();
-        this.ethereumTransaction = new ethereum_1.EthereumTransactions(this.getNetwork, this.getDecryptedPrivateKey, this.getAccountsState, this.ledgerSigner, this.trezorSigner, this.capturePsbtSigningContext);
+        this.ethereumTransaction = new ethereum_1.EthereumTransactions(this.getNetwork, this.getDecryptedPrivateKey, this.getAccountsState, this.ledgerSigner, this.trezorSigner, this.capturePsbtSigningContext, dependencies.captureEvmSubmission);
     }
     // Convenience method for complete setup after construction
     async initialize(seed, password, network) {