@metamask-previews/eth-trezor-keyring 9.0.0-ca7f2af → 9.0.0-cd75414

package/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add `TrezorKeyringV2` and `OneKeyKeyringV2` classes implementing `KeyringV2` interface ([#412](https://github.com/MetaMask/accounts/pull/412)), ([#451](https://github.com/MetaMask/accounts/pull/451)), ([#453](https://github.com/MetaMask/accounts/pull/453))
+  - Wraps legacy `TrezorKeyring` and `OneKeyKeyring` to expose accounts via the unified `KeyringV2` API and the `KeyringAccount` type.
+  - Extends `EthKeyringWrapper` for common Ethereum logic.
+
 ## [9.0.0]
 
 ### Changed

package/dist/index.cjs

@@ -15,6 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./trezor-keyring.cjs"), exports);
+__exportStar(require("./trezor-keyring-v2.cjs"), exports);
 __exportStar(require("./onekey-keyring.cjs"), exports);
+__exportStar(require("./onekey-keyring-v2.cjs"), exports);
 __exportStar(require("./trezor-connect-bridge.cjs"), exports);
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAiC;AACjC,uDAAiC;AAEjC,8DAAwC","sourcesContent":["export * from './trezor-keyring';\nexport * from './onekey-keyring';\nexport type * from './trezor-bridge';\nexport * from './trezor-connect-bridge';\n"]}
+{"version":3,"file":"index.cjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAiC;AACjC,0DAAoC;AACpC,uDAAiC;AACjC,0DAAoC;AAEpC,8DAAwC","sourcesContent":["export * from './trezor-keyring';\nexport * from './trezor-keyring-v2';\nexport * from './onekey-keyring';\nexport * from './onekey-keyring-v2';\nexport type * from './trezor-bridge';\nexport * from './trezor-connect-bridge';\n"]}

package/dist/index.d.cts

@@ -1,5 +1,7 @@
 export * from "./trezor-keyring.cjs";
+export * from "./trezor-keyring-v2.cjs";
 export * from "./onekey-keyring.cjs";
+export * from "./onekey-keyring-v2.cjs";
 export type * from "./trezor-bridge.cjs";
 export * from "./trezor-connect-bridge.cjs";
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,qCAAiC;AACjC,yCAAqC;AACrC,4CAAwC"}
+{"version":3,"file":"index.d.cts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,wCAAoC;AACpC,qCAAiC;AACjC,wCAAoC;AACpC,yCAAqC;AACrC,4CAAwC"}

package/dist/index.d.mts

@@ -1,5 +1,7 @@
 export * from "./trezor-keyring.mjs";
+export * from "./trezor-keyring-v2.mjs";
 export * from "./onekey-keyring.mjs";
+export * from "./onekey-keyring-v2.mjs";
 export type * from "./trezor-bridge.mjs";
 export * from "./trezor-connect-bridge.mjs";
 //# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,qCAAiC;AACjC,yCAAqC;AACrC,4CAAwC"}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,wCAAoC;AACpC,qCAAiC;AACjC,wCAAoC;AACpC,yCAAqC;AACrC,4CAAwC"}

package/dist/index.mjs

@@ -1,4 +1,6 @@
 export * from "./trezor-keyring.mjs";
+export * from "./trezor-keyring-v2.mjs";
 export * from "./onekey-keyring.mjs";
+export * from "./onekey-keyring-v2.mjs";
 export * from "./trezor-connect-bridge.mjs";
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,qCAAiC;AAEjC,4CAAwC","sourcesContent":["export * from './trezor-keyring';\nexport * from './onekey-keyring';\nexport type * from './trezor-bridge';\nexport * from './trezor-connect-bridge';\n"]}
+{"version":3,"file":"index.mjs","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAiC;AACjC,wCAAoC;AACpC,qCAAiC;AACjC,wCAAoC;AAEpC,4CAAwC","sourcesContent":["export * from './trezor-keyring';\nexport * from './trezor-keyring-v2';\nexport * from './onekey-keyring';\nexport * from './onekey-keyring-v2';\nexport type * from './trezor-bridge';\nexport * from './trezor-connect-bridge';\n"]}

package/dist/onekey-keyring-v2.cjs

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OneKeyKeyringV2 = void 0;
+const keyring_api_1 = require("@metamask/keyring-api");
+const trezor_keyring_v2_1 = require("./trezor-keyring-v2.cjs");
+/**
+ * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.
+ *
+ * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends
+ * TrezorKeyring. The only difference is the keyring type identifier.
+ */
+class OneKeyKeyringV2 extends trezor_keyring_v2_1.TrezorKeyringV2 {
+    constructor(options) {
+        super({
+            legacyKeyring: options.legacyKeyring,
+            entropySource: options.entropySource,
+            type: keyring_api_1.KeyringType.OneKey,
+        });
+    }
+}
+exports.OneKeyKeyringV2 = OneKeyKeyringV2;
+//# sourceMappingURL=onekey-keyring-v2.cjs.map

package/dist/onekey-keyring-v2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"onekey-keyring-v2.cjs","sourceRoot":"","sources":["../src/onekey-keyring-v2.ts"],"names":[],"mappings":";;;AAAA,uDAA0E;AAG1E,+DAAsD;AAUtD;;;;;GAKG;AACH,MAAa,eAAgB,SAAQ,mCAAe;IAClD,YAAY,OAA+B;QACzC,KAAK,CAAC;YACJ,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,IAAI,EAAE,yBAAW,CAAC,MAAM;SACzB,CAAC,CAAC;IACL,CAAC;CACF;AARD,0CAQC","sourcesContent":["import { KeyringType, type EntropySourceId } from '@metamask/keyring-api';\n\nimport type { OneKeyKeyring } from './onekey-keyring';\nimport { TrezorKeyringV2 } from './trezor-keyring-v2';\n\n/**\n * Options for creating a OneKeyKeyringV2 instance.\n */\nexport type OneKeyKeyringV2Options = {\n  legacyKeyring: OneKeyKeyring;\n  entropySource: EntropySourceId;\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.\n *\n * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends\n * TrezorKeyring. The only difference is the keyring type identifier.\n */\nexport class OneKeyKeyringV2 extends TrezorKeyringV2 {\n  constructor(options: OneKeyKeyringV2Options) {\n    super({\n      legacyKeyring: options.legacyKeyring,\n      entropySource: options.entropySource,\n      type: KeyringType.OneKey,\n    });\n  }\n}\n"]}

package/dist/onekey-keyring-v2.d.cts

@@ -0,0 +1,20 @@
+import { type EntropySourceId } from "@metamask/keyring-api";
+import type { OneKeyKeyring } from "./onekey-keyring.cjs";
+import { TrezorKeyringV2 } from "./trezor-keyring-v2.cjs";
+/**
+ * Options for creating a OneKeyKeyringV2 instance.
+ */
+export type OneKeyKeyringV2Options = {
+    legacyKeyring: OneKeyKeyring;
+    entropySource: EntropySourceId;
+};
+/**
+ * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.
+ *
+ * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends
+ * TrezorKeyring. The only difference is the keyring type identifier.
+ */
+export declare class OneKeyKeyringV2 extends TrezorKeyringV2 {
+    constructor(options: OneKeyKeyringV2Options);
+}
+//# sourceMappingURL=onekey-keyring-v2.d.cts.map

package/dist/onekey-keyring-v2.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onekey-keyring-v2.d.cts","sourceRoot":"","sources":["../src/onekey-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,eAAe,EAAE,8BAA8B;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,6BAAyB;AACtD,OAAO,EAAE,eAAe,EAAE,gCAA4B;AAEtD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,eAAe;gBACtC,OAAO,EAAE,sBAAsB;CAO5C"}

package/dist/onekey-keyring-v2.d.mts

@@ -0,0 +1,20 @@
+import { type EntropySourceId } from "@metamask/keyring-api";
+import type { OneKeyKeyring } from "./onekey-keyring.mjs";
+import { TrezorKeyringV2 } from "./trezor-keyring-v2.mjs";
+/**
+ * Options for creating a OneKeyKeyringV2 instance.
+ */
+export type OneKeyKeyringV2Options = {
+    legacyKeyring: OneKeyKeyring;
+    entropySource: EntropySourceId;
+};
+/**
+ * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.
+ *
+ * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends
+ * TrezorKeyring. The only difference is the keyring type identifier.
+ */
+export declare class OneKeyKeyringV2 extends TrezorKeyringV2 {
+    constructor(options: OneKeyKeyringV2Options);
+}
+//# sourceMappingURL=onekey-keyring-v2.d.mts.map

package/dist/onekey-keyring-v2.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"onekey-keyring-v2.d.mts","sourceRoot":"","sources":["../src/onekey-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,eAAe,EAAE,8BAA8B;AAE1E,OAAO,KAAK,EAAE,aAAa,EAAE,6BAAyB;AACtD,OAAO,EAAE,eAAe,EAAE,gCAA4B;AAEtD;;GAEG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC;CAChC,CAAC;AAEF;;;;;GAKG;AACH,qBAAa,eAAgB,SAAQ,eAAe;gBACtC,OAAO,EAAE,sBAAsB;CAO5C"}

package/dist/onekey-keyring-v2.mjs

@@ -0,0 +1,18 @@
+import { KeyringType } from "@metamask/keyring-api";
+import { TrezorKeyringV2 } from "./trezor-keyring-v2.mjs";
+/**
+ * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.
+ *
+ * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends
+ * TrezorKeyring. The only difference is the keyring type identifier.
+ */
+export class OneKeyKeyringV2 extends TrezorKeyringV2 {
+    constructor(options) {
+        super({
+            legacyKeyring: options.legacyKeyring,
+            entropySource: options.entropySource,
+            type: KeyringType.OneKey,
+        });
+    }
+}
+//# sourceMappingURL=onekey-keyring-v2.mjs.map

package/dist/onekey-keyring-v2.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"onekey-keyring-v2.mjs","sourceRoot":"","sources":["../src/onekey-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAwB,8BAA8B;AAG1E,OAAO,EAAE,eAAe,EAAE,gCAA4B;AAUtD;;;;;GAKG;AACH,MAAM,OAAO,eAAgB,SAAQ,eAAe;IAClD,YAAY,OAA+B;QACzC,KAAK,CAAC;YACJ,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,IAAI,EAAE,WAAW,CAAC,MAAM;SACzB,CAAC,CAAC;IACL,CAAC;CACF","sourcesContent":["import { KeyringType, type EntropySourceId } from '@metamask/keyring-api';\n\nimport type { OneKeyKeyring } from './onekey-keyring';\nimport { TrezorKeyringV2 } from './trezor-keyring-v2';\n\n/**\n * Options for creating a OneKeyKeyringV2 instance.\n */\nexport type OneKeyKeyringV2Options = {\n  legacyKeyring: OneKeyKeyring;\n  entropySource: EntropySourceId;\n};\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link OneKeyKeyring}.\n *\n * This wrapper extends {@link TrezorKeyringV2} since OneKeyKeyring extends\n * TrezorKeyring. The only difference is the keyring type identifier.\n */\nexport class OneKeyKeyringV2 extends TrezorKeyringV2 {\n  constructor(options: OneKeyKeyringV2Options) {\n    super({\n      legacyKeyring: options.legacyKeyring,\n      entropySource: options.entropySource,\n      type: KeyringType.OneKey,\n    });\n  }\n}\n"]}

package/dist/trezor-keyring-v2.cjs

@@ -0,0 +1,246 @@
+"use strict";
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TrezorKeyringV2_instances, _TrezorKeyringV2_parseDerivationPath, _TrezorKeyringV2_createKeyringAccount;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrezorKeyringV2 = exports.LEGACY_MEW_PATH_PREFIX = exports.SLIP0044_TESTNET_PATH_PREFIX = exports.BIP44_HD_PATH_PREFIX = void 0;
+const keyring_api_1 = require("@metamask/keyring-api");
+/**
+ * Methods supported by Trezor keyring EOA accounts.
+ * Trezor keyrings support a subset of signing methods (no encryption, app keys, or EIP-7702).
+ */
+const TREZOR_KEYRING_METHODS = [
+    keyring_api_1.EthMethod.SignTransaction,
+    keyring_api_1.EthMethod.PersonalSign,
+    keyring_api_1.EthMethod.SignTypedDataV3,
+    keyring_api_1.EthMethod.SignTypedDataV4,
+];
+const trezorKeyringV2Capabilities = {
+    scopes: [keyring_api_1.EthScope.Eoa],
+    bip44: {
+        deriveIndex: true,
+        derivePath: true,
+    },
+};
+/**
+ * BIP-44 standard HD path prefix constant for Ethereum.
+ * Used as default for derive-index operations.
+ */
+exports.BIP44_HD_PATH_PREFIX = `m/44'/60'/0'/0`;
+/**
+ * SLIP-0044 testnet HD path prefix constant.
+ */
+exports.SLIP0044_TESTNET_PATH_PREFIX = `m/44'/1'/0'/0`;
+/**
+ * Legacy MEW (MyEtherWallet) HD path prefix constant.
+ */
+exports.LEGACY_MEW_PATH_PREFIX = `m/44'/60'/0'`;
+/**
+ * Allowed HD paths for Trezor keyring.
+ * These must match the keys in ALLOWED_HD_PATHS from trezor-keyring.ts.
+ */
+const ALLOWED_HD_PATHS = [
+    exports.BIP44_HD_PATH_PREFIX,
+    exports.SLIP0044_TESTNET_PATH_PREFIX,
+    exports.LEGACY_MEW_PATH_PREFIX,
+];
+/**
+ * Regex pattern for validating and parsing Trezor derivation paths.
+ * Matches BIP-44 style paths: m/44'/{coin}'/{segments}/{index}
+ * where coin is 60' (Ethereum) or 1' (testnet).
+ * Captures: [1] = base path prefix, [2] = index
+ * The prefix is then validated against ALLOWED_HD_PATHS.
+ */
+const DERIVATION_PATH_PATTERN = /^(m\/44'\/(?:60'|1')(?:\/\d+'?)*)\/(\d+)$/u;
+class TrezorKeyringV2 extends keyring_api_1.EthKeyringWrapper {
+    constructor(options) {
+        var _a;
+        super({
+            type: (_a = options.type) !== null && _a !== void 0 ? _a : keyring_api_1.KeyringType.Trezor,
+            inner: options.legacyKeyring,
+            capabilities: trezorKeyringV2Capabilities,
+        });
+        _TrezorKeyringV2_instances.add(this);
+        this.entropySource = options.entropySource;
+    }
+    /**
+     * Hydrate the underlying keyring from a previously serialized state.
+     *
+     * Overrides the base class implementation to avoid calling `getAccounts()`
+     * when the Trezor device is locked. The base class calls `getAccounts()` to
+     * rebuild the registry, but for Trezor keyrings this requires the HDKey to
+     * be initialized (via `unlock()`). Since the device may not be connected
+     * during deserialization, we skip the registry rebuild here. The registry
+     * will be populated on the first call to `getAccounts()` after the device
+     * is unlocked.
+     *
+     * @param state - The serialized keyring state.
+     */
+    async deserialize(state) {
+        await this.withLock(async () => {
+            // Clear the registry when deserializing
+            this.registry.clear();
+            // Deserialize the legacy keyring state only.
+            // We intentionally skip calling getAccounts() here because the Trezor
+            // device may be locked (HDKey not initialized). The TrezorKeyring's
+            // deserialize restores the accounts array, but not the paths map, so
+            // getIndexForAddress would need to derive addresses which requires an
+            // initialized HDKey. The registry will be populated lazily when
+            // getAccounts() is called after the device is unlocked.
+            await this.inner.deserialize(state);
+        });
+    }
+    async getAccounts() {
+        const addresses = await this.inner.getAccounts();
+        if (addresses.length === 0) {
+            return [];
+        }
+        // If the device is locked, we cannot derive addresses to find indices.
+        // Return cached accounts if available, otherwise throw a clear error.
+        if (!this.inner.isUnlocked()) {
+            const cachedAccounts = addresses
+                .map((address) => {
+                const existingId = this.registry.getAccountId(address);
+                return existingId ? this.registry.get(existingId) : undefined;
+            })
+                .filter((account) => account !== undefined);
+            // If we have all accounts cached, return them
+            if (cachedAccounts.length === addresses.length) {
+                return cachedAccounts;
+            }
+            // Some accounts are not cached and device is locked
+            throw new Error('Trezor device is locked. Please unlock the device to access accounts.');
+        }
+        return addresses.map((address) => {
+            // Check if we already have this account in the registry
+            const existingId = this.registry.getAccountId(address);
+            if (existingId) {
+                const cached = this.registry.get(existingId);
+                if (cached) {
+                    return cached;
+                }
+            }
+            const addressIndex = this.inner.getIndexForAddress(address);
+            return __classPrivateFieldGet(this, _TrezorKeyringV2_instances, "m", _TrezorKeyringV2_createKeyringAccount).call(this, address, addressIndex);
+        });
+    }
+    async createAccounts(options) {
+        return this.withLock(async () => {
+            if (options.type === 'bip44:derive-path' ||
+                options.type === 'bip44:derive-index') {
+                // Validate that the entropy source matches this keyring's entropy source
+                if (options.entropySource !== this.entropySource) {
+                    throw new Error(`Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`);
+                }
+            }
+            else {
+                throw new Error(`Unsupported account creation type for TrezorKeyring: ${String(options.type)}`);
+            }
+            // Check if an account at this index already exists with the same derivation path
+            const currentAccounts = await this.getAccounts();
+            let targetIndex;
+            let basePath;
+            let derivationPath;
+            if (options.type === 'bip44:derive-path') {
+                // Parse the derivation path to extract base path and index
+                const parsed = __classPrivateFieldGet(this, _TrezorKeyringV2_instances, "m", _TrezorKeyringV2_parseDerivationPath).call(this, options.derivationPath);
+                targetIndex = parsed.index;
+                basePath = parsed.basePath;
+                // Use the normalized path to avoid mismatches with leading zeros
+                // (e.g., "m/44'/60'/0'/0/007" becomes "m/44'/60'/0'/0/7")
+                derivationPath = `${basePath}/${targetIndex}`;
+            }
+            else {
+                // derive-index uses BIP-44 standard path by default
+                if (options.groupIndex < 0) {
+                    throw new Error(`Invalid groupIndex: ${options.groupIndex}. Must be a non-negative integer.`);
+                }
+                targetIndex = options.groupIndex;
+                basePath = exports.BIP44_HD_PATH_PREFIX;
+                derivationPath = `${basePath}/${targetIndex}`;
+            }
+            const existingAccount = currentAccounts.find((account) => {
+                return (account.options.entropy.groupIndex === targetIndex &&
+                    account.options.entropy.derivationPath === derivationPath);
+            });
+            if (existingAccount) {
+                return [existingAccount];
+            }
+            // Derive the account at the specified index.
+            // If the HD path is changing, clear the registry to avoid stale accounts.
+            // The TrezorKeyring operates on a single path at a time - accounts from
+            // different paths cannot coexist in the inner keyring.
+            if (basePath !== this.inner.hdPath) {
+                this.registry.clear();
+            }
+            this.inner.setHdPath(basePath);
+            this.inner.setAccountToUnlock(targetIndex);
+            const [newAddress] = await this.inner.addAccounts(1);
+            if (!newAddress) {
+                throw new Error('Failed to create new account');
+            }
+            const newAccount = __classPrivateFieldGet(this, _TrezorKeyringV2_instances, "m", _TrezorKeyringV2_createKeyringAccount).call(this, newAddress, targetIndex);
+            return [newAccount];
+        });
+    }
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    async deleteAccount(accountId) {
+        await this.withLock(async () => {
+            const { address } = await this.getAccount(accountId);
+            const hexAddress = this.toHexAddress(address);
+            // Remove from the legacy keyring
+            this.inner.removeAccount(hexAddress);
+            // Remove from the registry
+            this.registry.delete(accountId);
+        });
+    }
+}
+exports.TrezorKeyringV2 = TrezorKeyringV2;
+_TrezorKeyringV2_instances = new WeakSet(), _TrezorKeyringV2_parseDerivationPath = function _TrezorKeyringV2_parseDerivationPath(derivationPath) {
+    const match = derivationPath.match(DERIVATION_PATH_PATTERN);
+    if (!(match === null || match === void 0 ? void 0 : match[1]) || !match[2]) {
+        throw new Error(`Invalid derivation path: ${derivationPath}. ` +
+            `Expected format: {base}/{index} where base is one of: ` +
+            `${ALLOWED_HD_PATHS.join(', ')}.`);
+    }
+    const basePath = match[1];
+    const index = parseInt(match[2], 10);
+    // Validate the base path is one of the allowed paths
+    if (!ALLOWED_HD_PATHS.includes(basePath)) {
+        throw new Error(`Invalid derivation path: ${derivationPath}. ` +
+            `Expected format: {base}/{index} where base is one of: ` +
+            `${ALLOWED_HD_PATHS.join(', ')}.`);
+    }
+    return {
+        basePath: basePath,
+        index,
+    };
+}, _TrezorKeyringV2_createKeyringAccount = function _TrezorKeyringV2_createKeyringAccount(address, addressIndex) {
+    const id = this.registry.register(address);
+    const derivationPath = `${this.inner.hdPath}/${addressIndex}`;
+    const account = {
+        id,
+        type: keyring_api_1.EthAccountType.Eoa,
+        address,
+        scopes: [...this.capabilities.scopes],
+        methods: [...TREZOR_KEYRING_METHODS],
+        options: {
+            entropy: {
+                type: keyring_api_1.KeyringAccountEntropyTypeOption.Mnemonic,
+                id: this.entropySource,
+                groupIndex: addressIndex,
+                derivationPath,
+            },
+        },
+    };
+    this.registry.set(account);
+    return account;
+};
+//# sourceMappingURL=trezor-keyring-v2.cjs.map

