@solana-mobile/wallet-adapter-mobile 2.2.5 → 2.2.6

package/lib/esm/index.browser.js

@@ -1,90 +1,8 @@
-import { BaseSignInMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletConnectionError, WalletNotReadyError, WalletSignMessageError, WalletSendTransactionError, WalletSignTransactionError, WalletNotConnectedError } from '@solana/wallet-adapter-base';
+import { BaseSignInMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletSignMessageError, WalletSendTransactionError, WalletNotConnectedError, WalletSignTransactionError } from '@solana/wallet-adapter-base';
 import { PublicKey, VersionedMessage, Transaction, VersionedTransaction } from '@solana/web3.js';
 import { SolanaSignIn, SolanaSignMessage, SolanaSignAndSendTransaction, SolanaSignTransaction } from '@solana/wallet-standard-features';
-import { SolanaMobileWalletAdapterWalletName as SolanaMobileWalletAdapterWalletName$1, SolanaMobileWalletAdapterRemoteWalletName as SolanaMobileWalletAdapterRemoteWalletName$1, LocalSolanaMobileWalletAdapterWallet, createDefaultChainSelector, RemoteSolanaMobileWalletAdapterWallet, createDefaultAuthorizationCache, defaultErrorModalWalletNotFoundHandler } from '@solana-mobile/wallet-standard-mobile';
-
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __classPrivateFieldGet(receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-}
-
-(undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-(undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-
-/** Name of the feature. */
-const StandardConnect = 'standard:connect';
-
-/** Name of the feature. */
-const StandardDisconnect = 'standard:disconnect';
-
-/** Name of the feature. */
-const StandardEvents = 'standard:events';
-
-(undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-(undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-
-(undefined && undefined.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-(undefined && undefined.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
+import { StandardEvents, StandardConnect, StandardDisconnect } from '@wallet-standard/core';
+import { SolanaMobileWalletAdapterRemoteWalletName as SolanaMobileWalletAdapterRemoteWalletName$1, SolanaMobileWalletAdapterWalletName as SolanaMobileWalletAdapterWalletName$1, LocalSolanaMobileWalletAdapterWallet, createDefaultChainSelector, RemoteSolanaMobileWalletAdapterWallet, createDefaultAuthorizationCache, defaultErrorModalWalletNotFoundHandler } from '@solana-mobile/wallet-standard-mobile';
 
 function fromUint8Array(byteArray) {
     return window.btoa(String.fromCharCode.call(null, ...byteArray));
@@ -97,7 +15,6 @@ function getIsSupported() {
         /android/i.test(navigator.userAgent));
 }
 
-var _BaseSolanaMobileWalletAdapter_instances, _BaseSolanaMobileWalletAdapter_wallet, _BaseSolanaMobileWalletAdapter_connecting, _BaseSolanaMobileWalletAdapter_readyState, _BaseSolanaMobileWalletAdapter_accountSelector, _BaseSolanaMobileWalletAdapter_selectedAccount, _BaseSolanaMobileWalletAdapter_publicKey, _BaseSolanaMobileWalletAdapter_handleChangeEvent, _BaseSolanaMobileWalletAdapter_connect, _BaseSolanaMobileWalletAdapter_declareWalletAsInstalled, _BaseSolanaMobileWalletAdapter_assertIsAuthorized, _BaseSolanaMobileWalletAdapter_performSignTransactions, _BaseSolanaMobileWalletAdapter_runWithGuard;
 const SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName$1;
 const SolanaMobileWalletAdapterRemoteWalletName = SolanaMobileWalletAdapterRemoteWalletName$1;
 const SIGNATURE_LENGTH_IN_BYTES = 64;
@@ -117,43 +34,44 @@ function chainOrClusterToChainId(chain) {
     }
 }
 class BaseSolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
+    supportedTransactionVersions = new Set(
+    // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
+    ['legacy', 0]);
+    name;
+    icon;
+    url;
+    #wallet;
+    #connecting = false;
+    #readyState = getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported;
+    #accountSelector;
+    #selectedAccount;
+    #publicKey;
+    #handleChangeEvent = async (properties) => {
+        if (properties.accounts && properties.accounts.length > 0) {
+            this.#declareWalletAsInstalled();
+            const nextSelectedAccount = await this.#accountSelector(properties.accounts);
+            if (nextSelectedAccount !== this.#selectedAccount) {
+                this.#selectedAccount = nextSelectedAccount;
+                this.#publicKey = undefined;
+                this.emit('connect', 
+                // Having just set `this.#selectedAccount`, `this.publicKey` is definitely non-null
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                this.publicKey);
+            }
+        }
+    };
     constructor(wallet, config) {
         super();
-        _BaseSolanaMobileWalletAdapter_instances.add(this);
-        this.supportedTransactionVersions = new Set(
-        // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
-        ['legacy', 0]);
-        _BaseSolanaMobileWalletAdapter_wallet.set(this, void 0);
-        _BaseSolanaMobileWalletAdapter_connecting.set(this, false);
-        _BaseSolanaMobileWalletAdapter_readyState.set(this, getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported);
-        _BaseSolanaMobileWalletAdapter_accountSelector.set(this, void 0);
-        _BaseSolanaMobileWalletAdapter_selectedAccount.set(this, void 0);
-        _BaseSolanaMobileWalletAdapter_publicKey.set(this, void 0);
-        _BaseSolanaMobileWalletAdapter_handleChangeEvent.set(this, (properties) => __awaiter(this, void 0, void 0, function* () {
-            if (properties.accounts && properties.accounts.length > 0) {
-                __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_declareWalletAsInstalled).call(this);
-                const nextSelectedAccount = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_accountSelector, "f").call(this, properties.accounts);
-                if (nextSelectedAccount !== __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f")) {
-                    __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, nextSelectedAccount, "f");
-                    __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_publicKey, undefined, "f");
-                    this.emit('connect', 
-                    // Having just set `this.#selectedAccount`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
-                }
-            }
-        }));
         // this.#chain = chainOrClusterToChainId(config.chain);
-        __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_accountSelector, (accounts) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const selectedBase64EncodedAddress = yield config.addressSelector.select(accounts.map(({ publicKey }) => fromUint8Array(publicKey)));
-            return (_a = accounts.find(({ publicKey }) => fromUint8Array(publicKey) === selectedBase64EncodedAddress)) !== null && _a !== void 0 ? _a : accounts[0];
-        }), "f");
-        __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_wallet, wallet, "f");
-        __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardEvents].on('change', __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_handleChangeEvent, "f"));
-        this.name = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").name;
-        this.icon = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").icon;
-        this.url = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").url;
+        this.#accountSelector = async (accounts) => {
+            const selectedBase64EncodedAddress = await config.addressSelector.select(accounts.map(({ publicKey }) => fromUint8Array(new Uint8Array(publicKey))));
+            return accounts.find(({ publicKey }) => fromUint8Array(new Uint8Array(publicKey)) === selectedBase64EncodedAddress) ?? accounts[0];
+        };
+        this.#wallet = wallet;
+        this.#wallet.features[StandardEvents].on('change', this.#handleChangeEvent);
+        this.name = this.#wallet.name;
+        this.icon = this.#wallet.icon;
+        this.url = this.#wallet.url;
         // TODO: evaluate if this logic should be kept - it seems to create a nasty bug where 
         //  the wallet tries to auto connect on page load and gets blocked by the popup blocker
         // if (this.#readyState !== WalletReadyState.Unsupported) {
