@flarenetwork/multichain-wallet-connector 0.0.2-rc.19 → 0.0.2-rc.20

package/dist/core/index.d.mts

@@ -1,2 +1,2 @@
-import { $ as MultiChainEvents, A as ConnectorTypeMap, B as LedgerConnectOptions, C as ConnectorClientMap, D as ConnectorProviderMap, E as ConnectorProvider, F as XrpClient, G as ChainChangedEvent, H as LedgerPaginatedBip44, I as EvmClient, J as DcentWalletOptions, K as ChainOverride, L as ChainClient, M as XamanSendTxOptions, N as LedgerSession, O as ConnectorSendTxOptions, P as DcentConnector, Q as MetaMaskWalletOptions, R as LedgerCaip2, S as ConnectorClient, T as ConnectorConnectOptionsMap, U as Bip44, V as LedgerHDStandard, W as AccountChangedEvent, X as ErrorEvent, Y as DisconnectEvent, Z as LedgerWalletOptions, _ as ConfigResolver, _t as XRPlCaip2, a as shortenAddress, at as XamanWalletOptions, c as WalletConnectError, d as DcentError, dt as BaseChain, et as MultiChainOptions, f as WalletError, ft as Caip2, g as MultiChain, gt as NonEvmChain, h as ChainGuards, ht as EvmChain, i as objectValues, it as WalletOptions, j as ConnectorXrpClientMap, k as ConnectorSendTxOptionsMap, l as MetaMaskError, m as ErrorCodeKey, mt as Eip155Caip2, n as objectFromEntries, nt as WalletConnectWalletOptions, o as WalletErrorHelper, ot as WalletAddressState, p as ErrorCode, pt as Chain, q as ConnectEvent, r as objectKeys, rt as WalletMetadata, s as XamanError, st as WalletState, t as objectEntries, tt as ResolvedWalletConfig, u as LedgerError, ut as WalletType, vt as XrplChain, w as ConnectorConnectOptions, x as Connector, z as LedgerComputedAddress } from "../index-B91Vi5c1.mjs";
+import { $ as MultiChainEvents, A as ConnectorTypeMap, B as LedgerConnectOptions, C as ConnectorClientMap, D as ConnectorProviderMap, E as ConnectorProvider, F as XrpClient, G as ChainChangedEvent, H as LedgerPaginatedBip44, I as EvmClient, J as DcentWalletOptions, K as ChainOverride, L as ChainClient, M as XamanSendTxOptions, N as LedgerSession, O as ConnectorSendTxOptions, P as DcentConnector, Q as MetaMaskWalletOptions, R as LedgerCaip2, S as ConnectorClient, T as ConnectorConnectOptionsMap, U as Bip44, V as LedgerHDStandard, W as AccountChangedEvent, X as ErrorEvent, Y as DisconnectEvent, Z as LedgerWalletOptions, _ as ConfigResolver, _t as XRPlCaip2, a as shortenAddress, at as XamanWalletOptions, c as WalletConnectError, d as DcentError, dt as BaseChain, et as MultiChainOptions, f as WalletError, ft as Caip2, g as MultiChain, gt as NonEvmChain, h as ChainGuards, ht as EvmChain, i as objectValues, it as WalletOptions, j as ConnectorXrpClientMap, k as ConnectorSendTxOptionsMap, l as MetaMaskError, m as ErrorCodeKey, mt as Eip155Caip2, n as objectFromEntries, nt as WalletConnectWalletOptions, o as WalletErrorHelper, ot as WalletAddressState, p as ErrorCode, pt as Chain, q as ConnectEvent, r as objectKeys, rt as WalletMetadata, s as XamanError, st as WalletState, t as objectEntries, tt as ResolvedWalletConfig, u as LedgerError, ut as WalletType, vt as XrplChain, w as ConnectorConnectOptions, x as Connector, z as LedgerComputedAddress } from "../index-CqHqSoVT.mjs";
 export { AccountChangedEvent, BaseChain, Bip44, Caip2, Chain, ChainChangedEvent, ChainClient, ChainGuards, ChainOverride, ConfigResolver, ConnectEvent, Connector, ConnectorClient, ConnectorClientMap, ConnectorConnectOptions, ConnectorConnectOptionsMap, ConnectorProvider, ConnectorProviderMap, ConnectorSendTxOptions, ConnectorSendTxOptionsMap, ConnectorTypeMap, ConnectorXrpClientMap, DcentConnector, DcentError, DcentWalletOptions, DisconnectEvent, Eip155Caip2, ErrorCode, ErrorCodeKey, ErrorEvent, EvmChain, EvmClient, LedgerCaip2, LedgerComputedAddress, LedgerConnectOptions, LedgerError, LedgerHDStandard, LedgerPaginatedBip44, LedgerSession, LedgerWalletOptions, MetaMaskError, MetaMaskWalletOptions, MultiChain, MultiChainEvents, MultiChainOptions, NonEvmChain, ResolvedWalletConfig, WalletAddressState, WalletConnectError, WalletConnectWalletOptions, WalletError, WalletErrorHelper, WalletMetadata, WalletOptions, WalletState, WalletType, XRPlCaip2, XamanError, XamanSendTxOptions, XamanWalletOptions, XrpClient, XrplChain, objectEntries, objectFromEntries, objectKeys, objectValues, shortenAddress };

