@reef-knot/ledger-connector 5.2.0-alpha.1 → 5.2.0-alpha.2

package/dist/hid/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/hid/account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAOL,KAAK,OAAO,EACZ,KAAK,YAAY,EAGlB,MAAM,MAAM,CAAC;AAId,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACnC,OAAO,CAAC,CAAC,CAAC,CAAC;AAiBhB,eAAO,MAAM,mBAAmB,YACrB,OAAO,QACV,MAAM,cACA,UAAU,KACrB,YAiFC,CAAC"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../src/hid/account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAE5C,OAAO,EAOL,KAAK,OAAO,EACZ,KAAK,YAAY,EAGlB,MAAM,MAAM,CAAC;AAId,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,EACzB,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACnC,OAAO,CAAC,CAAC,CAAC,CAAC;AAiBhB,eAAO,MAAM,mBAAmB,GAC9B,SAAS,OAAO,EAChB,MAAM,MAAM,EACZ,YAAY,UAAU,KACrB,YAiFC,CAAC"}

package/dist/hid/account.js

@@ -1,6 +1,5 @@
 import { bytesToHex, getTypesForEIP712Domain, hashStruct, serializeSignature, serializeTransaction, stringToHex } from "viem";
 import { toAccount } from "viem/accounts";
-
 //#region src/hid/account.ts
 const RESOLUTION_CONFIG = {
 	erc20: true,
@@ -26,11 +25,12 @@ const createLedgerAccount = (address, path, withEthApp) => toAccount({
 	},
 	async signMessage({ message }) {
 		const messageHex = typeof message === "string" ? stringToHex(message) : typeof message.raw === "string" ? message.raw : bytesToHex(message.raw);
-		return toSignatureHex(await withEthApp((eth) => eth.signPersonalMessage(path, messageHex.slice(2))));
+		const signature = await withEthApp((eth) => eth.signPersonalMessage(path, messageHex.slice(2)));
+		return toSignatureHex(signature);
 	},
 	async signTypedData(parameters) {
 		const { domain = {}, types, primaryType, message } = parameters;
-		return toSignatureHex(await withEthApp(async (eth) => {
+		const signature = await withEthApp(async (eth) => {
 			try {
 				return await eth.signEIP712Message(path, parameters);
 			} catch (error) {
@@ -48,9 +48,9 @@ const createLedgerAccount = (address, path, withEthApp) => toAccount({
 				});
 				return eth.signEIP712HashedMessage(path, domainSeparator.slice(2), messageHash.slice(2));
 			}
-		}));
+		});
+		return toSignatureHex(signature);
 	}
 });
-
 //#endregion
-export { createLedgerAccount };
+export { createLedgerAccount };

package/dist/hid/connector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/hid/connector.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAGrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,eAAO,MAAM,WAAW,cAAc,CAAC;AACvC,eAAO,MAAM,IAAI,WAAW,CAAC;AAG7B,wBAAgB,kBAAkB,CAAC,EACjC,GAAG,EACH,YAAY,GACb,EAAE;IACD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,YAAY,EAAE,KAAK,CAAC;CACrB,yGAuHA;yBA7He,kBAAkB"}
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/hid/connector.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAUrC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,eAAO,MAAM,WAAW,cAAc,CAAC;AACvC,eAAO,MAAM,IAAI,WAAW,CAAC;AAG7B,wBAAgB,kBAAkB,CAAC,EACjC,GAAG,EACH,YAAY,GACb,EAAE;IACD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,YAAY,EAAE,KAAK,CAAC;CACrB,yGAgIA;yBAtIe,kBAAkB"}

package/dist/hid/connector.js

@@ -1,14 +1,13 @@
-import { checkError, clearLedgerDerivationPath } from "./helpers.js";
+import { checkError, clearLedgerAccount, clearLedgerChainId, clearLedgerDerivationPath, restoreLedgerChainId, saveLedgerChainId } from "./helpers.js";
 import { ChainNotConfiguredError, ConnectorNotFoundError, createConnector } from "wagmi";
 import { SwitchChainError } from "viem";