@@ -168,241 +86,224 @@ class BaseSolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter
         // }
     }
     get publicKey() {
-        var _a;
-        if (!__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_publicKey, "f") && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f")) {
+        if (!this.#publicKey && this.#selectedAccount) {
             try {
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_publicKey, new PublicKey(__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f").publicKey), "f");
+                this.#publicKey = new PublicKey(this.#selectedAccount.publicKey);
             }
             catch (e) {
-                throw new WalletPublicKeyError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
+                throw new WalletPublicKeyError((e instanceof Error && e?.message) || 'Unknown error', e);
             }
         }
-        return (_a = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_publicKey, "f")) !== null && _a !== void 0 ? _a : null;
+        return this.#publicKey ?? null;
     }
     get connected() {
-        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").connected;
+        return this.#wallet.connected;
     }
     get connecting() {
-        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_connecting, "f");
+        return this.#connecting;
     }
     get readyState() {
-        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f");
+        return this.#readyState;
     }
     /** @deprecated Use `autoConnect()` instead. */
-    autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.autoConnect();
-        });
+    async autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
+        return await this.autoConnect();
     }
-    autoConnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_connect).call(this, true);
-        });
+    async autoConnect() {
+        this.#connect(true);
+    }
+    async connect() {
+        this.#connect();
     }
