@flarenetwork/multichain-wallet-connector 0.0.2-rc.2 → 0.0.2-rc.21

package/dist/{multichain-BZs-jPka.mjs → core-1pT9AVKV.mjs}

@@ -1,7 +1,7 @@
 import { createPublicClient, createWalletClient, custom, defineChain, getAddress, getTypesForEIP712Domain, hashDomain, hashStruct, http, serializeSignature, serializeTransaction } from "viem";
 import { flare, flareTestnet, mainnet, sepolia, songbird } from "viem/chains";
-import { DisconnectedDevice, DisconnectedDeviceDuringOperation, LockedDeviceError, TransportInterfaceNotAvailable, TransportOpenUserCancelled, UserRefusedOnDevice } from "@ledgerhq/errors";
-import { Client, RippledError, encode, parseAccountRootFlags } from "xrpl";
+import { Client, RippledError, XrplError, encode, parseAccountRootFlags } from "xrpl";
+import { DisconnectedDevice, DisconnectedDeviceDuringOperation, LockedDeviceError, StatusCodes, TransportInterfaceNotAvailable, TransportOpenUserCancelled, TransportRaceCondition, TransportStatusError } from "@ledgerhq/errors";
 import Eth from "@ledgerhq/hw-app-eth";
 import * as secp256k1 from "@noble/secp256k1";
 import { publicKeyToAddress, toAccount } from "viem/accounts";
@@ -9,12 +9,11 @@ import { bytesToHex } from "viem/utils";
 import { FlareApp } from "@zondax/ledger-flare";
 import Xrp from "@ledgerhq/hw-app-xrp";
 import TransportWebHID from "@ledgerhq/hw-transport-webhid";
-import { MetaMaskSDK } from "@metamask/sdk";
+import { createEVMClient } from "@metamask/connect-evm";
 import { createAppKit } from "@reown/appkit";
 import UniversalProvider from "@walletconnect/universal-provider";
 import { Xumm } from "xumm";
 import { createStore } from "@xstate/store";