package/dist/core/index.mjs

@@ -1,2 +1,2 @@
-import { _ as objectFromEntries, a as WalletErrorHelper, b as shortenAddress, c as MetaMaskError, d as WalletError, f as ErrorCode, g as objectEntries, h as ChainGuards, i as DcentConnector, l as LedgerError, n as EvmClient, o as XamanError, p as ConfigResolver, r as Bip44, s as WalletConnectError, t as MultiChain, u as DcentError, v as objectKeys, y as objectValues } from "../core-cK8XqrC0.mjs";
+import { _ as objectFromEntries, a as WalletErrorHelper, b as shortenAddress, c as MetaMaskError, d as WalletError, f as ErrorCode, g as objectEntries, h as ChainGuards, i as DcentConnector, l as LedgerError, n as EvmClient, o as XamanError, p as ConfigResolver, r as Bip44, s as WalletConnectError, t as MultiChain, u as DcentError, v as objectKeys, y as objectValues } from "../core-B2j441gB.mjs";
 export { Bip44, ChainGuards, ConfigResolver, DcentConnector, DcentError, ErrorCode, EvmClient, LedgerError, MetaMaskError, MultiChain, WalletConnectError, WalletError, WalletErrorHelper, XamanError, objectEntries, objectFromEntries, objectKeys, objectValues, shortenAddress };

package/dist/{core-cK8XqrC0.mjs → core-B2j441gB.mjs}

@@ -536,6 +536,10 @@ var LedgerError = class LedgerError extends WalletError {
 				match: (e) => e instanceof LockedDeviceError,
 				code: "LEDGER_DEVICE_LOCKED"
 			},
+			{
+				match: (e) => e instanceof TransportStatusError && (e.statusCode === StatusCodes.LOCKED_DEVICE || e.statusCode === StatusCodes.CLA_NOT_SUPPORTED),
+				code: "LEDGER_DEVICE_LOCKED"
+			},
 			{
 				match: (e) => e instanceof TransportStatusError && (e.statusCode === StatusCodes.USER_REFUSED_ON_DEVICE || e.statusCode === StatusCodes.CONDITIONS_OF_USE_NOT_SATISFIED),
 				code: "LEDGER_TX_REJECTED"
@@ -1159,25 +1163,6 @@ var LedgerAddressHelper = class {
 	}
 };
 //#endregion