-    connect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_connect).call(this);
+    async #connect(autoConnect = false) {
+        if (this.connecting || this.connected) {
+            return;
+        }
+        return await this.#runWithGuard(async () => {
+            if (this.#readyState !== WalletReadyState.Installed && this.#readyState !== WalletReadyState.Loadable) {
+                throw new WalletNotReadyError();
+            }
+            this.#connecting = true;
+            try {
+                await this.#wallet.features[StandardConnect].connect({ silent: autoConnect });
+            }
+            catch (e) {
+                throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+            finally {
+                this.#connecting = false;
+            }
         });
     }
     /** @deprecated Use `connect()` or `autoConnect()` instead. */
-    performAuthorization(signInPayload) {
-        return __awaiter(this, void 0, void 0, function* () {
+    async performAuthorization(signInPayload) {
+        try {
+            const cachedAuthorizationResult = await this.#wallet.cachedAuthorizationResult;
+            if (cachedAuthorizationResult) {
+                await this.#wallet.features[StandardConnect].connect({ silent: true });
+                return cachedAuthorizationResult;
+            }
+            if (signInPayload) {
+                await this.#wallet.features[SolanaSignIn].signIn(signInPayload);
+            }
+            else
+                await this.#wallet.features[StandardConnect].connect();
+            const authorizationResult = await await this.#wallet.cachedAuthorizationResult;
+            return authorizationResult;
+        }
+        catch (e) {
+            throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+        }
+    }
+    async disconnect() {
+        // return await this.#runWithGuard(this.#wallet.features[StandardDisconnect].disconnect);
+        return await this.#runWithGuard(async () => {
+            this.#connecting = false;
+            this.#publicKey = undefined;
+            this.#selectedAccount = undefined;
+            await this.#wallet.features[StandardDisconnect].disconnect();
+            this.emit('disconnect');
+        });
+    }
+    async signIn(input) {
+        return this.#runWithGuard(async () => {
+            if (this.#readyState !== WalletReadyState.Installed && this.#readyState !== WalletReadyState.Loadable) {
+                throw new WalletNotReadyError();
+            }
+            this.#connecting = true;
             try {
-                const cachedAuthorizationResult = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").cachedAuthorizationResult;
-                if (cachedAuthorizationResult) {
-                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect({ silent: true });
-                    return cachedAuthorizationResult;
+                const outputs = await this.#wallet.features[SolanaSignIn].signIn({
+                    ...input,
+                    domain: input?.domain ?? window.location.host
+                });
+                if (outputs.length > 0) {
+                    return outputs[0];
                 }
-                if (signInPayload) {
-                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[SolanaSignIn].signIn(signInPayload);
+                else {
+                    throw new Error("Sign in failed, no sign in result returned by wallet");
                 }
-                else
-                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect();
-                const authorizationResult = yield yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").cachedAuthorizationResult;
-                return authorizationResult;
             }
             catch (e) {
                 throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
             }
+            finally {
+                this.#connecting = false;
+            }
         });
     }
-    disconnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            // return await this.#runWithGuard(this.#wallet.features[StandardDisconnect].disconnect);
-            return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, false, "f");
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_publicKey, undefined, "f");
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, undefined, "f");
-                yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardDisconnect].disconnect();
-                this.emit('disconnect');
-            }));
+    async signMessage(message) {
+        return await this.#runWithGuard(async () => {
+            const account = this.#assertIsAuthorized();
+            try {
+                const outputs = await this.#wallet.features[SolanaSignMessage].signMessage({
+                    account, message: message
+                });
+                return outputs[0].signature;
+            }
+            catch (error) {
+                throw new WalletSignMessageError(error?.message, error);
+            }
         });
     }