-
 //#region src/core/shared/type-utils.ts
 var TypeUtils = class {
 	static isError(value) {
@@ -27,7 +26,6 @@ var TypeUtils = class {
 		return typeof value === "string";
 	}
 };
-
 //#endregion
 //#region src/core/utils/utils.ts
 /**
@@ -64,7 +62,6 @@ function isEmptyObject(value) {
 function stripEmptyObjects(obj) {
 	return objectFromEntries(objectEntries(obj).filter(([, v]) => !isEmptyObject(v)));
 }
-
 //#endregion
 //#region src/core/chains/chain.constants.ts
 const CAIP2_NAMESPACES = {
@@ -87,7 +84,6 @@ const CAIP2 = {
 	},
 	[CAIP2_NAMESPACES.bip122]: { "1a91e3dace36e2be3bf030a65679fe821": "Dogecoin Mainnet" }
 };
-
 //#endregion
 //#region src/core/chains/chain.utils.ts
 var ChainGuards = class {
@@ -156,7 +152,6 @@ function createChainConfig(config) {
 		}];
 	}));
 }
-
 //#endregion
 //#region src/core/chains/viem/custom-chains.ts
 const flareCoston = defineChain({
@@ -175,7 +170,6 @@ const flareCoston = defineChain({
 	} },
 	testnet: true
 });
-
 //#endregion
 //#region src/core/chains/chain-registry.ts
 function defineChainRegistry(registry) {
@@ -304,7 +298,6 @@ const isCaip2 = (caip2) => {
 	if (!caip2) return false;
 	return Object.hasOwn(chainConfig, caip2);
 };
-
 //#endregion
 //#region src/core/config/config-resolver.ts
 var ConfigResolver = class ConfigResolver {
@@ -402,7 +395,6 @@ var ConfigResolver = class ConfigResolver {
 		});
 	}
 };
-
 //#endregion
 //#region src/core/errors/error-codes.ts
 /**
@@ -428,6 +420,7 @@ const errorCodeMap = {
 	4008: "COMMON_NO_ACCOUNTS",
 	4009: "COMMON_PROVIDER_ERROR",
 	4010: "COMMON_CONNECTION_IN_PROGRESS",
+	4011: "COMMON_TX_EXPIRED",
 	4100: "METAMASK_PROVIDER_NOT_FOUND",
 	4101: "METAMASK_CHAIN_NOT_ADDED",
 	4102: "METAMASK_NOT_INSTALLED",
@@ -437,6 +430,7 @@ const errorCodeMap = {
 	4203: "LEDGER_TRANSPORT_ERROR",
 	4204: "LEDGER_CONNECTION_FAILED",
 	4205: "LEDGER_TX_REJECTED",
+	4206: "LEDGER_DEVICE_BUSY",
 	4300: "WALLET_CONNECT_SESSION_EXPIRED",
 	4301: "WALLET_CONNECT_PAIRING_FAILED",
 	4302: "WALLET_CONNECT_SESSION_NOT_FOUND",
@@ -458,44 +452,44 @@ function buildReverseMap() {
 	return objectFromEntries(entries);
 }
 const ErrorCode = buildReverseMap();
-
 //#endregion
 //#region src/core/errors/error-messages.ts
 /**
 * Human-readable error messages for each error code.
 */
 const ErrorMessages = {
-	COMMON_USER_REJECTED: "User rejected the request",
-	COMMON_NOT_CONNECTED: "Wallet is not connected",
-	COMMON_CHAIN_NOT_CONFIGURED: "Chain is not configured",
-	COMMON_CHAIN_NOT_SUPPORTED: "Chain is not supported by this wallet",
-	COMMON_FEATURE_NOT_SUPPORTED: "Feature is not supported by this wallet",
-	COMMON_CONNECTION_FAILED: "Connection failed",
-	COMMON_UNKNOWN_CHAIN_ID: "Unknown chain ID",
-	COMMON_NO_ACCOUNTS: "No accounts available",
-	COMMON_PROVIDER_ERROR: "Provider error",
-	COMMON_CONNECTION_IN_PROGRESS: "Connection already in progress",
-	METAMASK_PROVIDER_NOT_FOUND: "MetaMask provider not found",
-	METAMASK_CHAIN_NOT_ADDED: "Chain is not added to MetaMask",
-	METAMASK_NOT_INSTALLED: "MetaMask is not installed",
-	LEDGER_DEVICE_LOCKED: "Ledger device is locked",
-	LEDGER_APP_NOT_OPEN: "Please open the correct app on your Ledger",
-	LEDGER_WRONG_APP: "Wrong app is open on Ledger device",
-	LEDGER_TRANSPORT_ERROR: "Ledger transport error",
-	LEDGER_CONNECTION_FAILED: "Failed to connect to Ledger device",
-	LEDGER_TX_REJECTED: "Transaction rejected on Ledger device",
-	WALLET_CONNECT_SESSION_EXPIRED: "WalletConnect session has expired",
-	WALLET_CONNECT_PAIRING_FAILED: "WalletConnect pairing failed",
-	WALLET_CONNECT_SESSION_NOT_FOUND: "WalletConnect session not found",
-	WALLET_CONNECT_PROVIDER_NOT_INITIALIZED: "WalletConnect provider not initialized",
-	XAMAN_SIGN_REJECTED: "Sign request rejected in Xaman",
-	XAMAN_QR_TIMEOUT: "Xaman QR scan timed out",
-	XAMAN_SDK_NOT_READY: "Xaman SDK is not ready",
-	XAMAN_AUTHORIZATION_FAILED: "Xaman authorization failed",
-	DCENT_NOT_IN_BROWSER: "D'CENT in-app browser not detected",
-	DCENT_SIGN_REJECTED: "Transaction rejected in D'CENT wallet"
+	COMMON_USER_REJECTED: "User rejected the request.",
+	COMMON_NOT_CONNECTED: "Wallet is not connected.",
+	COMMON_CHAIN_NOT_CONFIGURED: "Chain is not configured.",
+	COMMON_CHAIN_NOT_SUPPORTED: "Chain is not supported by this wallet.",
+	COMMON_FEATURE_NOT_SUPPORTED: "Feature is not supported by this wallet.",
+	COMMON_CONNECTION_FAILED: "Connection failed.",
+	COMMON_UNKNOWN_CHAIN_ID: "Unknown chain ID.",
+	COMMON_NO_ACCOUNTS: "No accounts available.",
+	COMMON_PROVIDER_ERROR: "Provider error.",
+	COMMON_CONNECTION_IN_PROGRESS: "Connection already in progress.",
+	COMMON_TX_EXPIRED: "Transaction expired. Please try again.",
+	METAMASK_PROVIDER_NOT_FOUND: "MetaMask provider not found.",
+	METAMASK_CHAIN_NOT_ADDED: "Chain is not added to MetaMask.",
+	METAMASK_NOT_INSTALLED: "MetaMask is not installed.",
+	LEDGER_DEVICE_LOCKED: "Ledger device is locked.",
+	LEDGER_APP_NOT_OPEN: "Please open the correct app on your Ledger.",
+	LEDGER_WRONG_APP: "Wrong app is open on Ledger device.",
+	LEDGER_TRANSPORT_ERROR: "Ledger transport error.",
+	LEDGER_CONNECTION_FAILED: "Failed to connect to Ledger device.",
+	LEDGER_TX_REJECTED: "Transaction rejected on Ledger device.",
+	LEDGER_DEVICE_BUSY: "An action is already pending on the Ledger device. Please deny or reconnect.",
+	WALLET_CONNECT_SESSION_EXPIRED: "WalletConnect session has expired.",
+	WALLET_CONNECT_PAIRING_FAILED: "WalletConnect pairing failed.",
+	WALLET_CONNECT_SESSION_NOT_FOUND: "WalletConnect session not found.",
+	WALLET_CONNECT_PROVIDER_NOT_INITIALIZED: "WalletConnect provider not initialized.",
+	XAMAN_SIGN_REJECTED: "Sign request rejected in Xaman.",
+	XAMAN_QR_TIMEOUT: "Xaman QR scan timed out.",
+	XAMAN_SDK_NOT_READY: "Xaman SDK is not ready.",
+	XAMAN_AUTHORIZATION_FAILED: "Xaman authorization failed.",
+	DCENT_NOT_IN_BROWSER: "D'CENT in-app browser not detected.",
+	DCENT_SIGN_REJECTED: "Transaction rejected in D'CENT wallet."
 };
-
 //#endregion
 //#region src/core/errors/wallet-error.ts
 var WalletError = class extends Error {
@@ -510,7 +504,18 @@ var WalletError = class extends Error {
 		Object.setPrototypeOf(this, new.target.prototype);
 	}
 };
-
+//#endregion
+//#region src/core/clients/xrp/xrpl-error.ts
+var XrplWalletError = class XrplWalletError extends WalletError {
+	constructor(walletType, code, cause) {
+		super(walletType, code, cause);
+		this.name = "XrplWalletError";
+	}
+	static fromError(error, walletType) {
+		if (error instanceof XrplError && error.message.includes("tefMAX_LEDGER")) return new XrplWalletError(walletType, "COMMON_TX_EXPIRED", error);
+		return null;
+	}
+};
 //#endregion
 //#region src/core/connectors/dcent/dcent-error.ts
 var DcentError = class extends WalletError {
@@ -522,7 +527,6 @@ var DcentError = class extends WalletError {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/ledger-error.ts
 var LedgerError = class LedgerError extends WalletError {
@@ -533,7 +537,11 @@ var LedgerError = class LedgerError extends WalletError {
 				code: "LEDGER_DEVICE_LOCKED"
 			},
 			{
-				match: (e) => e instanceof UserRefusedOnDevice,
+				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"
 			},
 			{
@@ -551,6 +559,14 @@ var LedgerError = class LedgerError extends WalletError {
 			{
 				match: (e) => e instanceof TransportInterfaceNotAvailable,
 				code: "LEDGER_CONNECTION_FAILED"
+			},
+			{
+				match: (e) => e instanceof TransportRaceCondition,
+				code: "LEDGER_DEVICE_BUSY"
+			},
+			{
+				match: (e) => e instanceof TransportStatusError,
+				code: "LEDGER_TRANSPORT_ERROR"
 			}
 		];
 	}
@@ -564,7 +580,6 @@ var LedgerError = class LedgerError extends WalletError {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/core/utils/chain-utils.ts
 /**
@@ -593,7 +608,6 @@ var ChainUtils = class ChainUtils {
 		return map;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/metamask/metamask-error.ts
 var MetaMaskError = class MetaMaskError extends WalletError {
@@ -606,7 +620,6 @@ var MetaMaskError = class MetaMaskError extends WalletError {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/wallet-connect-error.ts
 var WalletConnectError = class WalletConnectError extends WalletError {
@@ -619,7 +632,6 @@ var WalletConnectError = class WalletConnectError extends WalletError {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/xaman/xaman-error.ts
 var XamanError = class extends WalletError {
@@ -631,7 +643,6 @@ var XamanError = class extends WalletError {
 		return null;
 	}
 };
-
 //#endregion
 //#region src/core/errors/wallet-error-helper.ts
 var WalletErrorHelper = class {
@@ -640,6 +651,8 @@ var WalletErrorHelper = class {
 	}
 	static from(error, walletType) {
 		if (error instanceof WalletError) return error;
+		const xrplError = XrplWalletError.fromError(error, walletType);
+		if (xrplError) return xrplError;
 		switch (walletType) {
 			case "ledger": return LedgerError.fromError(error);
 			case "wallet-connect": return WalletConnectError.fromError(error);
@@ -650,7 +663,6 @@ var WalletErrorHelper = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/core/utils/error-utils.ts
 var ErrorUtils = class ErrorUtils {
@@ -669,7 +681,6 @@ var ErrorUtils = class ErrorUtils {
 		return new Error(ErrorUtils.extractMessage(error));
 	}
 };
-
 //#endregion
 //#region src/core/connectors/connector-events.ts
 var ConnectorEventEmitter = class {
@@ -735,7 +746,6 @@ var ConnectorEventEmitter = class {
 		return addresses;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/base-connector.ts
 var BaseConnector = class {
@@ -766,8 +776,8 @@ var BaseConnector = class {
 	}
 	/**
 	* Reset init state so next operation re-initializes the SDK.
-	* Required for MetaMask/Xaman (SDK terminates on disconnect).
-	* WalletConnect should NOT call this — its provider survives disconnect.
+	* Required for Xaman (SDK terminates on disconnect).
+	* MetaMask and WalletConnect should NOT call this — their providers survive disconnect.
 	*/
 	resetInitialization() {
 		this.initPromise = null;
@@ -792,7 +802,6 @@ var BaseConnector = class {
 		});
 	}
 };
-
 //#endregion
 //#region src/core/clients/xrp/base-xrpl-client.ts
 var BaseXrplClient = class extends Client {
@@ -826,7 +835,6 @@ var BaseXrplClient = class extends Client {
 		}
 	}
 };
-
 //#endregion
 //#region src/core/clients/xrp/xrpl-client.ts
 var XrplClient = class extends BaseXrplClient {
@@ -841,7 +849,6 @@ var XrplClient = class extends BaseXrplClient {
 		await super.onDestroy();
 	}
 };
-
 //#endregion
 //#region src/core/connectors/dcent/dcent-xrpl-client.ts
 var DcentXrpClient = class {
@@ -860,8 +867,8 @@ var DcentXrpClient = class {
 				autofill: true
 			}]
 		});