-
 //#region src/hid/connector.ts
 const idLedgerHid = "ledgerHID";
 const name = "Ledger";
 ledgerHIDConnector.type = "ledgerHID";
 function ledgerHIDConnector({ rpc, defaultChain }) {
 	const providers = {};
-	let currentChainId;
+	let currentChainId = restoreLedgerChainId();
 	return createConnector(({ chains, emitter }) => ({
 		id: idLedgerHid,
 		name,
@@ -26,12 +25,13 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 		},
 		async connect({ chainId, withCapabilities = false } = {}) {
 			try {
-				currentChainId = chainId;
-				const provider = await this.getProvider({ chainId });
+				currentChainId = chainId ?? currentChainId;
+				const provider = await this.getProvider({ chainId: currentChainId });
 				provider.on("disconnect", this.onDisconnect);
 				const account = await provider.enable();
 				const connectedChainId = await this.getChainId();
 				currentChainId = connectedChainId;
+				saveLedgerChainId(connectedChainId);
 				return {
 					accounts: withCapabilities ? [{
 						address: account,
@@ -40,7 +40,7 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 					chainId: connectedChainId
 				};
 			} catch (error) {
-				currentChainId = void 0;
+				currentChainId = restoreLedgerChainId();
 				return checkError(error);
 			}
 		},
@@ -51,6 +51,8 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 			});
 			currentChainId = void 0;
 			clearLedgerDerivationPath();
+			clearLedgerChainId();
+			clearLedgerAccount();
 		},
 		async getAccounts() {
 			return [await (await this.getProvider()).getAddress()];
@@ -72,6 +74,7 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 			const chain = chains.find((x) => x.id === chainId);
 			if (!chain) throw new SwitchChainError(new ChainNotConfiguredError());
 			currentChainId = chainId;
+			saveLedgerChainId(chainId);
 			emitter.emit("change", { chainId });
 			return chain;
 		},
@@ -82,6 +85,5 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 		onChainChanged() {}
 	}));
 }
-
 //#endregion
-export { idLedgerHid, ledgerHIDConnector };
+export { idLedgerHid, ledgerHIDConnector, name };

package/dist/hid/constants.d.ts

@@ -1,2 +1,4 @@
 export declare const LS_KEY_DERIVATION_PATH = "reef-knot_ledger-derivation-path";
+export declare const LS_KEY_CHAIN_ID = "reef-knot_ledger-chain-id";
+export declare const LS_KEY_ACCOUNT = "reef-knot_ledger-account";
 //# sourceMappingURL=constants.d.ts.map

package/dist/hid/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/hid/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,qCAAqC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/hid/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,sBAAsB,qCAAqC,CAAC;AACzE,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAC3D,eAAO,MAAM,cAAc,6BAA6B,CAAC"}

package/dist/hid/constants.js

@@ -1,5 +1,6 @@
 //#region src/hid/constants.ts
 const LS_KEY_DERIVATION_PATH = "reef-knot_ledger-derivation-path";
-
+const LS_KEY_CHAIN_ID = "reef-knot_ledger-chain-id";
+const LS_KEY_ACCOUNT = "reef-knot_ledger-account";
 //#endregion
-export { LS_KEY_DERIVATION_PATH };
+export { LS_KEY_ACCOUNT, LS_KEY_CHAIN_ID, LS_KEY_DERIVATION_PATH };

package/dist/hid/helpers.d.ts

@@ -1,3 +1,15 @@
+import { type Address } from 'viem';
+export type PersistedLedgerAccount = {
+    address: Address;
+    path: string;
+};
+export declare const isLockedDeviceError: (error: unknown) => boolean;
 export declare const checkError: (error: any) => never;
 export declare const clearLedgerDerivationPath: () => void;
+export declare const saveLedgerChainId: (chainId: number) => void;
+export declare const restoreLedgerChainId: () => number | undefined;
+export declare const clearLedgerChainId: () => void;
+export declare const saveLedgerAccount: (account: PersistedLedgerAccount) => void;
+export declare const restoreLedgerAccount: () => PersistedLedgerAccount | undefined;
+export declare const clearLedgerAccount: () => void;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/hid/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/hid/helpers.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,UAAU,UAAW,GAAG,KAAG,KAmBvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAErC,CAAC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/hid/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAO/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,OACc,CAAC;AAEpE,eAAO,MAAM,UAAU,GAAI,OAAO,GAAG,KAAG,KAmBvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAErC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,SAAS,MAAM,SAGhD,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAO,MAAM,GAAG,SAMhD,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAG9B,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,SAAS,sBAAsB,SAGhE,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAO,sBAAsB,GAAG,SAchE,CAAC;AAEF,eAAO,MAAM,kBAAkB,YAG9B,CAAC"}

package/dist/hid/helpers.js