-    signIn(input) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                var _a;
-                if (__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== WalletReadyState.Installed && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== WalletReadyState.Loadable) {
-                    throw new WalletNotReadyError();
-                }
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, true, "f");
-                try {
-                    const outputs = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[SolanaSignIn].signIn(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
-                    if (outputs.length > 0) {
-                        return outputs[0];
+    async sendTransaction(transaction, connection, options) {
+        return await this.#runWithGuard(async () => {
+            const account = this.#assertIsAuthorized();
+            try {
+                function getTargetCommitment() {
+                    let targetCommitment;
+                    switch (connection.commitment) {
+                        case 'confirmed':
+                        case 'finalized':
+                        case 'processed':
+                            targetCommitment = connection.commitment;
+                            break;
+                        default:
+                            targetCommitment = 'finalized';
                     }
-                    else {
-                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    let targetPreflightCommitment;
+                    switch (options?.preflightCommitment) {
+                        case 'confirmed':
+                        case 'finalized':
+                        case 'processed':
+                            targetPreflightCommitment = options.preflightCommitment;
+                            break;
+                        case undefined:
+                            targetPreflightCommitment = targetCommitment;
+                            break;
+                        default:
+                            targetPreflightCommitment = 'finalized';
                     }
+                    const preflightCommitmentScore = targetPreflightCommitment === 'finalized'
+                        ? 2
+                        : targetPreflightCommitment === 'confirmed'
+                            ? 1
+                            : 0;
+                    const targetCommitmentScore = targetCommitment === 'finalized' ? 2 : targetCommitment === 'confirmed' ? 1 : 0;
+                    return preflightCommitmentScore < targetCommitmentScore
+                        ? targetPreflightCommitment
+                        : targetCommitment;
                 }
-                catch (e) {
-                    throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, false, "f");
+                if (SolanaSignAndSendTransaction in this.#wallet.features) {
+                    const chain = chainOrClusterToChainId(this.#wallet.currentAuthorization.chain);
+                    const [signature] = (await this.#wallet.features[SolanaSignAndSendTransaction].signAndSendTransaction({
+                        account,
+                        transaction: transaction.serialize(),
+                        chain: chain,
+                        options: options ? {
+                            skipPreflight: options.skipPreflight,
+                            maxRetries: options.maxRetries
+                        } : undefined
+                    })).map(((output) => {
+                        return fromUint8Array(output.signature);
+                    }));
+                    return signature;
                 }
-            }));
-        });
-    }
-    signMessage(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                const account = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_assertIsAuthorized).call(this);
-                try {
-                    const outputs = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[SolanaSignMessage].signMessage({
-                        account, message: message
-                    });
-                    return outputs[0].signature;
-                }
-                catch (error) {
-                    throw new WalletSignMessageError(error === null || error === void 0 ? void 0 : error.message, error);
-                }
-            }));
-        });
-    }
-    sendTransaction(transaction, connection, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                const account = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_assertIsAuthorized).call(this);
-                try {
-                    function getTargetCommitment() {
-                        let targetCommitment;
-                        switch (connection.commitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetCommitment = connection.commitment;
-                                break;
-                            default:
-                                targetCommitment = 'finalized';
-                        }
-                        let targetPreflightCommitment;
-                        switch (options === null || options === void 0 ? void 0 : options.preflightCommitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetPreflightCommitment = options.preflightCommitment;
-                                break;
-                            case undefined:
-                                targetPreflightCommitment = targetCommitment;
-                                break;
-                            default:
-                                targetPreflightCommitment = 'finalized';
-                        }
-                        const preflightCommitmentScore = targetPreflightCommitment === 'finalized'
-                            ? 2
-                            : targetPreflightCommitment === 'confirmed'
-                                ? 1
-                                : 0;
-                        const targetCommitmentScore = targetCommitment === 'finalized' ? 2 : targetCommitment === 'confirmed' ? 1 : 0;
-                        return preflightCommitmentScore < targetCommitmentScore
-                            ? targetPreflightCommitment
-                            : targetCommitment;
-                    }
-                    if (SolanaSignAndSendTransaction in __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features) {
-                        const chain = chainOrClusterToChainId(__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").currentAuthorization.chain);
-                        const [signature] = (yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[SolanaSignAndSendTransaction].signAndSendTransaction({
-                            account,
-                            transaction: transaction.serialize(),
-                            chain: chain,
-                            options: options ? {
-                                skipPreflight: options.skipPreflight,
-                                maxRetries: options.maxRetries
-                            } : undefined
-                        })).map(((output) => {
-                            return fromUint8Array(output.signature);
-                        }));
-                        return signature;
+                else {
+                    const [signedTransaction] = await this.#performSignTransactions([transaction]);
+                    if (isVersionedTransaction(signedTransaction)) {
+                        return await connection.sendTransaction(signedTransaction);
                     }
                     else {
-                        const [signedTransaction] = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_performSignTransactions).call(this, [transaction]);
-                        if (isVersionedTransaction(signedTransaction)) {
-                            return yield connection.sendTransaction(signedTransaction);
-                        }
-                        else {
-                            const serializedTransaction = signedTransaction.serialize();
-                            return yield connection.sendRawTransaction(serializedTransaction, Object.assign(Object.assign({}, options), { preflightCommitment: getTargetCommitment() }));
-                        }
+                        const serializedTransaction = signedTransaction.serialize();
+                        return await connection.sendRawTransaction(serializedTransaction, {
+                            ...options,
+                            preflightCommitment: getTargetCommitment(),
+                        });
                     }
                 }
-                catch (error) {
-                    throw new WalletSendTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
-                }
-            }));
+            }
+            catch (error) {
+                throw new WalletSendTransactionError(error?.message, error);
+            }
         });
     }