-		if (!result?.tx_hash) throw new DcentError("DCENT_SIGN_REJECTED");
-		return result.tx_hash;
+		if (!result?.hash) throw new DcentError("DCENT_SIGN_REJECTED");
+		return result.hash;
 	}
 	async getBalance(address) {
 		return (await this.getSimpleClient()).getBalance(address);
@@ -881,7 +888,6 @@ var DcentXrpClient = class {
 	}
 	async onDestroy() {}
 };
-
 //#endregion
 //#region src/core/connectors/dcent/dcent-connector.ts
 const DCENT_NETWORK_MAP = {
@@ -955,7 +961,6 @@ var DcentConnector = class DcentConnector extends BaseConnector {
 		return this.store.getSnapshot().context.connectionState;
 	}
 };
-
 //#endregion
 //#region src/core/shared/bip44.ts
 const BIP44_HARDENED_OFFSET = 2147483648;
@@ -1103,7 +1108,6 @@ var Bip44 = class Bip44 {
 		return component.hardened ? component.value + BIP44_HARDENED_OFFSET : component.value;
 	}
 };
-
 //#endregion
 //#region src/core/shared/connection-mutex.ts
 /**
@@ -1128,7 +1132,6 @@ var ConnectionMutex = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-hex-utils.ts
 var LedgerHexUtils = class {
@@ -1142,7 +1145,6 @@ var LedgerHexUtils = class {
 		return `0x${Array.from(buffer).map((item) => item.toString(16).padStart(2, "0")).join("")}`;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-address-helper.ts
 var LedgerAddressHelper = class {
@@ -1160,7 +1162,6 @@ var LedgerAddressHelper = class {
 		return publicKeyToAddress(LedgerHexUtils.fromBuffer(point.toBytes(false)));
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/apps/ethereum/ethereum-viem-adapter.ts
 async function ledgerToEthAccount({ ledger, derivationPath }) {
@@ -1222,10 +1223,17 @@ async function ledgerToEthAccount({ ledger, derivationPath }) {
 		source: "ledger"
 	};
 }
-
 //#endregion
 //#region src/core/connectors/ledger/apps/ethereum/ethereum-ledger-app.ts
-var EthereumLedgerApp = class extends Eth {
+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 {
 			address: (await this.getAddress(bip44.getFullPath())).address,
@@ -1241,8 +1249,10 @@ var EthereumLedgerApp = class extends Eth {
 			derivationPath: bip44.getPathWithoutMaster()
 		});
 	}
+	async verifyActive() {
+		await this.transportManager.verifyApp(this.appName);
+	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/apps/flare/flare-viem-adapter.ts
 async function ledgerToFlareAccount({ ledger, derivationPath }) {
@@ -1285,10 +1295,17 @@ async function ledgerToFlareAccount({ ledger, derivationPath }) {
 		source: "ledger"
 	};
 }
-
 //#endregion
 //#region src/core/connectors/ledger/apps/flare/flare-ledger-app.ts
-var FlareLedgerApp = class extends FlareApp {
+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);
 		return {
@@ -1305,11 +1322,28 @@ var FlareLedgerApp = class extends FlareApp {
 			derivationPath: bip44.getPathWithoutMaster()
 		});
 	}
+	async verifyActive() {
+		await this.transportManager.verifyApp(this.appName);
+	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/apps/xrp/xrp-ledger-app.ts
-var XrpLedgerApp = class extends Xrp {
+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 {
@@ -1320,8 +1354,12 @@ var XrpLedgerApp = class extends Xrp {
 	async getComputedAddresses(bip44s, hrp) {
 		return LedgerAddressHelper.getComputedAddresses(this, bip44s, hrp);
 	}
+	async verifyActive() {
+		await this.transportManager.close();
+		await this.transportManager.verifyApp(this.appName);
+		this.xrp = null;
+	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-app-factory.ts
 const CHAIN_TO_APP = {
@@ -1340,18 +1378,18 @@ 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");
-		switch (validApps[0]) {
-			case "XRP": return new XrpLedgerApp(transport);
-			case "Ethereum": return new EthereumLedgerApp(transport);
-			case "Flare Network": return new FlareLedgerApp(transport);
+		const appName = validApps[0];
+		switch (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");
 		}
 	}
 };
-
 //#endregion
 //#region src/core/chains/viem/viem-helper.ts
 var ViemHelper = class ViemHelper {
@@ -1395,7 +1433,6 @@ var ViemHelper = class ViemHelper {
 		};
 	}
 };
-
 //#endregion
 //#region src/core/clients/base-evm-client.ts
 var BaseEvmClient = class {
@@ -1407,7 +1444,6 @@ var BaseEvmClient = class {
 	}
 	async onDestroy() {}
 };
-
 //#endregion
 //#region src/core/clients/evm/evm-client.ts
 /**
@@ -1470,7 +1506,6 @@ var EvmClient = class EvmClient extends BaseEvmClient {
 		return this.chainConfig;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/clients/ledger-evm-client.ts
 var LedgerEvmClient = class LedgerEvmClient extends EvmClient {
@@ -1484,8 +1519,10 @@ var LedgerEvmClient = class LedgerEvmClient extends EvmClient {
 	getLedgerApp() {
 		return this._app;
 	}
+	async verifyDevice() {
+		await this._app.verifyActive();
+	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/clients/ledger-xrp-client.ts
 var LedgerXrpClient = class extends XrplClient {
@@ -1501,19 +1538,23 @@ var LedgerXrpClient = class extends XrplClient {
 		const path = this.args.bip44.getPathWithoutMaster();
 		return app.getAddress(path);
 	}
+	async verifyDevice() {
+		await this.getLedgerApp().verifyActive();
+	}
 	async sendTx(tx) {
 		await this.ensureConnected();
+		await this.verifyDevice();
 		const { publicKey } = await this.getAddressInfo();
 		const prepared = await this.autofill(tx);
 		prepared.SigningPubKey = publicKey.toUpperCase();
-		const blob = encode(prepared);
+		const unsignedBlob = encode(prepared);
 		const app = this.getLedgerApp();
 		const path = this.args.bip44.getPathWithoutMaster();
-		prepared.TxnSignature = (await app.signTransaction(path, blob)).toUpperCase();
-		return (await this.submitAndWait(prepared)).result.hash;
+		prepared.TxnSignature = (await app.signTransaction(path, unsignedBlob)).toUpperCase();
+		const signedBlob = encode(prepared);
+		return (await this.submitAndWait(signedBlob)).result.hash;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-client-factory.ts
 var LedgerClientFactory = class {
@@ -1538,7 +1579,6 @@ var LedgerClientFactory = class {
 		throw new LedgerError("COMMON_CHAIN_NOT_SUPPORTED");
 	}
 };
-
 //#endregion
 //#region src/core/storage/local-storage-manager.ts
 var LocalStorageManager = class {
@@ -1587,7 +1627,6 @@ var LocalStorageManager = class {
 		keysToRemove.forEach((key) => localStorage.removeItem(key));
 	}
 };
-
 //#endregion
 //#region src/core/storage/local-storage-schema.ts
 /**
@@ -1598,7 +1637,6 @@ const mwcStorage = new LocalStorageManager({
 	prefix: "mwc",
 	separator: ":"
 });
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-storage.ts
 var LedgerStorage = class {
@@ -1631,7 +1669,6 @@ var LedgerStorage = class {
 	}
 };
 const ledgerStorage = new LedgerStorage(mwcStorage);
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-session-manager.ts
 var LedgerSessionManager = class {
@@ -1672,7 +1709,6 @@ var LedgerSessionManager = class {
 		ledgerStorage.clear();
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/internal/ledger-transport-manager.ts
 var LedgerTransportManager = class {
@@ -1686,10 +1722,7 @@ var LedgerTransportManager = class {
 			return this.transport;
 		}
 		console.debug("[Ledger] TransportManager.open(): checking for connected device");
-		const existing = await TransportWebHID.openConnected();
-		if (existing) console.debug("[Ledger] TransportManager.open(): found connected device");
-		else console.debug("[Ledger] TransportManager.open(): creating new transport (will prompt user)");
-		this.transport = existing ?? await TransportWebHID.create();
+		this.transport = await this.openTransport();
 		this.attachDisconnectHandler();
 		console.debug("[Ledger] TransportManager.open(): transport ready");
 		return this.transport;
@@ -1747,11 +1780,31 @@ var LedgerTransportManager = class {
 			flags
 		};
 	}
+	async openTransport() {
+		try {
+			const existing = await TransportWebHID.openConnected();
+			if (existing) {
+				console.debug("[Ledger] TransportManager.open(): found connected device");
+				return existing;
+			}
+		} catch {
+			console.debug("[Ledger] TransportManager.open(): stale device detected, requesting new connection");
+		}
+		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");
-			await this.transport.close();
-			this.transport = null;
+			try {
+				await this.transport.close();
+			} finally {
+				this.transport = null;
+			}
 			console.debug("[Ledger] TransportManager.close(): transport closed");
 		}
 	}
@@ -1763,7 +1816,6 @@ var LedgerTransportManager = class {
 		if (this.transport && this.disconnectHandler) this.transport.on("disconnect", this.disconnectHandler);
 	}
 };
-
 //#endregion
 //#region src/core/connectors/ledger/ledger-connector.ts
 var LedgerConnector = class extends BaseConnector {
@@ -1839,9 +1891,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", {
@@ -1866,6 +1917,7 @@ var LedgerConnector = class extends BaseConnector {
 			console.debug("[Ledger] performConnect() completed", { address: account.address });
 		} catch (error) {
 			console.debug("[Ledger] performConnect() failed", error);
+			await this.transportManager.close();
 			this.events.disconnected();
 			throw error;
 		}
@@ -1901,11 +1953,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),
@@ -1928,13 +1978,11 @@ var LedgerConnector = class extends BaseConnector {
 		if (currentApp.name !== requiredApp) throw new LedgerError("LEDGER_WRONG_APP", /* @__PURE__ */ new Error(`Please open the ${requiredApp} app on your Ledger. Currently running: ${currentApp.name}`));
 	}
 };