@@ -1,6 +1,7 @@
-import { LS_KEY_DERIVATION_PATH } from "./constants.js";
-
+import { LS_KEY_ACCOUNT, LS_KEY_CHAIN_ID, LS_KEY_DERIVATION_PATH } from "./constants.js";
+import { isAddress } from "viem";
 //#region src/hid/helpers.ts
+const isLockedDeviceError = (error) => error?.name === "LockedDeviceError";
 const checkError = (error) => {
 	if (error.statusText === "INS_NOT_SUPPORTED") error.message = "Device is not supported. Make sure the Ethereum app is open on the device.";
 	if (error.statusText === "UNKNOWN_ERROR") error.message = "Unknown error. Make sure the device is connected and the Ethereum app is open on the device.";
@@ -10,6 +11,40 @@ const checkError = (error) => {
 const clearLedgerDerivationPath = () => {
 	window?.localStorage.removeItem(LS_KEY_DERIVATION_PATH);
 };
-
+const saveLedgerChainId = (chainId) => {
+	if (typeof window === "undefined") return;
+	window.localStorage.setItem(LS_KEY_CHAIN_ID, String(chainId));
+};
+const restoreLedgerChainId = () => {
+	if (typeof window === "undefined") return void 0;
+	const stored = window.localStorage.getItem(LS_KEY_CHAIN_ID);
+	if (!stored) return void 0;
+	const chainId = Number(stored);
+	return Number.isInteger(chainId) && chainId > 0 ? chainId : void 0;
+};
+const clearLedgerChainId = () => {
+	if (typeof window === "undefined") return;
+	window.localStorage.removeItem(LS_KEY_CHAIN_ID);
+};
+const saveLedgerAccount = (account) => {
+	if (typeof window === "undefined") return;
+	window.localStorage.setItem(LS_KEY_ACCOUNT, JSON.stringify(account));
+};
+const restoreLedgerAccount = () => {
+	if (typeof window === "undefined") return void 0;
+	const stored = window.localStorage.getItem(LS_KEY_ACCOUNT);
+	if (!stored) return void 0;
+	try {
+		const { address, path } = JSON.parse(stored);
+		if (address && isAddress(address) && typeof path === "string") return {
+			address,
+			path
+		};
+	} catch {}
+};
+const clearLedgerAccount = () => {
+	if (typeof window === "undefined") return;
+	window.localStorage.removeItem(LS_KEY_ACCOUNT);
+};
 //#endregion
-export { checkError, clearLedgerDerivationPath };
+export { checkError, clearLedgerAccount, clearLedgerChainId, clearLedgerDerivationPath, isLockedDeviceError, restoreLedgerAccount, restoreLedgerChainId, saveLedgerAccount, saveLedgerChainId };

package/dist/hid/index.js

@@ -1,2 +1,3 @@
 import { LS_KEY_DERIVATION_PATH } from "./constants.js";
 import { idLedgerHid, ledgerHIDConnector } from "./connector.js";
+export { LS_KEY_DERIVATION_PATH, idLedgerHid, ledgerHIDConnector };

package/dist/hid/provider.d.ts

@@ -31,6 +31,7 @@ export declare class LedgerHQProvider {
     enable(): Promise<Address>;
     resetAccount(): void;
     getAccount(): Promise<LocalAccount>;
+    private readAddress;
     getAddress(): Promise<Address>;
     private getPublicClient;
     private getWalletClient;

package/dist/hid/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/hid/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,eAAe,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAWL,KAAK,OAAO,EACZ,KAAK,KAAK,EAEV,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AA0Bd,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,YAAY,CAAC;AAClC,KAAK,QAAQ,GAAG,MAAM,IAAI,CAAC;AAE3B,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEf,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,eAAe,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IAEjC,OAAO,CAAC,OAAO,CAAC,CAAe;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAS;IAE7B,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,OAAO,CAAC,SAAS,CAAqD;gBAE1D,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAehE,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ;IAI3C,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ;IAIvD,IAAI,CAAC,KAAK,EAAE,aAAa;IAMzB,IAAI,cAAc,WAQjB;IAEK,aAAa;IASb,YAAY,IAAI,OAAO,CAAC,eAAe,CAAC;IAc9C,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAoB3D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBhC,YAAY;IAMN,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC;IAiBnC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC,OAAO,CAAC,eAAe;YAQT,eAAe;YAUf,eAAe;IAuEvB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAW,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CA2C3E"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/hid/provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAC5C,OAAO,KAAK,eAAe,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAYL,KAAK,OAAO,EACZ,KAAK,KAAK,EAEV,KAAK,YAAY,EAIlB,MAAM,MAAM,CAAC;AA6Cd,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC;CACpB,CAAC;AAEF,KAAK,aAAa,GAAG,YAAY,CAAC;AAClC,KAAK,QAAQ,GAAG,MAAM,IAAI,CAAC;AAE3B,qBAAa,gBAAgB;IAC3B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEf,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,eAAe,CAAC;IAE1C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAS;IAEjC,OAAO,CAAC,OAAO,CAAC,CAAe;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAS;IAE7B,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,OAAO,CAAC,YAAY,CAAC,CAAe;IAEpC,OAAO,CAAC,SAAS,CAAqD;gBAE1D,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAehE,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ;IAI3C,cAAc,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,QAAQ;IAIvD,IAAI,CAAC,KAAK,EAAE,aAAa;IAMzB,IAAI,cAAc,WAQjB;IAEK,aAAa;IAQb,YAAY,IAAI,OAAO,CAAC,eAAe,CAAC;IAc9C,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAoB3D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBhC,YAAY;IAMN,UAAU,IAAI,OAAO,CAAC,YAAY,CAAC;YAqC3B,WAAW;IAoBnB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAOpC,OAAO,CAAC,eAAe;YAQT,eAAe;YAUf,eAAe;IAuEvB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAW,EAAE,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;CA0D3E"}

package/dist/hid/provider.js

@@ -1,8 +1,7 @@
-import { LS_KEY_DERIVATION_PATH } from "./constants.js";
-import { checkError } from "./helpers.js";
+import "./constants.js";
+import { checkError, clearLedgerAccount, isLockedDeviceError, restoreLedgerAccount, saveLedgerAccount } from "./helpers.js";
 import { createLedgerAccount } from "./account.js";
-import { createPublicClient, createWalletClient, getAddress, hexToBigInt, hexToNumber, http, isAddress, isAddressEqual, isHex, numberToHex } from "viem";
-
+import { MethodNotSupportedRpcError, createPublicClient, createWalletClient, getAddress, hexToBigInt, hexToNumber, http, isAddress, isAddressEqual, isHex, numberToHex } from "viem";
 //#region src/hid/provider.ts
 const NOOP = () => {};
 const DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/0";
@@ -11,6 +10,15 @@ const TX_TYPES = {
 	"0x1": "eip2930",
 	"0x2": "eip1559"
 };
+const UNSUPPORTED_WALLET_METHODS = /* @__PURE__ */ new Set([
+	"eth_signTransaction",
+	"eth_signTypedData",
+	"eth_signTypedData_v1",
+	"eth_signTypedData_v3",
+	"eth_decrypt",
+	"eth_getEncryptionPublicKey",
+	"personal_ecRecover"
+]);
 let deviceSessionLock = Promise.resolve();
 const withDeviceSession = (fn) => {
 	const result = deviceSessionLock.then(fn);
@@ -35,7 +43,7 @@ var LedgerHQProvider = class {
 		this.listeners[event]?.forEach((listener) => listener());
 	}
 	get derivationPath() {
-		if (typeof window !== "undefined") return window.localStorage.getItem(LS_KEY_DERIVATION_PATH) || DEFAULT_DERIVATION_PATH;
+		if (typeof window !== "undefined") return window.localStorage.getItem("reef-knot_ledger-derivation-path") || DEFAULT_DERIVATION_PATH;
 		return DEFAULT_DERIVATION_PATH;
 	}
 	async loadTransport() {
@@ -94,13 +102,48 @@ var LedgerHQProvider = class {
 	async getAccount() {
 		const path = this.derivationPath;
 		if (!this.account || this.accountPath !== path) {
-			const { address } = await this.withEthApp((eth) => eth.getAddress(path));
-			this.account = createLedgerAccount(getAddress(address), path, (cb) => this.withEthApp(cb));
+			const { address, verifiedByDevice } = await this.readAddress(path);
+			let verified = verifiedByDevice;
+			const withVerifyingEthApp = (cb) => this.withEthApp(async (eth) => {
+				if (!verified) {
+					const actual = await eth.getAddress(path);
+					if (!isAddressEqual(getAddress(actual.address), address)) {
+						clearLedgerAccount();
+						this.resetAccount();
+						this.emit("disconnect");
+						throw new Error("The connected account does not match the device. Please reconnect.");
+					}
+					verified = true;
+				}
+				return cb(eth);
+			});
+			this.account = createLedgerAccount(address, path, withVerifyingEthApp);
 			this.accountPath = path;
 			this.walletClient = void 0;
 		}
 		return this.account;
 	}
+	async readAddress(path) {
+		try {
+			const { address } = await this.withEthApp((eth) => eth.getAddress(path));
+			const checksummed = getAddress(address);
+			saveLedgerAccount({
+				address: checksummed,
+				path
+			});
+			return {
+				address: checksummed,
+				verifiedByDevice: true
+			};
+		} catch (error) {
+			const persisted = restoreLedgerAccount();
+			if (isLockedDeviceError(error) && persisted?.path === path) return {
+				address: persisted.address,
+				verifiedByDevice: false
+			};
+			return checkError(error);
+		}
+	}
 	async getAddress() {
 		const { address } = await this.getAccount();
 		return address;
@@ -181,6 +224,7 @@ var LedgerHQProvider = class {
 				if (typeof params[1] !== "string") throw new Error("eth_signTypedData_v4 arg 1 is not a string");
 				return (await this.getAccount()).signTypedData(JSON.parse(params[1]));
 			default: {
+				if (method.startsWith("wallet_") || UNSUPPORTED_WALLET_METHODS.has(method)) throw new MethodNotSupportedRpcError(/* @__PURE__ */ new Error(`The method ${method} is not supported`), { method });
 				const rpcRequest = this.getPublicClient().request;
 				return rpcRequest({
 					method,
@@ -190,6 +234,5 @@ var LedgerHQProvider = class {
 		}
 	}
 };
-
 //#endregion
-export { LedgerHQProvider };
+export { LedgerHQProvider };

package/dist/iframe/connector.js

@@ -1,6 +1,5 @@
 import { SwitchChainNotSupportedError, createConnector } from "wagmi";
 import { ResourceUnavailableRpcError, UserRejectedRequestError, getAddress, numberToHex } from "viem";
-
 //#region src/iframe/connector.ts
 const idLedgerLive = "ledgerLive";
 const name = "Ledger Live";
@@ -101,6 +100,5 @@ function ledgerLiveConnector({ options, defaultChain }) {
 		}
 	}));
 }
-
 //#endregion
-export { idLedgerLive, ledgerLiveConnector, name };
+export { idLedgerLive, ledgerLiveConnector, name };

package/dist/iframe/helpers.js

@@ -9,6 +9,5 @@ const isLedgerLive = () => {
 		return false;
 	}
 };
-
 //#endregion
-export { isIframe, isLedgerLive };
+export { isIframe, isLedgerLive };

package/dist/iframe/index.js

@@ -1,2 +1,3 @@
 import { idLedgerLive, ledgerLiveConnector, name } from "./connector.js";
 import { isIframe, isLedgerLive } from "./helpers.js";
+export { idLedgerLive, isIframe, isLedgerLive, ledgerLiveConnector, name };

package/dist/iframe/provider.js

@@ -1,11 +1,9 @@
 import { IFrameEthereumProvider } from "@ledgerhq/iframe-provider";
-
 //#region src/iframe/provider.ts
 var LedgerIFrameProvider = class extends IFrameEthereumProvider {
 	request({ method, params }) {
 		return this.send(method, params);
 	}
 };
-
 //#endregion
-export { LedgerIFrameProvider };
+export { LedgerIFrameProvider };

package/dist/index.js

@@ -4,5 +4,4 @@ import "./iframe/index.js";
 import { LS_KEY_DERIVATION_PATH } from "./hid/constants.js";
 import { idLedgerHid, ledgerHIDConnector } from "./hid/connector.js";
 import "./hid/index.js";
-
-export { LS_KEY_DERIVATION_PATH, idLedgerHid, idLedgerLive, isIframe, isLedgerLive, ledgerHIDConnector, ledgerLiveConnector, name };
+export { LS_KEY_DERIVATION_PATH, idLedgerHid, idLedgerLive, isIframe, isLedgerLive, ledgerHIDConnector, ledgerLiveConnector, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/ledger-connector",
-  "version": "5.2.0-alpha.1",
+  "version": "5.2.0-alpha.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -38,7 +38,7 @@
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {
-    "@types/w3c-web-hid": "^1.0.2",
+    "@types/w3c-web-hid": "^1.0.7",
     "build-config": "*",
     "eslint-config-custom": "*",
     "viem": ">=2.50",