package/dist/trezor-keyring-v2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"trezor-keyring-v2.cjs","sourceRoot":"","sources":["../src/trezor-keyring-v2.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Bip44Account } from '@metamask/account-api';\nimport {\n  type CreateAccountOptions,\n  EthAccountType,\n  EthKeyringWrapper,\n  EthMethod,\n  EthScope,\n  type KeyringAccount,\n  KeyringAccountEntropyTypeOption,\n  type KeyringCapabilities,\n  type KeyringV2,\n  KeyringType,\n  type EntropySourceId,\n} from '@metamask/keyring-api';\nimport type { AccountId, EthKeyring } from '@metamask/keyring-utils';\nimport type { Hex, Json } from '@metamask/utils';\n\nimport type { TrezorKeyring } from './trezor-keyring';\n\n/**\n * Methods supported by Trezor keyring EOA accounts.\n * Trezor keyrings support a subset of signing methods (no encryption, app keys, or EIP-7702).\n */\nconst TREZOR_KEYRING_METHODS = [\n  EthMethod.SignTransaction,\n  EthMethod.PersonalSign,\n  EthMethod.SignTypedDataV3,\n  EthMethod.SignTypedDataV4,\n];\n\nconst trezorKeyringV2Capabilities: KeyringCapabilities = {\n  scopes: [EthScope.Eoa],\n  bip44: {\n    deriveIndex: true,\n    derivePath: true,\n  },\n};\n\n/**\n * BIP-44 standard HD path prefix constant for Ethereum.\n * Used as default for derive-index operations.\n */\nexport const BIP44_HD_PATH_PREFIX = `m/44'/60'/0'/0`;\n\n/**\n * SLIP-0044 testnet HD path prefix constant.\n */\nexport const SLIP0044_TESTNET_PATH_PREFIX = `m/44'/1'/0'/0`;\n\n/**\n * Legacy MEW (MyEtherWallet) HD path prefix constant.\n */\nexport const LEGACY_MEW_PATH_PREFIX = `m/44'/60'/0'`;\n\n/**\n * Allowed HD paths for Trezor keyring.\n * These must match the keys in ALLOWED_HD_PATHS from trezor-keyring.ts.\n */\nconst ALLOWED_HD_PATHS = [\n  BIP44_HD_PATH_PREFIX,\n  SLIP0044_TESTNET_PATH_PREFIX,\n  LEGACY_MEW_PATH_PREFIX,\n] as const;\n\n/**\n * Type representing one of the allowed Trezor HD paths.\n * Used by inner.setHdPath which expects one of these specific paths.\n */\ntype AllowedHdPath = (typeof ALLOWED_HD_PATHS)[number];\n\n/**\n * Regex pattern for validating and parsing Trezor derivation paths.\n * Matches BIP-44 style paths: m/44'/{coin}'/{segments}/{index}\n * where coin is 60' (Ethereum) or 1' (testnet).\n * Captures: [1] = base path prefix, [2] = index\n * The prefix is then validated against ALLOWED_HD_PATHS.\n */\nconst DERIVATION_PATH_PATTERN = /^(m\\/44'\\/(?:60'|1')(?:\\/\\d+'?)*)\\/(\\d+)$/u;\n\n/**\n * Concrete {@link KeyringV2} adapter for {@link TrezorKeyring}.\n *\n * This wrapper exposes the accounts and signing capabilities of the legacy\n * Trezor keyring via the unified V2 interface.\n *\n * All Trezor keyring accounts are BIP-44 derived from the device.\n */\nexport type TrezorKeyringV2Options = {\n  legacyKeyring: TrezorKeyring;\n  entropySource: EntropySourceId;\n  type?: KeyringType.Trezor | KeyringType.OneKey;\n};\n\n// TrezorKeyring.signTransaction returns `TypedTransaction | OldEthJsTransaction` for\n// backwards compatibility with old ethereumjs-tx, but EthKeyring expects `TypedTxData`.\n// The runtime behavior is correct - we cast the type to satisfy the constraint.\ntype TrezorKeyringAsEthKeyring = TrezorKeyring & EthKeyring;\n\nexport class TrezorKeyringV2\n  extends EthKeyringWrapper<\n    TrezorKeyringAsEthKeyring,\n    Bip44Account<KeyringAccount>\n  >\n  implements KeyringV2\n{\n  readonly entropySource: EntropySourceId;\n\n  constructor(options: TrezorKeyringV2Options) {\n    super({\n      type: options.type ?? KeyringType.Trezor,\n      inner: options.legacyKeyring as TrezorKeyringAsEthKeyring,\n      capabilities: trezorKeyringV2Capabilities,\n    });\n    this.entropySource = options.entropySource;\n  }\n\n  /**\n   * Hydrate the underlying keyring from a previously serialized state.\n   *\n   * Overrides the base class implementation to avoid calling `getAccounts()`\n   * when the Trezor device is locked. The base class calls `getAccounts()` to\n   * rebuild the registry, but for Trezor keyrings this requires the HDKey to\n   * be initialized (via `unlock()`). Since the device may not be connected\n   * during deserialization, we skip the registry rebuild here. The registry\n   * will be populated on the first call to `getAccounts()` after the device\n   * is unlocked.\n   *\n   * @param state - The serialized keyring state.\n   */\n  async deserialize(state: Json): Promise<void> {\n    await this.withLock(async () => {\n      // Clear the registry when deserializing\n      this.registry.clear();\n\n      // Deserialize the legacy keyring state only.\n      // We intentionally skip calling getAccounts() here because the Trezor\n      // device may be locked (HDKey not initialized). The TrezorKeyring's\n      // deserialize restores the accounts array, but not the paths map, so\n      // getIndexForAddress would need to derive addresses which requires an\n      // initialized HDKey. The registry will be populated lazily when\n      // getAccounts() is called after the device is unlocked.\n      await this.inner.deserialize(state);\n    });\n  }\n\n  /**\n   * Parses a derivation path to extract the base HD path and account index.\n   *\n   * Supports the allowed Trezor paths:\n   * - m/44'/60'/0'/0/{index} (BIP44 standard)\n   * - m/44'/60'/0'/{index} (legacy MEW)\n   * - m/44'/1'/0'/0/{index} (SLIP0044 testnet)\n   *\n   * @param derivationPath - The full derivation path (e.g., m/44'/60'/0'/0/5).\n   * @returns The base HD path and account index.\n   * @throws If the path format is invalid or not an allowed Trezor path.\n   */\n  #parseDerivationPath(derivationPath: string): {\n    basePath: AllowedHdPath;\n    index: number;\n  } {\n    const match = derivationPath.match(DERIVATION_PATH_PATTERN);\n    if (!match?.[1] || !match[2]) {\n      throw new Error(\n        `Invalid derivation path: ${derivationPath}. ` +\n          `Expected format: {base}/{index} where base is one of: ` +\n          `${ALLOWED_HD_PATHS.join(', ')}.`,\n      );\n    }\n\n    const basePath = match[1];\n    const index = parseInt(match[2], 10);\n\n    // Validate the base path is one of the allowed paths\n    if (!ALLOWED_HD_PATHS.includes(basePath as AllowedHdPath)) {\n      throw new Error(\n        `Invalid derivation path: ${derivationPath}. ` +\n          `Expected format: {base}/{index} where base is one of: ` +\n          `${ALLOWED_HD_PATHS.join(', ')}.`,\n      );\n    }\n\n    return {\n      basePath: basePath as AllowedHdPath,\n      index,\n    };\n  }\n\n  /**\n   * Creates a Bip44Account object for the given address.\n   *\n   * @param address - The account address.\n   * @param addressIndex - The account index in the derivation path.\n   * @returns The created Bip44Account.\n   */\n  #createKeyringAccount(\n    address: Hex,\n    addressIndex: number,\n  ): Bip44Account<KeyringAccount> {\n    const id = this.registry.register(address);\n    const derivationPath = `${this.inner.hdPath}/${addressIndex}`;\n\n    const account: Bip44Account<KeyringAccount> = {\n      id,\n      type: EthAccountType.Eoa,\n      address,\n      scopes: [...this.capabilities.scopes],\n      methods: [...TREZOR_KEYRING_METHODS],\n      options: {\n        entropy: {\n          type: KeyringAccountEntropyTypeOption.Mnemonic,\n          id: this.entropySource,\n          groupIndex: addressIndex,\n          derivationPath,\n        },\n      },\n    };\n\n    this.registry.set(account);\n    return account;\n  }\n\n  async getAccounts(): Promise<Bip44Account<KeyringAccount>[]> {\n    const addresses = await this.inner.getAccounts();\n\n    if (addresses.length === 0) {\n      return [];\n    }\n\n    // If the device is locked, we cannot derive addresses to find indices.\n    // Return cached accounts if available, otherwise throw a clear error.\n    if (!this.inner.isUnlocked()) {\n      const cachedAccounts = addresses\n        .map((address) => {\n          const existingId = this.registry.getAccountId(address);\n          return existingId ? this.registry.get(existingId) : undefined;\n        })\n        .filter(\n          (account): account is Bip44Account<KeyringAccount> =>\n            account !== undefined,\n        );\n\n      // If we have all accounts cached, return them\n      if (cachedAccounts.length === addresses.length) {\n        return cachedAccounts;\n      }\n\n      // Some accounts are not cached and device is locked\n      throw new Error(\n        'Trezor device is locked. Please unlock the device to access accounts.',\n      );\n    }\n\n    return addresses.map((address) => {\n      // Check if we already have this account in the registry\n      const existingId = this.registry.getAccountId(address);\n      if (existingId) {\n        const cached = this.registry.get(existingId);\n        if (cached) {\n          return cached;\n        }\n      }\n\n      const addressIndex = this.inner.getIndexForAddress(address);\n      return this.#createKeyringAccount(address, addressIndex);\n    });\n  }\n\n  async createAccounts(\n    options: CreateAccountOptions,\n  ): Promise<Bip44Account<KeyringAccount>[]> {\n    return this.withLock(async () => {\n      if (\n        options.type === 'bip44:derive-path' ||\n        options.type === 'bip44:derive-index'\n      ) {\n        // Validate that the entropy source matches this keyring's entropy source\n        if (options.entropySource !== this.entropySource) {\n          throw new Error(\n            `Entropy source mismatch: expected '${this.entropySource}', got '${options.entropySource}'`,\n          );\n        }\n      } else {\n        throw new Error(\n          `Unsupported account creation type for TrezorKeyring: ${String(\n            options.type,\n          )}`,\n        );\n      }\n\n      // Check if an account at this index already exists with the same derivation path\n      const currentAccounts = await this.getAccounts();\n\n      let targetIndex: number;\n      let basePath: AllowedHdPath;\n      let derivationPath: string;\n\n      if (options.type === 'bip44:derive-path') {\n        // Parse the derivation path to extract base path and index\n        const parsed = this.#parseDerivationPath(options.derivationPath);\n        targetIndex = parsed.index;\n        basePath = parsed.basePath;\n        // Use the normalized path to avoid mismatches with leading zeros\n        // (e.g., \"m/44'/60'/0'/0/007\" becomes \"m/44'/60'/0'/0/7\")\n        derivationPath = `${basePath}/${targetIndex}`;\n      } else {\n        // derive-index uses BIP-44 standard path by default\n        if (options.groupIndex < 0) {\n          throw new Error(\n            `Invalid groupIndex: ${options.groupIndex}. Must be a non-negative integer.`,\n          );\n        }\n        targetIndex = options.groupIndex;\n        basePath = BIP44_HD_PATH_PREFIX;\n        derivationPath = `${basePath}/${targetIndex}`;\n      }\n\n      const existingAccount = currentAccounts.find((account) => {\n        return (\n          account.options.entropy.groupIndex === targetIndex &&\n          account.options.entropy.derivationPath === derivationPath\n        );\n      });\n\n      if (existingAccount) {\n        return [existingAccount];\n      }\n\n      // Derive the account at the specified index.\n      // If the HD path is changing, clear the registry to avoid stale accounts.\n      // The TrezorKeyring operates on a single path at a time - accounts from\n      // different paths cannot coexist in the inner keyring.\n      if (basePath !== this.inner.hdPath) {\n        this.registry.clear();\n      }\n\n      this.inner.setHdPath(basePath);\n      this.inner.setAccountToUnlock(targetIndex);\n      const [newAddress] = await this.inner.addAccounts(1);\n\n      if (!newAddress) {\n        throw new Error('Failed to create new account');\n      }\n\n      const newAccount = this.#createKeyringAccount(newAddress, targetIndex);\n\n      return [newAccount];\n    });\n  }\n\n  /**\n   * Delete an account from the keyring.\n   *\n   * @param accountId - The account ID to delete.\n   */\n  async deleteAccount(accountId: AccountId): Promise<void> {\n    await this.withLock(async () => {\n      const { address } = await this.getAccount(accountId);\n      const hexAddress = this.toHexAddress(address);\n\n      // Remove from the legacy keyring\n      this.inner.removeAccount(hexAddress);\n\n      // Remove from the registry\n      this.registry.delete(accountId);\n    });\n  }\n}\n"]}

