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

package/dist/hid/account.d.ts

@@ -0,0 +1,5 @@
+import type Eth from '@ledgerhq/hw-app-eth';
+import { type Address, type LocalAccount } from 'viem';
+export type WithEthApp = <T>(callback: (eth: Eth) => T | Promise<T>) => Promise<T>;
+export declare const createLedgerAccount: (address: Address, path: string, withEthApp: WithEthApp) => LocalAccount;
+//# sourceMappingURL=account.d.ts.map

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

@@ -0,0 +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"}

package/dist/hid/account.js

@@ -0,0 +1,56 @@
+import { bytesToHex, getTypesForEIP712Domain, hashStruct, serializeSignature, serializeTransaction, stringToHex } from "viem";
+import { toAccount } from "viem/accounts";
+
+//#region src/hid/account.ts
+const RESOLUTION_CONFIG = {
+	erc20: true,
+	externalPlugins: true,
+	nft: true
+};
+const shouldFallbackToHashedSigning = (error) => error?.statusText === "INS_NOT_SUPPORTED";
+const toSignatureHex = ({ r, s, v }) => serializeSignature({
+	r: `0x${r}`,
+	s: `0x${s}`,
+	v: BigInt(v)
+});
+const createLedgerAccount = (address, path, withEthApp) => toAccount({
+	address,
+	async signTransaction(transaction, { serializer = serializeTransaction } = {}) {
+		const unsignedRawTx = (await serializer(transaction)).slice(2);
+		const { r, s, v } = await withEthApp((eth) => eth.clearSignTransaction(path, unsignedRawTx, RESOLUTION_CONFIG, true));
+		return serializer(transaction, {
+			r: `0x${r}`,
+			s: `0x${s}`,
+			v: BigInt(`0x${v}`)
+		});
+	},
+	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))));
+	},
+	async signTypedData(parameters) {
+		const { domain = {}, types, primaryType, message } = parameters;
+		return toSignatureHex(await withEthApp(async (eth) => {
+			try {
+				return await eth.signEIP712Message(path, parameters);
+			} catch (error) {
+				if (!shouldFallbackToHashedSigning(error)) throw error;
+				const typedDataDomain = domain;
+				const domainSeparator = hashStruct({
+					data: typedDataDomain,
+					primaryType: "EIP712Domain",
+					types: { EIP712Domain: getTypesForEIP712Domain({ domain: typedDataDomain }) }
+				});
+				const messageHash = hashStruct({
+					data: message,
+					primaryType,
+					types
+				});
+				return eth.signEIP712HashedMessage(path, domainSeparator.slice(2), messageHash.slice(2));
+			}
+		}));
+	}
+});
+
+//#endregion
+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,yGAiHA;yBAvHe,kBAAkB"}
+{"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"}

package/dist/hid/connector.js

@@ -1,5 +1,6 @@
 import { checkError, clearLedgerDerivationPath } from "./helpers.js";
 import { ChainNotConfiguredError, ConnectorNotFoundError, createConnector } from "wagmi";
+import { SwitchChainError } from "viem";
 
 //#region src/hid/connector.ts
 const idLedgerHid = "ledgerHID";