-    signTransaction(transaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                const [signedTransaction] = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_performSignTransactions).call(this, [transaction]);
-                return signedTransaction;
-            }));
+    async signTransaction(transaction) {
+        return await this.#runWithGuard(async () => {
+            const [signedTransaction] = await this.#performSignTransactions([transaction]);
+            return signedTransaction;
         });
     }
-    signAllTransactions(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-                const signedTransactions = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_performSignTransactions).call(this, transactions);
-                return signedTransactions;
-            }));
+    async signAllTransactions(transactions) {
+        return await this.#runWithGuard(async () => {
+            const signedTransactions = await this.#performSignTransactions(transactions);
+            return signedTransactions;
         });
     }
-}
-_BaseSolanaMobileWalletAdapter_wallet = new WeakMap(), _BaseSolanaMobileWalletAdapter_connecting = new WeakMap(), _BaseSolanaMobileWalletAdapter_readyState = new WeakMap(), _BaseSolanaMobileWalletAdapter_accountSelector = new WeakMap(), _BaseSolanaMobileWalletAdapter_selectedAccount = new WeakMap(), _BaseSolanaMobileWalletAdapter_publicKey = new WeakMap(), _BaseSolanaMobileWalletAdapter_handleChangeEvent = new WeakMap(), _BaseSolanaMobileWalletAdapter_instances = new WeakSet(), _BaseSolanaMobileWalletAdapter_connect = function _BaseSolanaMobileWalletAdapter_connect(autoConnect = false) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (this.connecting || this.connected) {
-            return;
+    #declareWalletAsInstalled() {
+        if (this.#readyState !== WalletReadyState.Installed) {
+            this.emit('readyStateChange', (this.#readyState = WalletReadyState.Installed));
         }
-        return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== WalletReadyState.Installed && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== WalletReadyState.Loadable) {
-                throw new WalletNotReadyError();
-            }
-            __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, true, "f");
-            try {
-                yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect({ silent: autoConnect });
-            }
-            catch (e) {
-                throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-            }
-            finally {
-                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, false, "f");
-            }
-        }));
-    });
-}, _BaseSolanaMobileWalletAdapter_declareWalletAsInstalled = function _BaseSolanaMobileWalletAdapter_declareWalletAsInstalled() {
-    if (__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== WalletReadyState.Installed) {
-        this.emit('readyStateChange', (__classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_readyState, WalletReadyState.Installed, "f")));
     }