-//#region src/core/connectors/ledger/apps/ledger-app-verification.ts
-const MAX_ATTEMPTS = 4;
-const RETRY_DELAY_MS = 500;
-async function verifyLedgerAppActive(transport, expectedAppName) {
-	for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
-		const name = await getActiveAppName(transport);
-		if (name === expectedAppName) return;
-		if (attempt === MAX_ATTEMPTS) throw new LedgerError("LEDGER_WRONG_APP", /* @__PURE__ */ new Error(`Expected ${expectedAppName} app, currently running: ${name}`));
-		console.debug(`[Ledger] verifyActive(): expected ${expectedAppName}, got ${name}, attempt ${attempt}/${MAX_ATTEMPTS}`);
-		await new Promise((r) => setTimeout(r, RETRY_DELAY_MS));
-	}
-}
-async function getActiveAppName(transport) {
-	const response = await transport.send(176, 1, 0, 0);
-	if (response[0] !== 1) throw new LedgerError("LEDGER_APP_NOT_OPEN");
-	const nameLength = response[1];
-	return response.subarray(2, 2 + nameLength).toString("ascii");
-}
-//#endregion
 //#region src/core/connectors/ledger/apps/ethereum/ethereum-viem-adapter.ts
 async function ledgerToEthAccount({ ledger, derivationPath }) {
 	const resolvedPath = derivationPath ?? `44'/60'/0'/0/0`;
@@ -1240,10 +1225,14 @@ async function ledgerToEthAccount({ ledger, derivationPath }) {
 }
 //#endregion
 //#region src/core/connectors/ledger/apps/ethereum/ethereum-ledger-app.ts
-var EthereumLedgerApp = class extends Eth {
-	constructor(transport, appName) {
+var EthereumLedgerApp = class EthereumLedgerApp extends Eth {
+	constructor(transportManager, appName, transport) {
 		super(transport);
 		this.appName = appName;
+		this.transportManager = transportManager;
+	}
+	static async create(transportManager, appName) {
+		return new EthereumLedgerApp(transportManager, appName, await transportManager.open());
 	}
 	async getComputedAddress(bip44, _hrp) {
 		return {
@@ -1261,7 +1250,7 @@ var EthereumLedgerApp = class extends Eth {
 		});
 	}
 	async verifyActive() {
-		await verifyLedgerAppActive(this.transport, this.appName);
+		await this.transportManager.verifyApp(this.appName);
 	}
 };
 //#endregion
@@ -1308,10 +1297,14 @@ async function ledgerToFlareAccount({ ledger, derivationPath }) {
 }
 //#endregion
 //#region src/core/connectors/ledger/apps/flare/flare-ledger-app.ts
-var FlareLedgerApp = class extends FlareApp {
-	constructor(transport, appName) {
+var FlareLedgerApp = class FlareLedgerApp extends FlareApp {
+	constructor(transportManager, appName, transport) {
 		super(transport);
 		this.appName = appName;
+		this.transportManager = transportManager;
+	}
+	static async create(transportManager, appName) {
+		return new FlareLedgerApp(transportManager, appName, await transportManager.open());
 	}
 	async getComputedAddress(bip44, hrp) {
 		const addressData = await this.getAddressAndPubKey(bip44.getFullPath(), hrp);
@@ -1330,16 +1323,27 @@ var FlareLedgerApp = class extends FlareApp {
 		});
 	}
 	async verifyActive() {
-		await verifyLedgerAppActive(this.transport, this.appName);
+		await this.transportManager.verifyApp(this.appName);
 	}
 };
 //#endregion
 //#region src/core/connectors/ledger/apps/xrp/xrp-ledger-app.ts
-var XrpLedgerApp = class extends Xrp {
-	constructor(transport, appName) {
-		super(transport);
+var XrpLedgerApp = class {
+	constructor(transportManager, appName) {
+		this.xrp = null;
+		this.transportManager = transportManager;
 		this.appName = appName;
 	}
+	async getXrp() {
+		if (!this.xrp) this.xrp = new Xrp(await this.transportManager.open());
+		return this.xrp;
+	}
+	async getAddress(path) {
+		return (await this.getXrp()).getAddress(path);
+	}
+	async signTransaction(path, rawTxHex) {
+		return (await this.getXrp()).signTransaction(path, rawTxHex);
+	}
 	async getComputedAddress(bip44, _hrp) {
 		const pathWithoutMaster = bip44.getPathWithoutMaster();
 		return {
@@ -1351,7 +1355,9 @@ var XrpLedgerApp = class extends Xrp {
 		return LedgerAddressHelper.getComputedAddresses(this, bip44s, hrp);
 	}
 	async verifyActive() {
-		await verifyLedgerAppActive(this.transport, this.appName);
+		await this.transportManager.close();
+		await this.transportManager.verifyApp(this.appName);
+		this.xrp = null;
 	}
 };
 //#endregion
@@ -1372,14 +1378,14 @@ var LedgerAppFactory = class {
 		if (!apps?.length) throw new LedgerError("COMMON_CHAIN_NOT_SUPPORTED");
 		return apps[0];
 	}
-	static createApp(chain, transport) {
+	static async createApp(chain, transportManager) {
 		const validApps = CHAIN_TO_APP[chain];
 		if (!validApps?.length) throw new LedgerError("COMMON_CHAIN_NOT_SUPPORTED");
 		const appName = validApps[0];
 		switch (appName) {
-			case "XRP": return new XrpLedgerApp(transport, appName);
-			case "Ethereum": return new EthereumLedgerApp(transport, appName);
-			case "Flare Network": return new FlareLedgerApp(transport, appName);
+			case "XRP": return new XrpLedgerApp(transportManager, appName);
+			case "Ethereum": return EthereumLedgerApp.create(transportManager, appName);
+			case "Flare Network": return FlareLedgerApp.create(transportManager, appName);
 			case "Doge": throw new LedgerError("COMMON_CHAIN_NOT_SUPPORTED");
 		}
 	}
@@ -1781,6 +1787,10 @@ var LedgerTransportManager = class {
 		console.debug("[Ledger] TransportManager.open(): creating new transport (will prompt user)");
 		return await TransportWebHID.create();
 	}
+	async verifyApp(expectedAppName) {
+		const { name } = await this.getCurrentApp();
+		if (name !== expectedAppName) throw new LedgerError("LEDGER_WRONG_APP", /* @__PURE__ */ new Error(`Expected ${expectedAppName} app, currently running: ${name}`));
+	}
 	async close() {
 		if (this.transport) {
 			console.debug("[Ledger] TransportManager.close(): closing transport");
@@ -1875,9 +1885,8 @@ var LedgerConnector = class extends BaseConnector {
 		throw new LedgerError("COMMON_FEATURE_NOT_SUPPORTED");
 	}
 	async fetchAddressesForSelection(chain, paths) {
-		const transport = await this.transportManager.open();
 		await this.requireApp(chain);
-		return LedgerAppFactory.createApp(chain, transport).getComputedAddresses(paths, this.resolvedConfig.getChain(chain).ledgerHrp);
+		return (await LedgerAppFactory.createApp(chain, this.transportManager)).getComputedAddresses(paths, this.resolvedConfig.getChain(chain).ledgerHrp);
 	}
 	async performConnect(chain, options) {
 		console.debug("[Ledger] performConnect() started", {
@@ -1938,11 +1947,9 @@ var LedgerConnector = class extends BaseConnector {
 	async establishConnection(chain, options) {
 		console.debug("[Ledger] establishConnection() started", { chain });
 		try {
-			const transport = await this.transportManager.open();
-			console.debug("[Ledger] establishConnection(): transport opened");
 			await this.requireApp(chain);
 			console.debug("[Ledger] establishConnection(): app verified");
-			const app = LedgerAppFactory.createApp(chain, transport);
+			const app = await LedgerAppFactory.createApp(chain, this.transportManager);
 			const hrp = this.resolvedConfig.getChain(chain).ledgerHrp;
 			const result = {
 				account: await app.getComputedAddress(options.bip44, hrp),
@@ -2952,4 +2959,4 @@ var MultiChain = class {
 //#endregion
 export { objectFromEntries as _, WalletErrorHelper as a, shortenAddress as b, MetaMaskError as c, WalletError as d, ErrorCode as f, objectEntries as g, ChainGuards as h, DcentConnector as i, LedgerError as l, evmCaip2s as m, EvmClient as n, XamanError as o, ConfigResolver as p, Bip44 as r, WalletConnectError as s, MultiChain as t, DcentError as u, objectKeys as v, objectValues as y };
 
-//# sourceMappingURL=core-cK8XqrC0.mjs.map
+//# sourceMappingURL=core-B2j441gB.mjs.map