package/dist/trezor-keyring-v2.d.cts

@@ -0,0 +1,61 @@
+import type { Bip44Account } from "@metamask/account-api";
+import { type CreateAccountOptions, EthKeyringWrapper, type KeyringAccount, type KeyringV2, KeyringType, type EntropySourceId } from "@metamask/keyring-api";
+import type { AccountId, EthKeyring } from "@metamask/keyring-utils";
+import type { Json } from "@metamask/utils";
+import type { TrezorKeyring } from "./trezor-keyring.cjs";
+/**
+ * BIP-44 standard HD path prefix constant for Ethereum.
+ * Used as default for derive-index operations.
+ */
+export declare const BIP44_HD_PATH_PREFIX = "m/44'/60'/0'/0";
+/**
+ * SLIP-0044 testnet HD path prefix constant.
+ */
+export declare const SLIP0044_TESTNET_PATH_PREFIX = "m/44'/1'/0'/0";
+/**
+ * Legacy MEW (MyEtherWallet) HD path prefix constant.
+ */
+export declare const LEGACY_MEW_PATH_PREFIX = "m/44'/60'/0'";
+/**
+ * Concrete {@link KeyringV2} adapter for {@link TrezorKeyring}.
+ *
+ * This wrapper exposes the accounts and signing capabilities of the legacy
+ * Trezor keyring via the unified V2 interface.
+ *
+ * All Trezor keyring accounts are BIP-44 derived from the device.
+ */
+export type TrezorKeyringV2Options = {
+    legacyKeyring: TrezorKeyring;
+    entropySource: EntropySourceId;
+    type?: KeyringType.Trezor | KeyringType.OneKey;
+};
+type TrezorKeyringAsEthKeyring = TrezorKeyring & EthKeyring;
+export declare class TrezorKeyringV2 extends EthKeyringWrapper<TrezorKeyringAsEthKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+    #private;
+    readonly entropySource: EntropySourceId;
+    constructor(options: TrezorKeyringV2Options);
+    /**
+     * Hydrate the underlying keyring from a previously serialized state.
+     *
+     * Overrides the base class implementation to avoid calling `getAccounts()`
+     * when the Trezor device is locked. The base class calls `getAccounts()` to
+     * rebuild the registry, but for Trezor keyrings this requires the HDKey to
+     * be initialized (via `unlock()`). Since the device may not be connected
+     * during deserialization, we skip the registry rebuild here. The registry
+     * will be populated on the first call to `getAccounts()` after the device
+     * is unlocked.
+     *
+     * @param state - The serialized keyring state.
+     */
+    deserialize(state: Json): Promise<void>;
+    getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
+    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+}
+export {};
+//# sourceMappingURL=trezor-keyring-v2.d.cts.map