-}, _BaseSolanaMobileWalletAdapter_assertIsAuthorized = function _BaseSolanaMobileWalletAdapter_assertIsAuthorized() {
-    if (!__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").isAuthorized || !__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f"))
-        throw new WalletNotConnectedError();
-    return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f");
-}, _BaseSolanaMobileWalletAdapter_performSignTransactions = function _BaseSolanaMobileWalletAdapter_performSignTransactions(transactions) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const account = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_assertIsAuthorized).call(this);
+    #assertIsAuthorized() {
+        if (!this.#wallet.isAuthorized || !this.#selectedAccount)
+            throw new WalletNotConnectedError();
+        return this.#selectedAccount;
+    }
+    async #performSignTransactions(transactions) {
+        const account = this.#assertIsAuthorized();
         try {
-            if (SolanaSignTransaction in __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features) {
-                return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[SolanaSignTransaction].signTransaction(...transactions.map((value) => {
+            if (SolanaSignTransaction in this.#wallet.features) {
+                return this.#wallet.features[SolanaSignTransaction].signTransaction(...transactions.map((value) => {
                     return { account, transaction: value.serialize() };
                 })).then((outputs) => {
                     return outputs.map((output) => {
@@ -424,38 +325,36 @@ _BaseSolanaMobileWalletAdapter_wallet = new WeakMap(), _BaseSolanaMobileWalletAd
             }
         }
         catch (error) {
-            throw new WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
+            throw new WalletSignTransactionError(error?.message, error);
         }
-    });
-}, _BaseSolanaMobileWalletAdapter_runWithGuard = function _BaseSolanaMobileWalletAdapter_runWithGuard(callback) {
-    return __awaiter(this, void 0, void 0, function* () {
+    }
+    async #runWithGuard(callback) {
         try {
-            return yield callback();
+            return await callback();
         }
         catch (e) {
             this.emit('error', e);
             throw e;
         }
-    });
-};
+    }
+}
 class LocalSolanaMobileWalletAdapter extends BaseSolanaMobileWalletAdapter {
     constructor(config) {
-        var _a;
-        const chain = chainOrClusterToChainId((_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster);
+        const chain = chainOrClusterToChainId(config.chain ?? config.cluster);
         super(new LocalSolanaMobileWalletAdapterWallet({
             appIdentity: config.appIdentity,
             authorizationCache: {
                 set: config.authorizationResultCache.set,
-                get: () => __awaiter(this, void 0, void 0, function* () {
-                    return yield config.authorizationResultCache.get();
-                }),
+                get: async () => {
+                    return await config.authorizationResultCache.get();
+                },
                 clear: config.authorizationResultCache.clear,
             },
             chains: [chain],
             chainSelector: createDefaultChainSelector(),
-            onWalletNotFound: () => __awaiter(this, void 0, void 0, function* () {
+            onWalletNotFound: async () => {
                 config.onWalletNotFound(this);
-            }),
+            },
         }), {
             addressSelector: config.addressSelector,
             chain: chain,
@@ -469,17 +368,17 @@ class RemoteSolanaMobileWalletAdapter extends BaseSolanaMobileWalletAdapter {
             appIdentity: config.appIdentity,
             authorizationCache: {
                 set: config.authorizationResultCache.set,
-                get: () => __awaiter(this, void 0, void 0, function* () {
-                    return yield config.authorizationResultCache.get();
-                }),
+                get: async () => {
+                    return await config.authorizationResultCache.get();
+                },
                 clear: config.authorizationResultCache.clear,
             },
             chains: [chain],
             chainSelector: createDefaultChainSelector(),
             remoteHostAuthority: config.remoteHostAuthority,
-            onWalletNotFound: () => __awaiter(this, void 0, void 0, function* () {
+            onWalletNotFound: async () => {
                 config.onWalletNotFound(this);
-            }),
+            },
         }), {
             addressSelector: config.addressSelector,
             chain: chain,
@@ -491,10 +390,8 @@ class SolanaMobileWalletAdapter extends LocalSolanaMobileWalletAdapter {
 
 function createDefaultAddressSelector() {
     return {
-        select(addresses) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return addresses[0];
-            });
+        async select(addresses) {
+            return addresses[0];
         },
     };
 }
@@ -503,10 +400,8 @@ function createDefaultAuthorizationResultCache() {
     return createDefaultAuthorizationCache();
 }
 
-function defaultWalletNotFoundHandler(mobileWalletAdapter) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return defaultErrorModalWalletNotFoundHandler();
-    });
+async function defaultWalletNotFoundHandler(mobileWalletAdapter) {
+    return defaultErrorModalWalletNotFoundHandler();
 }
 function createDefaultWalletNotFoundHandler() {
     return defaultWalletNotFoundHandler;