-
 //#endregion
 //#region src/core/connectors/metamask/metamask-connector.ts
 const RPC_ERROR = {
 	USER_REJECTED: 4001,
-	REQUEST_PENDING: -32002,
-	CHAIN_NOT_ADDED: 4902
+	REQUEST_PENDING: -32002
 };
 var MetaMaskConnector = class extends BaseConnector {
 	constructor(..._args) {
@@ -1942,14 +1990,20 @@ var MetaMaskConnector = class extends BaseConnector {
 		this.client = null;
 	}
 	async onInitialize() {
-		this.sdk = new MetaMaskSDK({ dappMetadata: {
-			name: this.config.metadata.name,
-			url: this.config.metadata.url
-		} });
-		await this.sdk.sdkInitPromise;
-		const provider = this.sdk.getProvider();
-		if (!provider) throw new MetaMaskError("METAMASK_NOT_INSTALLED");
-		this.provider = provider;
+		const supportedNetworks = {};
+		for (const caip2 of this.resolvedConfig.getSupportedChains()) {
+			if (!ChainGuards.isEvmCaip2(caip2)) continue;
+			const chain = this.resolvedConfig.getEvmChain(caip2);
+			supportedNetworks[chain.evmChain.hex] = chain.rpcUrls[0];
+		}
+		this.sdk = await createEVMClient({
+			dapp: {
+				name: this.config.metadata.name,
+				url: this.config.metadata.url
+			},
+			api: { supportedNetworks }
+		});
+		this.provider = this.sdk.getProvider();
 		this.provider.on("accountsChanged", (accounts) => this.onAccountsChanged(accounts));
 		this.provider.on("chainChanged", (hex) => this.onChainChanged(hex));
 		this.provider.on("disconnect", () => {
@@ -1963,26 +2017,33 @@ var MetaMaskConnector = class extends BaseConnector {
 		if (this.getConnectionState() === "connecting") throw new MetaMaskError("COMMON_CONNECTION_IN_PROGRESS");
 		await this.initialize();
 		this.events.startConnecting();
-		let accounts = await this.provider.request({ method: "eth_accounts" });
-		if (accounts.length === 0) {
-			const connected = await this.sdk.connect().catch((error) => {
+		if (chain && !ChainGuards.isEvmCaip2(chain)) {
+			this.events.disconnected();
+			throw new MetaMaskError("COMMON_CHAIN_NOT_SUPPORTED");
+		}
+		const targetHex = chain ? this.resolvedConfig.getEvmChain(chain).evmChain.hex : void 0;
+		let accounts;
+		let chainId;
+		const existingAccount = this.sdk.getAccount();
+		const existingChainId = this.sdk.getChainId();
+		if (existingAccount && existingChainId) {
+			accounts = this.sdk.accounts;
+			chainId = existingChainId;
+		} else {
+			const result = await this.sdk.connect(targetHex ? { chainIds: [targetHex] } : void 0).catch((error) => {
 				this.events.disconnected();
 				if (ChainUtils.isRpcErrorWithCode(error, RPC_ERROR.USER_REJECTED)) throw new MetaMaskError("COMMON_USER_REJECTED", error);
 				if (ChainUtils.isRpcErrorWithCode(error, RPC_ERROR.REQUEST_PENDING)) throw new MetaMaskError("COMMON_CONNECTION_IN_PROGRESS", error);
 				throw new MetaMaskError("COMMON_CONNECTION_FAILED", error);
 			});
-			if (!connected?.length) {
+			if (!result.accounts.length) {
 				this.events.disconnected();
 				throw new MetaMaskError("COMMON_NO_ACCOUNTS");
 			}
-			accounts = connected;
-		}
-		if (chain && !ChainGuards.isEvmCaip2(chain)) {
-			this.events.disconnected();
-			throw new MetaMaskError("COMMON_CHAIN_NOT_SUPPORTED");
+			accounts = result.accounts;
+			chainId = result.chainId;
 		}
-		const hex = await this.provider.request({ method: "eth_chainId" });
-		const currentChain = this.resolvedConfig.evmHexMap.get(hex);
+		const currentChain = this.resolvedConfig.evmHexMap.get(chainId);
 		if (chain && currentChain !== chain) await this.switchChain(chain);
 		else if (!currentChain) {
 			this.events.disconnected();
@@ -1998,39 +2059,43 @@ var MetaMaskConnector = class extends BaseConnector {
 	}
 	async disconnect() {
 		this.events.startDisconnecting();
-		if (this.initialized) await this.sdk.terminate();
+		if (this.initialized) await this.sdk.disconnect();
 		this.client = null;
-		this.resetInitialization();
 		this.events.disconnected();
 	}
 	async restoreConnection() {
 		if (this.getConnectionState() !== "disconnected") return;
 		await this.initialize();
-		if (!this.provider) return;
 		if (this.getConnectionState() !== "disconnected") return;
-		const accounts = await this.provider.request({ method: "eth_accounts" });
-		if (accounts.length === 0 || this.getConnectionState() !== "disconnected") return;
-		const hex = await this.provider.request({ method: "eth_chainId" });
+		const account = this.sdk.getAccount();
+		if (!account) return;
+		const hex = this.sdk.getChainId();
+		if (!hex) return;
 		const caip2 = this.resolvedConfig.evmHexMap.get(hex);
 		if (!caip2) return;
 		this.createClient(caip2);
 		this.events.reconnected({
-			address: accounts[0],
-			addresses: accounts,
+			address: account,
+			addresses: this.sdk.accounts,
 			caip2
 		});
 	}
 	async switchChain(caip2) {
 		const chain = this.resolvedConfig.getEvmChain(caip2);
 		try {
-			await this.provider.request({
-				method: "wallet_switchEthereumChain",
-				params: [{ chainId: chain.evmChain.hex }]
+			await this.sdk.switchChain({
+				chainId: chain.evmChain.hex,
+				chainConfiguration: {
+					chainId: chain.evmChain.hex,
+					chainName: chain.name,
+					nativeCurrency: chain.nativeCurrency,
+					rpcUrls: chain.rpcUrls,
+					blockExplorerUrls: chain.blockExplorerUrls
+				}
 			});
 		} catch (error) {
-			if (ChainUtils.isRpcErrorWithCode(error, RPC_ERROR.CHAIN_NOT_ADDED)) await this.addChain(chain);
-			else if (ChainUtils.isRpcErrorWithCode(error, RPC_ERROR.USER_REJECTED)) throw new MetaMaskError("COMMON_USER_REJECTED", error);
-			else throw new MetaMaskError("COMMON_CHAIN_NOT_SUPPORTED", error);
+			if (ChainUtils.isRpcErrorWithCode(error, RPC_ERROR.USER_REJECTED)) throw new MetaMaskError("COMMON_USER_REJECTED", error);
+			throw new MetaMaskError("COMMON_CHAIN_NOT_SUPPORTED", error);
 		}
 		this.createClient(caip2);
 	}
@@ -2083,18 +2148,6 @@ var MetaMaskConnector = class extends BaseConnector {
 	createClient(caip2) {
 		this.client = EvmClient.create(this.resolvedConfig.getEvmChain(caip2), this.provider);
 	}
-	async addChain(chain) {
-		await this.provider.request({
-			method: "wallet_addEthereumChain",
-			params: [{
-				chainId: chain.evmChain.hex,
-				chainName: chain.name,
-				nativeCurrency: chain.nativeCurrency,
-				rpcUrls: chain.rpcUrls,
-				blockExplorerUrls: chain.blockExplorerUrls
-			}]
-		});
-	}
 	getConnectionState() {
 		return this.store.getSnapshot().context.connectionState;
 	}
@@ -2102,7 +2155,6 @@ var MetaMaskConnector = class extends BaseConnector {
 		return this.store.getSnapshot().context.caip2;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/clients/wallet-connect-evm-client.ts
 /**
@@ -2125,7 +2177,6 @@ var WalletConnectEvmClient = class WalletConnectEvmClient extends EvmClient {
 		}));
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/clients/wallet-connect-xrpl-client.ts
 var WalletConnectXrpClient = class extends XrplClient {
@@ -2145,8 +2196,8 @@ var WalletConnectXrpClient = class extends XrplClient {
 					submit: false
 				}
 			}, xrpCaip2);
-			const signedTx = this.sanitizeTx(result.tx_json);
-			return (await this.submitAndWait(signedTx)).result.hash;
+			const signedBlob = encode(this.sanitizeTx(result.tx_json));
+			return (await this.submitAndWait(signedBlob)).result.hash;
 		} finally {
 			await this.disconnect();
 		}
@@ -2169,11 +2220,10 @@ var WalletConnectXrpClient = class extends XrplClient {
 		});
 		return walletResult;
 	}
-	isGirin(walletResult) {
+	isGirin(_walletResult) {
 		return (this.provider.session?.peer.metadata.name ?? "unknown").toLowerCase().includes("girin");
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/internal/wallet-connect-client-factory.ts
 var WalletConnectClientFactory = class {
@@ -2190,7 +2240,6 @@ var WalletConnectClientFactory = class {
 		throw new WalletConnectError("COMMON_CHAIN_NOT_SUPPORTED");
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/internal/wallet-connect-session-storage.ts
 var SessionStorage = class {
@@ -2222,7 +2271,6 @@ var SessionStorage = class {
 	}
 };
 const sessionStorage = new SessionStorage(mwcStorage);
-
 //#endregion
 //#region src/core/connectors/wallet-connect/internal/wallet-connect-session-manager.ts
 var WalletConnectSessionManager = class {
@@ -2297,7 +2345,6 @@ var WalletConnectSessionManager = class {
 		return namespaces;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/wallet-connect/wallet-connect-connector.ts
 /**
@@ -2487,7 +2534,6 @@ var WalletConnectConnector = class extends BaseConnector {
 		return this.store.getSnapshot().context.caip2;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/xaman/xaman-xrpl-client.ts
 var XamanClient = class XamanClient extends Xumm {
@@ -2501,14 +2547,21 @@ var XamanClient = class XamanClient extends Xumm {
 		super(config.apiKey);
 		this.resolvedConfig = resolvedConfig;
 	}
-	async sendTx(tx) {
+	async sendTx(tx, sendTxOptions) {
 		if (!this.payload) throw new XamanError("XAMAN_SDK_NOT_READY");
 		const { reference } = parseCaip2(await this.getCaip2());
 		const networkKey = XamanClient.NETWORK_KEYS[reference];
-		const subscription = await this.payload.createAndSubscribe({
+		const payload = {
 			txjson: { ...tx },
-			options: networkKey ? { force_network: networkKey } : {}
-		}, (event) => "signed" in event.data ? event : void 0);
+			options: { ...sendTxOptions?.options },
+			custom_meta: sendTxOptions?.custom_meta,
+			user_token: sendTxOptions?.user_token
+		};
+		if (networkKey) payload.options = {
+			force_network: networkKey,
+			...payload.options
+		};
+		const subscription = await this.payload.createAndSubscribe(payload, (event) => "signed" in event.data ? event : void 0);
 		if (!subscription?.created) throw new XamanError("XAMAN_SDK_NOT_READY");
 		const txid = (await subscription.resolved)?.payload?.response?.txid;
 		if (!txid) throw new XamanError("XAMAN_SIGN_REJECTED");
@@ -2538,7 +2591,6 @@ var XamanClient = class XamanClient extends Xumm {
 		return `xrpl:${networkId}`;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/xaman/xaman-connector.ts
 var XamanConnector = class extends BaseConnector {
@@ -2624,7 +2676,6 @@ var XamanConnector = class extends BaseConnector {
 		return this.store.getSnapshot().context.caip2;
 	}
 };
-
 //#endregion
 //#region src/core/connectors/connector-factory.ts
 const DEFAULT_METADATA = {
@@ -2667,7 +2718,6 @@ var ConnectorFactory = class {
 		}
 	}
 };
-
 //#endregion
 //#region src/core/stores/wallet-store/aggregate-wallet-store.ts
 const createAggregateWalletStore = (stores) => {
@@ -2679,7 +2729,6 @@ const createAggregateWalletStore = (stores) => {
 		} }) }
 	});
 };
-
 //#endregion
 //#region src/core/stores/wallet-store/wallet-store.ts
 const INITIAL_STATE = {
@@ -2781,7 +2830,6 @@ const createWalletStore = (walletType) => {
 		}
 	});
 };
-
 //#endregion
 //#region src/core/multichain/multichain.ts
 var MultiChain = class {
@@ -2914,7 +2962,7 @@ var MultiChain = class {
 		this.subscriptions.push(store.subscribe(sync));
 	}
 };
-
 //#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=multichain-BZs-jPka.mjs.map
+
+//# sourceMappingURL=core-1pT9AVKV.mjs.map