package/dist/trezor-keyring-v2.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trezor-keyring-v2.d.cts","sourceRoot":"","sources":["../src/trezor-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,oBAAoB,EAEzB,iBAAiB,EAGjB,KAAK,cAAc,EAGnB,KAAK,SAAS,EACd,WAAW,EACX,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,gCAAgC;AACrE,OAAO,KAAK,EAAO,IAAI,EAAE,wBAAwB;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,6BAAyB;AAqBtD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD;;GAEG;AACH,eAAO,MAAM,4BAA4B,kBAAkB,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,sBAAsB,iBAAiB,CAAC;AA2BrD;;;;;;;GAOG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC;IAC/B,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;CAChD,CAAC;AAKF,KAAK,yBAAyB,GAAG,aAAa,GAAG,UAAU,CAAC;AAE5D,qBAAa,eACX,SAAQ,iBAAiB,CACvB,yBAAyB,EACzB,YAAY,CAAC,cAAc,CAAC,CAE9B,YAAW,SAAS;;IAEpB,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAE5B,OAAO,EAAE,sBAAsB;IAS3C;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6FvC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA8CtD,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAgF1C;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYzD"}

package/dist/trezor-keyring-v2.d.mts

@@ -0,0 +1,61 @@
+import type { Bip44Account } from "@metamask/account-api";
+import { type CreateAccountOptions, EthKeyringWrapper, type KeyringAccount, type KeyringV2, KeyringType, type EntropySourceId } from "@metamask/keyring-api";
+import type { AccountId, EthKeyring } from "@metamask/keyring-utils";
+import type { Json } from "@metamask/utils";
+import type { TrezorKeyring } from "./trezor-keyring.mjs";
+/**
+ * BIP-44 standard HD path prefix constant for Ethereum.
+ * Used as default for derive-index operations.
+ */
+export declare const BIP44_HD_PATH_PREFIX = "m/44'/60'/0'/0";
+/**
+ * SLIP-0044 testnet HD path prefix constant.
+ */
+export declare const SLIP0044_TESTNET_PATH_PREFIX = "m/44'/1'/0'/0";
+/**
+ * Legacy MEW (MyEtherWallet) HD path prefix constant.
+ */
+export declare const LEGACY_MEW_PATH_PREFIX = "m/44'/60'/0'";
+/**
+ * Concrete {@link KeyringV2} adapter for {@link TrezorKeyring}.
+ *
+ * This wrapper exposes the accounts and signing capabilities of the legacy
+ * Trezor keyring via the unified V2 interface.
+ *
+ * All Trezor keyring accounts are BIP-44 derived from the device.
+ */
+export type TrezorKeyringV2Options = {
+    legacyKeyring: TrezorKeyring;
+    entropySource: EntropySourceId;
+    type?: KeyringType.Trezor | KeyringType.OneKey;
+};
+type TrezorKeyringAsEthKeyring = TrezorKeyring & EthKeyring;
+export declare class TrezorKeyringV2 extends EthKeyringWrapper<TrezorKeyringAsEthKeyring, Bip44Account<KeyringAccount>> implements KeyringV2 {
+    #private;
+    readonly entropySource: EntropySourceId;
+    constructor(options: TrezorKeyringV2Options);
+    /**
+     * Hydrate the underlying keyring from a previously serialized state.
+     *
+     * Overrides the base class implementation to avoid calling `getAccounts()`
+     * when the Trezor device is locked. The base class calls `getAccounts()` to
+     * rebuild the registry, but for Trezor keyrings this requires the HDKey to
+     * be initialized (via `unlock()`). Since the device may not be connected
+     * during deserialization, we skip the registry rebuild here. The registry
+     * will be populated on the first call to `getAccounts()` after the device
+     * is unlocked.
+     *
+     * @param state - The serialized keyring state.
+     */
+    deserialize(state: Json): Promise<void>;
+    getAccounts(): Promise<Bip44Account<KeyringAccount>[]>;
+    createAccounts(options: CreateAccountOptions): Promise<Bip44Account<KeyringAccount>[]>;
+    /**
+     * Delete an account from the keyring.
+     *
+     * @param accountId - The account ID to delete.
+     */
+    deleteAccount(accountId: AccountId): Promise<void>;
+}
+export {};
+//# sourceMappingURL=trezor-keyring-v2.d.mts.map