@@ -7,46 +8,55 @@ const name = "Ledger";
 ledgerHIDConnector.type = "ledgerHID";
 function ledgerHIDConnector({ rpc, defaultChain }) {
 	const providers = {};
+	let currentChainId;
 	return createConnector(({ chains, emitter }) => ({
 		id: idLedgerHid,
 		name,
 		type: ledgerHIDConnector.type,
 		async getProvider({ chainId } = {}) {
-			const chain = chains.find((x) => x.id === chainId) ?? defaultChain;
+			const chain = chains.find((x) => x.id === (chainId ?? currentChainId)) ?? defaultChain;
 			if (!providers[chain.id]) {
 				const { LedgerHQProvider } = await import("./provider.js");
-				providers[chain.id] = new LedgerHQProvider({ url: rpc?.[chain.id] }, chain.id);
+				providers[chain.id] = new LedgerHQProvider({
+					chain,
+					rpcUrl: rpc?.[chain.id]
+				});
 			}
 			return providers[chain.id];
 		},
-		async connect({ withCapabilities = false } = {}) {
+		async connect({ chainId, withCapabilities = false } = {}) {
 			try {
-				const provider = await this.getProvider();
+				currentChainId = chainId;
+				const provider = await this.getProvider({ chainId });
 				provider.on("disconnect", this.onDisconnect);
 				const account = await provider.enable();
-				const chainId = await this.getChainId();
+				const connectedChainId = await this.getChainId();
+				currentChainId = connectedChainId;
 				return {
 					accounts: withCapabilities ? [{
 						address: account,
 						capabilities: {}
 					}] : [account],
-					chainId
+					chainId: connectedChainId
 				};
 			} catch (error) {
+				currentChainId = void 0;
 				return checkError(error);
 			}
 		},
 		async disconnect() {
-			(await this.getProvider()).removeListener("disconnect", this.onDisconnect);
+			Object.values(providers).forEach((provider) => {
+				provider.removeListener("disconnect", this.onDisconnect);
+				provider.resetAccount();
+			});
+			currentChainId = void 0;
 			clearLedgerDerivationPath();
 		},
 		async getAccounts() {
 			return [await (await this.getProvider()).getAddress()];
 		},
 		async getChainId() {
-			const { chainId } = await (await this.getProvider()).getNetwork();
-			if (chainId) return chainId;
-			throw new ChainNotConfiguredError();
+			return (await this.getProvider()).chain.id;
 		},
 		async isAuthorized() {
 			try {
@@ -59,22 +69,11 @@ function ledgerHIDConnector({ rpc, defaultChain }) {
 			}
 		},
 		async switchChain({ chainId }) {
-			const id = chainId.toString(16);
-			emitter.emit("change", { chainId: Number(chainId) });
-			return Promise.resolve(chains.find((x) => x.id === chainId) ?? {
-				id: chainId,
-				name: `Chain ${id}`,
-				network: `${id}`,
-				nativeCurrency: {
-					decimals: 18,
-					name: "Ether",
-					symbol: "ETH"
-				},
-				rpcUrls: {
-					default: { http: [""] },
-					public: { http: [""] }
-				}
-			});
+			const chain = chains.find((x) => x.id === chainId);
+			if (!chain) throw new SwitchChainError(new ChainNotConfiguredError());
+			currentChainId = chainId;
+			emitter.emit("change", { chainId });
+			return chain;
 		},
 		onDisconnect() {
 			emitter.emit("disconnect");

package/dist/hid/helpers.d.ts

@@ -1,13 +1,3 @@
-import { BigNumberish } from '@ethersproject/bignumber';
-import { TransactionRequestExtended, UnsignedTransactionStrict } from './types';
-export declare const isHIDSupported: () => boolean;
-export declare const hasEIP1559: (tx: {
-    type?: number;
-    maxFeePerGas?: BigNumberish;
-    maxPriorityFeePerGas?: BigNumberish;
-}) => boolean;
-export declare const toNumber: (value: BigNumberish | undefined | null) => number | undefined;
-export declare const convertToUnsigned: (tx: TransactionRequestExtended) => Promise<UnsignedTransactionStrict>;
 export declare const checkError: (error: any) => never;
 export declare const clearLedgerDerivationPath: () => 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":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAGhF,eAAO,MAAM,cAAc,eAM1B,CAAC;AAEF,eAAO,MAAM,UAAU,OAAQ;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,oBAAoB,CAAC,EAAE,YAAY,CAAC;CACrC,YAIA,CAAC;AAEF,eAAO,MAAM,QAAQ,UACZ,YAAY,GAAG,SAAS,GAAG,IAAI,KACrC,MAAM,GAAG,SAEX,CAAC;AAEF,eAAO,MAAM,iBAAiB,OACxB,0BAA0B,KAC7B,OAAO,CAAC,yBAAyB,CAgCnC,CAAC;AAEF,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":"AAEA,eAAO,MAAM,UAAU,UAAW,GAAG,KAAG,KAmBvC,CAAC;AAEF,eAAO,MAAM,yBAAyB,YAErC,CAAC"}

package/dist/hid/helpers.js

@@ -1,37 +1,6 @@
 import { LS_KEY_DERIVATION_PATH } from "./constants.js";
-import { BigNumber } from "@ethersproject/bignumber";
-import { resolveProperties } from "@ethersproject/properties";
 
 //#region src/hid/helpers.ts
-const hasEIP1559 = (tx) => {
-	return tx.type === 2 || tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null;
-};
-const toNumber = (value) => {
-	return value == null ? void 0 : BigNumber.from(value).toNumber();
-};
-const convertToUnsigned = async (tx) => {
-	const resolvedTx = await resolveProperties(tx);
-	const { chainId, data, gasLimit, gas, gasPrice, value, to } = resolvedTx;
-	const nonce = toNumber(resolvedTx.nonce);
-	const type = toNumber(resolvedTx.type);
-	const baseTx = {
-		gasLimit: gasLimit || gas,
-		type: type ?? 2,
-		chainId,
-		gasPrice,
-		nonce,
-		value,
-		data,
-		to
-	};
-	if (tx.accessList != null) baseTx.accessList = tx.accessList;
-	if (hasEIP1559(tx)) {
-		baseTx.maxFeePerGas = tx.maxFeePerGas;
-		baseTx.maxPriorityFeePerGas = tx.maxPriorityFeePerGas;
-		baseTx.type = 2;
-	}
-	return baseTx;
-};
 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.";
@@ -43,4 +12,4 @@ const clearLedgerDerivationPath = () => {
 };
 
 //#endregion
-export { checkError, clearLedgerDerivationPath, convertToUnsigned, toNumber };
+export { checkError, clearLedgerDerivationPath };

package/dist/hid/provider.d.ts

@@ -1,21 +1,41 @@
-import { JsonRpcBatchProvider, Network } from '@ethersproject/providers';
+import type Eth from '@ledgerhq/hw-app-eth';
 import type TransportWebHID from '@ledgerhq/hw-transport-webhid';
-import { LedgerHQSigner } from './signer';
-export declare class LedgerHQProvider extends JsonRpcBatchProvider {
-    signer?: LedgerHQSigner;
+import { type Address, type Chain, type LocalAccount } from 'viem';
+type RequestArguments = {
+    method: string;
+    params?: unknown[];
+};
+type ProviderEvent = 'disconnect';
+type Listener = () => void;
+export declare class LedgerHQProvider {
+    readonly chain: Chain;
     device?: HIDDevice;
     transport?: typeof TransportWebHID;
-    constructor(...args: any[]);
+    private readonly rpcUrl?;
+    private account?;
+    private accountPath?;
+    private publicClient?;
+    private walletClient?;
+    private listeners;
+    constructor({ chain, rpcUrl }: {
+        chain: Chain;
+        rpcUrl?: string;
+    });
+    on(event: ProviderEvent, listener: Listener): void;
+    removeListener(event: ProviderEvent, listener: Listener): void;
+    emit(event: ProviderEvent): void;
+    get derivationPath(): string;
     loadTransport(): Promise<void>;
-    getSigner(): LedgerHQSigner;
-    listAccounts(): Promise<Array<string>>;
-    detectNetwork(): Promise<Network>;
     getTransport(): Promise<TransportWebHID>;
-    enable(): Promise<string>;
-    getAddress(): Promise<string>;
-    request({ method, params, }: {
-        method: string;
-        params: Array<unknown>;
-    }): Promise<unknown>;
+    withEthApp<T>(callback: (eth: Eth) => T | Promise<T>): Promise<T>;
+    enable(): Promise<Address>;
+    resetAccount(): void;
+    getAccount(): Promise<LocalAccount>;
+    getAddress(): Promise<Address>;
+    private getPublicClient;
+    private getWalletClient;
+    private sendTransaction;
+    request({ method, params }: RequestArguments): Promise<unknown>;
 }
+export {};
 //# sourceMappingURL=provider.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/hid/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,KAAK,eAAe,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAI1C,qBAAa,gBAAiB,SAAQ,oBAAoB;IACjD,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB,MAAM,CAAC,EAAE,SAAS,CAAC;IAEnB,SAAS,CAAC,EAAE,OAAO,eAAe,CAAC;gBAE9B,GAAG,IAAI,EAAE,GAAG,EAAE;IAKpB,aAAa;IASnB,SAAS,IAAI,cAAc;IAI3B,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAItC,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,YAAY,IAAI,OAAO,CAAC,eAAe,CAAC;IAcxC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC;IAyBzB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAK7B,OAAO,CAAC,EACZ,MAAM,EACN,MAAM,GACP,EAAE;QACD,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB,GAAG,OAAO,CAAC,OAAO,CAAC;CAwCrB"}
+{"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"}

package/dist/hid/provider.js

@@ -1,14 +1,42 @@
-import { checkError, convertToUnsigned } from "./helpers.js";
-import { LedgerHQSigner } from "./signer.js";
-import { arrayify } from "@ethersproject/bytes";
-import { JsonRpcBatchProvider } from "@ethersproject/providers";
-import invariant from "tiny-invariant";
+import { LS_KEY_DERIVATION_PATH } from "./constants.js";
+import { checkError } from "./helpers.js";
+import { createLedgerAccount } from "./account.js";
+import { createPublicClient, createWalletClient, getAddress, hexToBigInt, hexToNumber, http, isAddress, isAddressEqual, isHex, numberToHex } from "viem";
 
 //#region src/hid/provider.ts
-var LedgerHQProvider = class extends JsonRpcBatchProvider {
-	constructor(...args) {
-		super(...args);
-		this.signer = this.getSigner();
+const NOOP = () => {};
+const DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/0";
+const TX_TYPES = {
+	"0x0": "legacy",
+	"0x1": "eip2930",
+	"0x2": "eip1559"
+};
+let deviceSessionLock = Promise.resolve();
+const withDeviceSession = (fn) => {
+	const result = deviceSessionLock.then(fn);
+	deviceSessionLock = result.then(NOOP, NOOP);
+	return result;
+};
+var LedgerHQProvider = class {
+	constructor({ chain, rpcUrl }) {
+		this.listeners = {};
+		this.chain = chain;
+		this.rpcUrl = rpcUrl;
+		if (!rpcUrl) console.warn(`[reef-knot] No RPC URL configured for chain ${chain.id} (${chain.name}), falling back to its default public RPC endpoint`);
+	}
+	on(event, listener) {
+		var _this$listeners;
+		((_this$listeners = this.listeners)[event] ?? (_this$listeners[event] = /* @__PURE__ */ new Set())).add(listener);
+	}
+	removeListener(event, listener) {
+		this.listeners[event]?.delete(listener);
+	}
+	emit(event) {
+		this.listeners[event]?.forEach((listener) => listener());
+	}
+	get derivationPath() {
+		if (typeof window !== "undefined") return window.localStorage.getItem(LS_KEY_DERIVATION_PATH) || DEFAULT_DERIVATION_PATH;
+		return DEFAULT_DERIVATION_PATH;
 	}
 	async loadTransport() {
 		if (!this.transport) {
@@ -16,15 +44,6 @@ var LedgerHQProvider = class extends JsonRpcBatchProvider {
 			this.transport = TransportWebHID;
 		}
 	}
-	getSigner() {
-		return new LedgerHQSigner(this);
-	}
-	listAccounts() {
-		throw new Error("method is not implemented");
-	}
-	detectNetwork() {
-		return Promise.resolve(this._network);
-	}
 	async getTransport() {
 		await this.loadTransport();
 		try {
@@ -35,6 +54,21 @@ var LedgerHQProvider = class extends JsonRpcBatchProvider {
 			return checkError(error);
 		}
 	}
+	withEthApp(callback) {
+		return withDeviceSession(async () => {
+			const transport = await this.getTransport();
+			try {
+				const { default: Eth } = await import("@ledgerhq/hw-app-eth");
+				const eth = new Eth(transport);
+				await eth.getAppConfiguration();
+				return await callback(eth);
+			} catch (error) {
+				return checkError(error);
+			} finally {
+				await transport.close();
+			}
+		});
+	}
 	async enable() {
 		try {
 			await this.loadTransport();
@@ -46,49 +80,113 @@ var LedgerHQProvider = class extends JsonRpcBatchProvider {
 				}
 			};
 			hid.addEventListener("disconnect", onDisconnect);
-			if (!this.signer) this.signer = this.getSigner();
+			this.resetAccount();
 			return await this.getAddress();
 		} catch (error) {
 			return checkError(error);
 		}
 	}
+	resetAccount() {
+		this.account = void 0;
+		this.accountPath = void 0;
+		this.walletClient = void 0;
+	}
+	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));
+			this.accountPath = path;
+			this.walletClient = void 0;
+		}
+		return this.account;
+	}
 	async getAddress() {
-		invariant(this.signer, "Signer is not defined");
-		return await this.signer.getAddress();
+		const { address } = await this.getAccount();
+		return address;
+	}
+	getPublicClient() {
+		this.publicClient ?? (this.publicClient = createPublicClient({
+			chain: this.chain,
+			transport: http(this.rpcUrl, { batch: true })
+		}));
+		return this.publicClient;
 	}
-	async request({ method, params }) {
-		invariant(this.signer, "Signer is not defined");
+	async getWalletClient() {
+		const account = await this.getAccount();
+		this.walletClient ?? (this.walletClient = createWalletClient({
+			account,
+			chain: this.chain,
+			transport: http(this.rpcUrl, { batch: true })
+		}));
+		return this.walletClient;
+	}
+	async sendTransaction(transaction) {
+		const walletClient = await this.getWalletClient();
+		const account = walletClient.account;
+		if (transaction.from && (!isAddress(transaction.from) || !isAddressEqual(transaction.from, account.address))) throw new Error("from address mismatch");
+		const type = transaction.type ? TX_TYPES[transaction.type] : void 0;
+		const request = {
+			account,
+			chain: this.chain,
+			to: transaction.to ?? void 0,
+			data: transaction.data,
+			value: transaction.value ? hexToBigInt(transaction.value) : void 0,
+			gas: transaction.gas ? hexToBigInt(transaction.gas) : void 0,
+			nonce: transaction.nonce != null ? hexToNumber(transaction.nonce) : void 0
+		};
+		const accessList = transaction.accessList;
+		const gasPrice = transaction.gasPrice ? hexToBigInt(transaction.gasPrice) : void 0;
+		if (type === "legacy") return walletClient.sendTransaction({
+			...request,
+			type: "legacy",
+			gasPrice
+		});
+		if (type === "eip2930") return walletClient.sendTransaction({
+			...request,
+			type: "eip2930",
+			gasPrice,
+			accessList
+		});
+		if (!type && gasPrice) return walletClient.sendTransaction({
+			...request,
+			gasPrice,
+			accessList
+		});
+		return walletClient.sendTransaction({
+			...request,
+			type,
+			accessList,
+			maxFeePerGas: transaction.maxFeePerGas ? hexToBigInt(transaction.maxFeePerGas) : void 0,
+			maxPriorityFeePerGas: transaction.maxPriorityFeePerGas ? hexToBigInt(transaction.maxPriorityFeePerGas) : void 0
+		});
+	}
+	async request({ method, params = [] }) {
 		switch (method) {
-			case "eth_sendTransaction": {
-				const sourceTx = params[0];
-				const unsignedTx = await convertToUnsigned(sourceTx);
-				const signedTx = await this.signer.signTransaction(unsignedTx);
-				return this.send("eth_sendRawTransaction", [signedTx]);
-			}
-			case "eth_accounts": return [await this.getAddress()];
-			case "eth_signTypedData_v4": {
-				if (typeof params[1] !== "string") throw new Error("eth_signTypedData_v4 arg 1 is not a string");
-				const payload = JSON.parse(params[1]);
-				return await this.signer.__signEIP712Message({
-					domain: payload.domain,
-					types: payload.types,
-					primaryType: payload.primaryType,
-					message: payload.message
-				});
-			}
+			case "eth_chainId": return numberToHex(this.chain.id);
+			case "eth_accounts":
+			case "eth_requestAccounts": return [await this.getAddress()];
+			case "eth_sendTransaction": return this.sendTransaction(params[0]);
 			case "personal_sign": {
 				const messageHex = params[0];
-				if (typeof messageHex !== "string") throw new Error("personal_sign message must be a string");
-				const messageBytes = arrayify(messageHex);
-				return await this.signer.signMessage(messageBytes);
+				if (!isHex(messageHex)) throw new Error("personal_sign message must be a hex string");
+				return (await this.getAccount()).signMessage({ message: { raw: messageHex } });
 			}
 			case "eth_sign": {
 				const messageHex = params[1];
-				if (typeof messageHex !== "string") throw new Error("eth_sign message must be a string");
-				const messageBytes = arrayify(messageHex);
-				return await this.signer.signMessage(messageBytes);
+				if (!isHex(messageHex)) throw new Error("eth_sign message must be a hex string");
+				return (await this.getAccount()).signMessage({ message: { raw: messageHex } });
+			}
+			case "eth_signTypedData_v4":
+				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: {
+				const rpcRequest = this.getPublicClient().request;
+				return rpcRequest({
+					method,
+					params
+				});
 			}
-			default: return this.send(method, params);
 		}
 	}
 };

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

@@ -1 +1 @@
-{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/iframe/connector.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAIrC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,YAAY,eAAe,CAAC;AACzC,eAAO,MAAM,IAAI,gBAAgB,CAAC;AAElC,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,6BAA6B,CAAC;IACxC,YAAY,EAAE,KAAK,CAAC;CACrB,CAAC;AAGF,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,YAAY,GACb,EAAE,uBAAuB,6GAmJzB;yBAtJe,mBAAmB"}
+{"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../src/iframe/connector.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,eAAO,MAAM,YAAY,eAAe,CAAC;AACzC,eAAO,MAAM,IAAI,gBAAgB,CAAC;AAElC,KAAK,uBAAuB,GAAG;IAC7B,OAAO,CAAC,EAAE,6BAA6B,CAAC;IACxC,YAAY,EAAE,KAAK,CAAC;CACrB,CAAC;AAGF,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,YAAY,GACb,EAAE,uBAAuB,6GA0IzB;yBA7Ie,mBAAmB"}

package/dist/iframe/connector.js

@@ -1,8 +1,5 @@
 import { SwitchChainNotSupportedError, createConnector } from "wagmi";
-import { ResourceUnavailableRpcError, UserRejectedRequestError } from "viem";
-import { getAddress } from "@ethersproject/address";
-import { hexValue } from "@ethersproject/bytes";
-import { Web3Provider } from "@ethersproject/providers";
+import { ResourceUnavailableRpcError, UserRejectedRequestError, getAddress, numberToHex } from "viem";
 
 //#region src/iframe/connector.ts
 const idLedgerLive = "ledgerLive";
@@ -48,7 +45,7 @@ function ledgerLiveConnector({ options, defaultChain }) {
 		},
 		async switchChain({ chainId }) {
 			const provider = await this.getProvider();
-			const id = hexValue(chainId);
+			const id = numberToHex(chainId);
 			try {
 				await provider.send("wallet_switchEthereumChain", [{ chainId: id }]);
 				return chains.find((x) => x.id === chainId) ?? {
@@ -72,16 +69,12 @@ function ledgerLiveConnector({ options, defaultChain }) {
 			}
 		},
 		async getAccounts() {
-			return (await (await this.getProvider()).send("eth_requestAccounts")).map(getAddress);
+			return (await (await this.getProvider()).send("eth_requestAccounts")).map((account) => getAddress(account));
 		},
 		async getChainId() {
 			const chainId = await (await this.getProvider()).send("eth_chainId");
 			return Number(chainId);
 		},
-		async getSigner() {
-			const [provider, accounts] = await Promise.all([this.getProvider(), this.getAccounts()]);
-			return new Web3Provider(provider).getSigner(accounts[0]);
-		},
 		async isAuthorized() {
 			try {
 				return !!(await (await this.getProvider()).send("eth_accounts"))[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reef-knot/ledger-connector",
-  "version": "5.1.0",
+  "version": "5.2.0-alpha.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -45,22 +45,10 @@
     "wagmi": ">=3.6"
   },
   "dependencies": {
-    "@ethersproject/abstract-signer": "^5.7.0",
-    "@ethersproject/address": "^5.7.0",
-    "@ethersproject/bignumber": "^5.7.0",
-    "@ethersproject/bytes": "^5.7.0",
-    "@ethersproject/hash": "^5.7.0",
-    "@ethersproject/properties": "^5.7.0",
-    "@ethersproject/providers": "^5.7.2",
-    "@ethersproject/strings": "^5.7.0",
-    "@ethersproject/transactions": "^5.7.0",
-    "@ledgerhq/hw-app-eth": "^6.37.1",
-    "@ledgerhq/hw-transport": "^6.31.0",
-    "@ledgerhq/hw-transport-webhid": "^6.29.0",
-    "@ledgerhq/iframe-provider": "^0.4.3",
-    "@web3-react/abstract-connector": "^6.0.7",
-    "@web3-react/types": "^6.0.7",
-    "tiny-invariant": "^1.2.0"
+    "@ledgerhq/hw-app-eth": "7.8.12",
+    "@ledgerhq/hw-transport": "6.35.7",
+    "@ledgerhq/hw-transport-webhid": "6.36.0",
+    "@ledgerhq/iframe-provider": "^0.4.3"
   },
   "peerDependencies": {
     "@tanstack/react-query": "^5.29.0",

package/dist/hid/signer.d.ts

@@ -1,29 +0,0 @@
-import type Eth from '@ledgerhq/hw-app-eth';
-import { LoadConfig, ResolutionConfig } from '@ledgerhq/hw-app-eth/lib/services/types';
-import { EIP712Message } from '@ledgerhq/types-live';
-import { JsonRpcSigner, TransactionRequest } from '@ethersproject/providers';
-import { Signer, TypedDataDomain, TypedDataField, TypedDataSigner } from '@ethersproject/abstract-signer';
-import { UnsignedTransaction } from '@ethersproject/transactions';
-import { Bytes } from '@ethersproject/bytes';
-import type { LedgerHQProvider } from './provider';
-import type { UnsignedTransactionStrict } from './types';
-export declare class LedgerHQSigner extends Signer implements TypedDataSigner {
-    readonly provider: LedgerHQProvider;
-    get path(): string;
-    _index: number;
-    _address: string;
-    constructor(provider: LedgerHQProvider);
-    withEthApp<T>(callback: (eth: Eth) => T): Promise<T>;
-    getAddress(): Promise<string>;
-    signMessage(message: Bytes | string): Promise<string>;
-    populateUnsigned(transaction: UnsignedTransactionStrict): Promise<UnsignedTransaction>;
-    signTransaction(transaction: TransactionRequest, loadConfig?: LoadConfig, resolutionConfig?: ResolutionConfig): Promise<string>;
-    connect(provider: LedgerHQProvider): JsonRpcSigner;
-    connectUnchecked(): JsonRpcSigner;
-    sendUncheckedTransaction(): Promise<string>;
-    unlock(): Promise<boolean>;
-    _legacySignMessage(_message: Bytes | string): Promise<string>;
-    _signTypedData(domain: TypedDataDomain, _types: Record<string, Array<TypedDataField>>, value: Record<string, any>): Promise<string>;
-    __signEIP712Message(data: EIP712Message): Promise<string>;
-}
-//# sourceMappingURL=signer.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/hid/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EACL,UAAU,EACV,gBAAgB,EACjB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAsB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EACL,MAAM,EACN,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAa,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAE7E,OAAO,EAAE,KAAK,EAA0B,MAAM,sBAAsB,CAAC;AAMrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAIzD,qBAAa,cAAe,SAAQ,MAAO,YAAW,eAAe;IACnE,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IAEpC,IAAI,IAAI,WAKP;IAGD,MAAM,SAAK;IACX,QAAQ,SAAM;gBAEF,QAAQ,EAAE,gBAAgB;IAKhC,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAiBpD,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAM7B,WAAW,CAAC,OAAO,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAiBrD,gBAAgB,CACpB,WAAW,EAAE,yBAAyB,GACrC,OAAO,CAAC,mBAAmB,CAAC;IAczB,eAAe,CACnB,WAAW,EAAE,kBAAkB,EAC/B,UAAU,GAAE,UAAe,EAC3B,gBAAgB,GAAE,gBAAqB,GACtC,OAAO,CAAC,MAAM,CAAC;IAuBlB,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa;IAKlD,gBAAgB,IAAI,aAAa;IAKjC,wBAAwB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAK1B,kBAAkB,CAAC,QAAQ,EAAE,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK7D,cAAc,CAClB,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,EAC7C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACzB,OAAO,CAAC,MAAM,CAAC;IA8BZ,mBAAmB,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;CAOhE"}

package/dist/hid/signer.js

@@ -1,146 +0,0 @@
-import { LS_KEY_DERIVATION_PATH } from "./constants.js";
-import { checkError, convertToUnsigned, toNumber } from "./helpers.js";
-import { hexlify, joinSignature } from "@ethersproject/bytes";
-import { BigNumber } from "@ethersproject/bignumber";
-import { Signer } from "@ethersproject/abstract-signer";
-import { serialize } from "@ethersproject/transactions";
-import { toUtf8Bytes } from "@ethersproject/strings";
-import { _TypedDataEncoder } from "@ethersproject/hash";
-
-//#region src/hid/signer.ts
-const defaultPath = "m/44'/60'/0'/0/0";
-var LedgerHQSigner = class LedgerHQSigner extends Signer {
-	get path() {
-		if (typeof window !== "undefined") return window.localStorage.getItem(LS_KEY_DERIVATION_PATH) || defaultPath;
-		return defaultPath;
-	}
-	constructor(provider) {
-		super();
-		this._index = 0;
-		this._address = "";
-		this.provider = provider;
-	}
-	async withEthApp(callback) {
-		const transport = await this.provider.getTransport();
-		try {
-			const { default: Eth } = await import("@ledgerhq/hw-app-eth");
-			const eth = new Eth(transport);
-			await eth.getAppConfiguration();
-			return await callback(eth);
-		} catch (error) {
-			return checkError(error);
-		} finally {
-			await transport.close();
-		}
-	}
-	async getAddress() {
-		const account = await this.withEthApp((eth) => eth.getAddress(this.path));
-		this._address = this.provider.formatter.address(account.address);
-		return this._address;
-	}
-	async signMessage(message) {
-		if (typeof message === "string") message = toUtf8Bytes(message);
-		const messageHex = hexlify(message).substring(2);
-		const sig = await this.withEthApp((eth) => eth.signPersonalMessage(this.path, messageHex));
-		sig.r = `0x${sig.r}`;
-		sig.s = `0x${sig.s}`;
-		return joinSignature(sig);
-	}
-	async populateUnsigned(transaction) {
-		const populated = await this.populateTransaction(transaction);
-		const nonce = toNumber(populated.nonce);
-		if (populated.type === 0) {
-			const { gasLimit, type, chainId, gasPrice, value, data, to } = populated;
-			return {
-				gasLimit,
-				type,
-				chainId,
-				gasPrice,
-				nonce,
-				value,
-				data,
-				to
-			};
-		}
-		return {
-			...populated,
-			nonce
-		};
-	}
-	async signTransaction(transaction, loadConfig = {}, resolutionConfig = {}) {
-		const unsignedTx = await convertToUnsigned(transaction);
-		const populatedTx = await this.populateUnsigned(unsignedTx);
-		const serializedTx = serialize(populatedTx).substring(2);
-		const { ledgerService } = await import("@ledgerhq/hw-app-eth");
-		const resolution = await ledgerService.resolveTransaction(serializedTx, loadConfig, resolutionConfig);
-		const sig = await this.withEthApp((eth) => eth.signTransaction(this.path, serializedTx, resolution));
-		return serialize(populatedTx, {
-			v: BigNumber.from(`0x${sig.v}`).toNumber(),
-			r: `0x${sig.r}`,
-			s: `0x${sig.s}`
-		});
-	}
-	connect(provider) {
-		return new LedgerHQSigner(provider);
-	}
-	connectUnchecked() {
-		throw new Error("method is not implemented");
-	}
-	sendUncheckedTransaction() {
-		throw new Error("method is not implemented");
-	}
-	async unlock() {
-		throw new Error("method is not implemented");
-	}
-	async _legacySignMessage(_message) {
-		throw new Error("method is not implemented");
-	}
-	async _signTypedData(domain, _types, value) {
-		const types = { ..._types };
-		delete types.EIP712Domain;
-		const encoder = new _TypedDataEncoder(types);
-		const data = {
-			domain: {
-				name: domain.name,
-				verifyingContract: domain.verifyingContract,
-				version: domain.version,
-				chainId: domain.chainId ? parseInt(domain.chainId.toString()) : void 0
-			},
-			types: {
-				...types,
-				EIP712Domain: [
-					{
-						name: "name",
-						type: "string"
-					},
-					{
-						name: "version",
-						type: "string"
-					},
-					{
-						name: "chainId",
-						type: "uint256"
-					},
-					{
-						name: "verifyingContract",
-						type: "address"
-					}
-				]
-			},
-			primaryType: encoder.primaryType,
-			message: value
-		};
-		return this.__signEIP712Message(data);
-	}
-	async __signEIP712Message(data) {
-		const { r, s, v } = await this.withEthApp((eth) => eth.signEIP712Message(this.path, data));
-		return joinSignature({
-			r: `0x${r}`,
-			s: `0x${s}`,
-			v
-		});
-	}
-};
-
-//#endregion
-export { LedgerHQSigner };

package/dist/hid/types.d.ts

@@ -1,10 +0,0 @@
-import { BigNumberish } from '@ethersproject/bignumber';
-import { TransactionRequest } from '@ethersproject/providers';
-import { UnsignedTransaction } from '@ethersproject/transactions';
-export type UnsignedTransactionStrict = Omit<UnsignedTransaction, 'type'> & {
-    type?: number;
-};
-export type TransactionRequestExtended = TransactionRequest & {
-    gas?: BigNumberish;
-};
-//# sourceMappingURL=types.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/hid/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAElE,MAAM,MAAM,yBAAyB,GAAG,IAAI,CAAC,mBAAmB,EAAE,MAAM,CAAC,GAAG;IAC1E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG,kBAAkB,GAAG;IAC5D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB,CAAC"}