package/dist/trezor-keyring-v2.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"trezor-keyring-v2.d.mts","sourceRoot":"","sources":["../src/trezor-keyring-v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,8BAA8B;AAC1D,OAAO,EACL,KAAK,oBAAoB,EAEzB,iBAAiB,EAGjB,KAAK,cAAc,EAGnB,KAAK,SAAS,EACd,WAAW,EACX,KAAK,eAAe,EACrB,8BAA8B;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,gCAAgC;AACrE,OAAO,KAAK,EAAO,IAAI,EAAE,wBAAwB;AAEjD,OAAO,KAAK,EAAE,aAAa,EAAE,6BAAyB;AAqBtD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,mBAAmB,CAAC;AAErD;;GAEG;AACH,eAAO,MAAM,4BAA4B,kBAAkB,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,sBAAsB,iBAAiB,CAAC;AA2BrD;;;;;;;GAOG;AACH,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,aAAa,EAAE,eAAe,CAAC;IAC/B,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;CAChD,CAAC;AAKF,KAAK,yBAAyB,GAAG,aAAa,GAAG,UAAU,CAAC;AAE5D,qBAAa,eACX,SAAQ,iBAAiB,CACvB,yBAAyB,EACzB,YAAY,CAAC,cAAc,CAAC,CAE9B,YAAW,SAAS;;IAEpB,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC;gBAE5B,OAAO,EAAE,sBAAsB;IAS3C;;;;;;;;;;;;OAYG;IACG,WAAW,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6FvC,WAAW,IAAI,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IA8CtD,cAAc,CAClB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,YAAY,CAAC,cAAc,CAAC,EAAE,CAAC;IAgF1C;;;;OAIG;IACG,aAAa,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYzD"}