@solana-mobile/wallet-adapter-mobile 2.1.5 → 2.2.2

package/lib/cjs/index.browser.js

@@ -4,13 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
-var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
-var QRCode = require('qrcode');
-var jsBase64 = require('js-base64');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var QRCode__default = /*#__PURE__*/_interopDefaultLegacy(QRCode);
+var walletStandardFeatures = require('@solana/wallet-standard-features');
+var walletStandardMobile = require('@solana-mobile/wallet-standard-mobile');
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -35,111 +30,166 @@ function __awaiter(thisArg, _arguments, P, generator) {
         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;
 }
 
-function toUint8Array(base64EncodedByteArray) {
-    return new Uint8Array(window
-        .atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
+(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);
+};
+
+function fromUint8Array(byteArray) {
+    return window.btoa(String.fromCharCode.call(null, ...byteArray));
 }
 
-function getIsSupported$1() {
+function getIsSupported() {
     return (typeof window !== 'undefined' &&
         window.isSecureContext &&
         typeof document !== 'undefined' &&
         /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 = 'Mobile Wallet Adapter';
-const SIGNATURE_LENGTH_IN_BYTES$1 = 64;
-function getPublicKeyFromAddress$1(address) {
-    const publicKeyByteArray = toUint8Array(address);
-    return new web3_js.PublicKey(publicKeyByteArray);
-}
+const SIGNATURE_LENGTH_IN_BYTES = 64;
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-function clusterToChainId(cluster) {
-    switch (cluster) {
+function chainOrClusterToChainId(chain) {
+    switch (chain) {
         case 'mainnet-beta':
             return 'solana:mainnet';
         case 'testnet':
             return 'solana:testnet';
         case 'devnet':
             return 'solana:devnet';
+        default:
+            return chain;
     }
 }
-class SolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
-    constructor(config) {
-        var _a;
+class BaseSolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
+    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]);
-        this.name = SolanaMobileWalletAdapterWalletName;
-        this.url = 'https://solanamobile.com/wallets';
-        this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
-        this._connecting = false;
-        /**
-         * Every time the connection is recycled in some way (eg. `disconnect()` is called)
-         * increment this and use it to make sure that `transact` calls from the previous
-         * 'generation' don't continue to do work and throw exceptions.
-         */
-        this._connectionGeneration = 0;
-        this._readyState = getIsSupported$1() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
-        this._authorizationResultCache = config.authorizationResultCache;
-        this._addressSelector = config.addressSelector;
-        this._appIdentity = config.appIdentity;
-        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : clusterToChainId(config.cluster);
-        this._hostAuthority = config.remoteHostAuthority;
-        this._onWalletNotFound = config.onWalletNotFound;
-        if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
-            this._authorizationResultCache.get().then((authorizationResult) => {
-                if (authorizationResult) {
-                    // Having a prior authorization result is, right now, the best
-                    // indication that a mobile wallet is installed. There is no API
-                    // we can use to test for whether the association URI is supported.
-                    this.declareWalletAsInstalled();
+        _BaseSolanaMobileWalletAdapter_wallet.set(this, void 0);
+        _BaseSolanaMobileWalletAdapter_connecting.set(this, false);
+        _BaseSolanaMobileWalletAdapter_readyState.set(this, getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.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;
+        // 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) {
+        //     config.authorizationResultCache.get().then((authorizationResult) => {
+        //         if (authorizationResult) {
+        //             // Having a prior authorization result is, right now, the best
+        //             // indication that a mobile wallet is installed. There is no API
+        //             // we can use to test for whether the association URI is supported.
+        //             this.#declareWalletAsInstalled();
+        //         }
+        //     });
+        // }
     }
     get publicKey() {
-        if (this._publicKey == null && this._selectedAddress != null) {
+        var _a;
+        if (!__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_publicKey, "f") && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f")) {
             try {
-                this._publicKey = getPublicKeyFromAddress$1(this._selectedAddress);
+                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_publicKey, new web3_js.PublicKey(__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f").publicKey), "f");
             }
             catch (e) {
                 throw new walletAdapterBase.WalletPublicKeyError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
             }
         }
-        return this._publicKey ? this._publicKey : null;
+        return (_a = __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_publicKey, "f")) !== null && _a !== void 0 ? _a : null;
     }
     get connected() {
-        return !!this._authorizationResult;
+        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").connected;
     }
     get connecting() {
-        return this._connecting;
+        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_connecting, "f");
     }
     get readyState() {
-        return this._readyState;
-    }
-    declareWalletAsInstalled() {
-        if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
-            this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
-        }
-    }
-    runWithGuard(callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield callback();
-            }
-            catch (e) {
-                this.emit('error', e);
-                throw e;
-            }
-        });
+        return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f");
     }
     /** @deprecated Use `autoConnect()` instead. */
     autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED() {
@@ -149,1066 +199,154 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSigne
     }
     autoConnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.connecting || this.connected) {
-                return;
-            }
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
-                    throw new walletAdapterBase.WalletNotReadyError();
-                }
-                this._connecting = true;
-                try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                    }
-                }
-                catch (e) {
-                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    this._connecting = false;
-                }
-            }));
+            __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_connect).call(this, true);
         });
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.connecting || this.connected) {
-                return;
-            }
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
-                    throw new walletAdapterBase.WalletNotReadyError();
-                }
-                this._connecting = true;
-                try {
-                    yield this.performAuthorization();
-                }
-                catch (e) {
-                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    this._connecting = false;
-                }
-            }));
+            __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_connect).call(this);
         });
     }
+    /** @deprecated Use `connect()` or `autoConnect()` instead. */
     performAuthorization(signInPayload) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                const cachedAuthorizationResult = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").cachedAuthorizationResult;
                 if (cachedAuthorizationResult) {
-                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect({ silent: true });
                     return cachedAuthorizationResult;
                 }
-                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                    const authorizationResult = yield wallet.authorize({
-                        chain: this._chain,
-                        identity: this._appIdentity,
-                        sign_in_payload: signInPayload,
-                    });
-                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                    Promise.all([
-                        this._authorizationResultCache.set(authorizationResult),
-                        this.handleAuthorizationResult(authorizationResult),
-                    ]);
-                    return authorizationResult;
-                }));
-            }
-            catch (e) {
-                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-            }
-        });
-    }
-    handleAuthorizationResult(authorizationResult) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const didPublicKeysChange = 
-            // Case 1: We started from having no authorization.
-            this._authorizationResult == null ||
-                // Case 2: The number of authorized accounts changed.
-                ((_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.accounts.length) !== authorizationResult.accounts.length ||
-                // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
-                this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
-            this._authorizationResult = authorizationResult;
-            this.declareWalletAsInstalled();
-            if (didPublicKeysChange) {
-                const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
-                if (nextSelectedAddress !== this._selectedAddress) {
-                    this._selectedAddress = nextSelectedAddress;
-                    delete this._publicKey;
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
+                if (signInPayload) {
+                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[walletStandardFeatures.SolanaSignIn].signIn(signInPayload);
                 }
-            }
-        });
-    }
-    performReauthorization(wallet, authToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const authorizationResult = yield wallet.authorize({
-                    auth_token: authToken,
-                    identity: this._appIdentity,
-                });
-                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                Promise.all([
-                    this._authorizationResultCache.set(authorizationResult),
-                    this.handleAuthorizationResult(authorizationResult),
-                ]);
+                else
+                    yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect();
+                const authorizationResult = yield yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").cachedAuthorizationResult;
+                return authorizationResult;
             }
             catch (e) {
-                this.disconnect();
-                throw new walletAdapterBase.WalletDisconnectedError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
+                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
             }
         });
     }
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this._authorizationResultCache.clear(); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-            this._connecting = false;
-            this._connectionGeneration++;
-            delete this._authorizationResult;
-            delete this._publicKey;
-            delete this._selectedAddress;
-            this.emit('disconnect');
-        });
-    }
-    transact(callback) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
-            const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            const remoteConfig = this._hostAuthority ? { remoteHostAuthority: this._hostAuthority } : undefined;
-            const currentConnectionGeneration = this._connectionGeneration;
-            try {
-                return yield mobileWalletAdapterProtocolWeb3js.transact(callback, Object.assign(Object.assign({}, config), remoteConfig));
-            }
-            catch (e) {
-                if (this._connectionGeneration !== currentConnectionGeneration) {
-                    yield new Promise(() => { }); // Never resolve.
-                }
-                if (e instanceof Error &&
-                    e.name === 'SolanaMobileWalletAdapterError' &&
-                    e.code === 'ERROR_WALLET_NOT_FOUND') {
-                    yield this._onWalletNotFound(this);
-                }
-                throw e;
-            }
-        });
-    }
-    assertIsAuthorized() {
-        if (!this._authorizationResult || !this._selectedAddress)
-            throw new walletAdapterBase.WalletNotConnectedError();
-        return {
-            authToken: this._authorizationResult.auth_token,
-            selectedAddress: this._selectedAddress,
-        };
-    }
-    performSignTransactions(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { authToken } = this.assertIsAuthorized();
-            try {
-                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                    yield this.performReauthorization(wallet, authToken);
-                    const signedTransactions = yield wallet.signTransactions({
-                        transactions,
-                    });
-                    return signedTransactions;
-                }));
-            }
-            catch (error) {
-                throw new walletAdapterBase.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
-            }
-        });
-    }
-    sendTransaction(transaction, connection, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const { authToken } = this.assertIsAuthorized();
-                const minContextSlot = options === null || options === void 0 ? void 0 : options.minContextSlot;
-                try {
-                    return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        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;
-                        }
-                        const [capabilities, _1, _2] = yield Promise.all([
-                            wallet.getCapabilities(),
-                            this.performReauthorization(wallet, authToken),
-                            isVersionedTransaction(transaction)
-                                ? null
-                                : /**
-                                   * Unlike versioned transactions, legacy `Transaction` objects
-                                   * may not have an associated `feePayer` or `recentBlockhash`.
-                                   * This code exists to patch them up in case they are missing.
-                                   */
-                                    (() => __awaiter(this, void 0, void 0, function* () {
-                                        var _a;
-                                        transaction.feePayer || (transaction.feePayer = (_a = this.publicKey) !== null && _a !== void 0 ? _a : undefined);
-                                        if (transaction.recentBlockhash == null) {
-                                            const { blockhash } = yield connection.getLatestBlockhash({
-                                                commitment: getTargetCommitment(),
-                                            });
-                                            transaction.recentBlockhash = blockhash;
-                                        }
-                                    }))(),
-                        ]);
-                        if (capabilities.supports_sign_and_send_transactions) {
-                            const signatures = yield wallet.signAndSendTransactions({
-                                minContextSlot,
-                                transactions: [transaction],
-                            });
-                            return signatures[0];
-                        }
-                        else {
-                            const [signedTransaction] = yield wallet.signTransactions({
-                                transactions: [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() }));
-                            }
-                        }
-                    }));
-                }
-                catch (error) {
-                    throw new walletAdapterBase.WalletSendTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
-                }
-            }));
-        });
-    }
-    signTransaction(transaction) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const [signedTransaction] = yield this.performSignTransactions([transaction]);
-                return signedTransaction;
-            }));
-        });
-    }
-    signAllTransactions(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const signedTransactions = yield this.performSignTransactions(transactions);
-                return signedTransactions;
-            }));
-        });
-    }
-    signMessage(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const { authToken, selectedAddress } = this.assertIsAuthorized();
-                try {
-                    return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.performReauthorization(wallet, authToken);
-                        const [signedMessage] = yield wallet.signMessages({
-                            addresses: [selectedAddress],
-                            payloads: [message],
-                        });
-                        const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES$1);
-                        return signature;
-                    }));
-                }
-                catch (error) {
-                    throw new walletAdapterBase.WalletSignMessageError(error === null || error === void 0 ? void 0 : error.message, error);
-                }
+            // 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');
             }));
         });
     }
     signIn(input) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+            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") !== walletAdapterBase.WalletReadyState.Installed && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== walletAdapterBase.WalletReadyState.Loadable) {
                     throw new walletAdapterBase.WalletNotReadyError();
                 }
-                this._connecting = true;
+                __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, true, "f");
                 try {
-                    const authorizationResult = yield this.performAuthorization(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 (!authorizationResult.sign_in_result) {
-                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    const outputs = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[walletStandardFeatures.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];
                     }
-                    const signedInAddress = authorizationResult.sign_in_result.address;
-                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
-                        address: signedInAddress
-                    }), { publicKey: toUint8Array(signedInAddress) });
-                    return {
-                        account: signedInAccount,
-                        signedMessage: toUint8Array(authorizationResult.sign_in_result.signed_message),
-                        signature: toUint8Array(authorizationResult.sign_in_result.signature)
-                    };
-                }
-                catch (e) {
-                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    this._connecting = false;
-                }
-            }));
-        });
-    }
-}
-
-const BluetoothHtml = `
-    <div class="mobile-wallet-adapter-embedded-modal-content">
-    <button id="mobile-wallet-adapter-embedded-modal-close" class="mobile-wallet-adapter-embedded-modal-close">
-        <svg width="14" height="14">
-        <path d="M14 12.461 8.3 6.772l5.234-5.233L12.006 0 6.772 5.234 1.54 0 0 1.539l5.234 5.233L0 12.006l1.539 1.528L6.772 8.3l5.69 5.7L14 12.461z" />
-        </svg>
-    </button>
-    <h1><b>Jupiter</b> wants to connect</h1>
-    <p class="mobile-wallet-adapter-embedded-modal-subtitle">Connect to your mobile wallet app through Bluetooth.</p>
-    <div class="mobile-wallet-adapter-embedded-modal-connection-status-container">
-        <div id="status-not-connected" class="connection-status">
-        <svg class="bluetooth-icon" width="24" height="24" viewBox="0 0 24 24">
-            <path fill="#a0a0a0" d="M14.24 12.01l2.32 2.32c.28-.72.44-1.51.44-2.33 0-.82-.16-1.59-.43-2.31l-2.33 2.32zm5.29-5.3l-1.26 1.26c.63 1.21.98 2.57.98 4.02s-.36 2.82-.98 4.02l1.2 1.2c.97-1.54 1.54-3.36 1.54-5.31-.01-1.89-.55-3.67-1.48-5.19zm-3.82 1L10 2H9v7.59L4.41 5 3 6.41 8.59 12 3 17.59 4.41 19 9 14.41V22h1l5.71-5.71-4.3-4.29 4.3-4.29zM11 5.83l1.88 1.88L11 9.59V5.83zm1.88 10.46L11 18.17v-3.76l1.88 1.88z"/>
-        </svg>
-        <p>Not connected</p>
-        </div>
-        <div id="status-connecting" class="connection-status" style="display:none;">
-        <div class="spinner"></div>
-        <p>Connecting...</p>
-        </div>
-        <div id="status-connected" class="connection-status" style="display:none;">
-        <svg class="checkmark-icon" width="24" height="24" viewBox="0 0 24 24">
-            <path fill="#4CAF50" d="M9 16.17L4.83 12l-1.42 1.41L9 19 21 7l-1.41-1.41z"/>
-        </svg>
-        <p>Connected</p>
-        </div>
-    </div>
-    <div class="button-group">
-        <button id="cancel-btn" class="cancel-btn">Cancel</button>
-        <button id="connect-btn" class="connect-btn">Connect</button>
-    </div>
-    </div>
-`;
-
-const QRCodeHtml = `
-<div class="mobile-wallet-adapter-embedded-modal-content">
-  <button id="mobile-wallet-adapter-embedded-modal-close" class="mobile-wallet-adapter-embedded-modal-close">
-    <svg width="14" height="14">
-      <path d="M14 12.461 8.3 6.772l5.234-5.233L12.006 0 6.772 5.234 1.54 0 0 1.539l5.234 5.233L0 12.006l1.539 1.528L6.772 8.3l5.69 5.7L14 12.461z" />
-    </svg>
-  </button>
-  <h1>Scan to connect</h1>
-  <p class="mobile-wallet-adapter-embedded-modal-subtitle">Use your wallet app to scan the QR Code and connect.</p>
-  <div id="mobile-wallet-adapter-embedded-modal-qr-code-container" />
-</div>
-`;
-
-const css = `
-.mobile-wallet-adapter-embedded-modal {
-    display: flex; /* Use flexbox to center content */
-    flex-direction: column;
-    justify-content: center; /* Center horizontally */
-    align-items: center; /* Center vertically */
-    position: fixed; /* Stay in place */
-    z-index: 1; /* Sit on top */
-    left: 0;
-    top: 0;
-    width: 100%; /* Full width */
-    height: 100%; /* Full height */
-    background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
-}
-
-.mobile-wallet-adapter-embedded-modal-content {
-    background: #10141f;
-    padding: 20px;
-    border-radius: 10px;
-    width: 80%;
-    max-width: 500px;
-    text-align: center;
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    align-items: center; /* Center children horizontally */
-}
-
-.mobile-wallet-adapter-embedded-modal-subtitle {
-    color: #D8D8D8;
-}
-
-.mobile-wallet-adapter-embedded-modal-close {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    position: absolute;
-    top: 18px;
-    right: 18px;
-    padding: 12px;
-    cursor: pointer;
-    background: #1a1f2e;
-    border: none;
-    border-radius: 50%;
-}
-
-.mobile-wallet-adapter-embedded-modal-close:focus-visible {
-    outline-color: white;
-}
-
-.mobile-wallet-adapter-embedded-modal-close svg {
-    fill: #777;
-    transition: fill 200ms ease 0s;
-}
-
-.mobile-wallet-adapter-embedded-modal-close:hover svg {
-    fill: #fff;
-}
-
-.icon-container {
-    display: flex;
-    justify-content: center;
-    margin-bottom: 20px;
-}
-
-.icon {
-    width: 80px;
-    height: 80px;
-    border-radius: 50%;
-    background-color: #ddd; /* Placeholder for icon background */
-}
-
-/* Modal Title */
-.mobile-wallet-adapter-embedded-modal-content h1 {
-    color: white;
-    font-size: 24px;   
-}
-
-.button-group {
-    display: flex;
-    width: 100%;
-    gap: 10px;
-}
-
-.connect-btn, .cancel-btn {
-    flex: 1;
-    padding: 12px 20px;
-    font-size: 16px;
-    cursor: pointer;
-    border-radius: 10px;
-    transition: all 0.3s ease;
-}
-
-.connect-btn {
-    background-color: #007bff;
-    color: white;
-    border: none;
-}
-
-.connect-btn:hover {
-    background-color: #0056b3;
-}
-
-.cancel-btn {
-    background-color: transparent;
-    color: #a0a0a0;
-    border: 1px solid #a0a0a0;
-}
-
-.cancel-btn:hover {
-    background-color: rgba(160, 160, 160, 0.1);
-}
-
-/* BT Connection Status */
-
-.mobile-wallet-adapter-embedded-modal-connection-status-container {
-    margin: 20px 0px 20px 0px;
-}
-
-.connection-status {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    margin: 20px 0;
-}
-  
-.connection-status p {
-    margin-top: 10px;
-    color: #a0a0a0;
-}
-  
-.bluetooth-icon, .checkmark-icon {
-    width: 48px;
-    height: 48px;
-}
-  
-.spinner {
-    border: 4px solid #f3f3f3;
-    border-top: 4px solid #3498db;
-    border-radius: 50%;
-    width: 40px;
-    height: 40px;
-    animation: spin 1s linear infinite;
-}
-  
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-
-/* QR Code */
-
-#mobile-wallet-adapter-embedded-modal-qr-code-container {
-    width: 500px;
-    height: 500px;
-    align-content: center;
-}
-`;
-
-class EmbeddedModal {
-    constructor(title) {
-        this._root = null;
-        this._title = title;
-        // Bind methods to ensure `this` context is correct
-        this.init = this.init.bind(this);
-        this.injectQRCodeHTML = this.injectQRCodeHTML.bind(this);
-        this.injectBluetoothHTML = this.injectBluetoothHTML.bind(this);
-        this.open = this.open.bind(this);
-        this.close = this.close.bind(this);
-        this.connect = this.connect.bind(this);
-        this._root = document.getElementById('mobile-wallet-adapter-embedded-root-ui');
-    }
-    init(qrCode) {
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log('Injecting modal');
-            this.injectStyles();
-            this.injectQRCodeHTML(qrCode);
-        });
-    }
-    setConnectionStatus(status) {
-        if (!this._root)
-            return;
-        const statuses = ['not-connected', 'connecting', 'connected'];
-        statuses.forEach((s) => {
-            const el = this._root.querySelector(`#status-${s}`);
-            if (el instanceof HTMLElement) {
-                el.style.display = s === status ? 'flex' : 'none';
-            }
-        });
-    }
-    injectStyles() {
-        // Check if the styles have already been injected
-        if (document.getElementById('mobile-wallet-adapter-styles')) {
-            return;
-        }
-        const styleElement = document.createElement('style');
-        styleElement.id = 'mobile-wallet-adapter-styles';
-        styleElement.textContent = css;
-        document.head.appendChild(styleElement);
-    }
-    populateQRCode(qrUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const qrcodeContainer = document.getElementById('mobile-wallet-adapter-embedded-modal-qr-code-container');
-            if (qrcodeContainer) {
-                const qrCodeElement = yield QRCode__default["default"].toCanvas(qrUrl, { width: 400 });
-                if (qrcodeContainer.firstElementChild !== null) {
-                    qrcodeContainer.replaceChild(qrCodeElement, qrcodeContainer.firstElementChild);
-                }
-                else
-                    qrcodeContainer.appendChild(qrCodeElement);
-            }
-            else {
-                console.error('QRCode Container not found');
-            }
-        });
-    }
-    injectQRCodeHTML(qrCode) {
-        // Check if the HTML has already been injected
-        if (document.getElementById('mobile-wallet-adapter-embedded-root-ui')) {
-            if (!this._root)
-                this._root = document.getElementById('mobile-wallet-adapter-embedded-root-ui');
-            this.populateQRCode(qrCode);
-            return;
-        }
-        // Create a container for the modal
-        this._root = document.createElement('div');
-        this._root.id = 'mobile-wallet-adapter-embedded-root-ui';
-        this._root.className = 'mobile-wallet-adapter-embedded-modal';
-        this._root.innerHTML = QRCodeHtml;
-        this._root.style.display = 'none';
-        // Append the modal to the body
-        document.body.appendChild(this._root);
-        // Render the QRCode
-        this.populateQRCode(qrCode);
-        this.attachEventListeners();
-    }
-    injectBluetoothHTML() {
-        // Check if the HTML has already been injected
-        if (document.getElementById('mobile-wallet-adapter-embedded-root-ui')) {
-            return;
-        }
-        this._root = document.createElement('div');
-        this._root.id = 'mobile-wallet-adapter-embedded-root-ui';
-        this._root.className = 'mobile-wallet-adapter-embedded-modal';
-        this._root.innerHTML = BluetoothHtml;
-        document.body.appendChild(this._root);
-        this.attachEventListeners();
-    }
-    attachEventListeners() {
-        if (!this._root)
-            return;
-        const closeBtn = this._root.querySelector('#mobile-wallet-adapter-embedded-modal-close');
-        const cancelBtn = this._root.querySelector('#cancel-btn');
-        const connectBtn = this._root.querySelector('#connect-btn');
-        closeBtn === null || closeBtn === void 0 ? void 0 : closeBtn.addEventListener('click', () => this.close());
-        cancelBtn === null || cancelBtn === void 0 ? void 0 : cancelBtn.addEventListener('click', () => this.close());
-        connectBtn === null || connectBtn === void 0 ? void 0 : connectBtn.addEventListener('click', () => this.connect());
-    }
-    open() {
-        console.debug('Modal open');
-        if (this._root) {
-            this._root.style.display = 'flex';
-            this.setConnectionStatus('not-connected'); // Reset status when opening
-        }
-    }
-    close() {
-        console.debug('Modal close');
-        if (this._root) {
-            this._root.style.display = 'none';
-            this.setConnectionStatus('not-connected'); // Reset status when closing
-        }
-    }
-    connect() {
-        console.log('Connecting...');
-        // Mock connection
-        this.setConnectionStatus('connecting');
-        // Simulate connection process
-        setTimeout(() => {
-            this.setConnectionStatus('connected');
-            console.log('Connected!');
-        }, 5000); // 5 seconds delay
-    }
-}
-
-const SolanaMobileWalletAdapterRemoteWalletName = 'MWA (Remote)';
-const SIGNATURE_LENGTH_IN_BYTES = 64;
-function getPublicKeyFromAddress(address) {
-    const publicKeyByteArray = jsBase64.toUint8Array(address);
-    return new web3_js.PublicKey(publicKeyByteArray);
-}
-/**
- * Determine the mobile operating system.
- * Returns true if running on a mobile operating system, or false otherwise.
- *
- * @returns {boolean}
- */
-function isMobileOperatingSystem() {
-    var userAgent = navigator.userAgent;
-    // Windows Phone must come first because its UA also contains "Android"
-    if (/windows phone/i.test(userAgent)) {
-        return true;
-    }
-    if (/android/i.test(userAgent)) {
-        return true;
-    }
-    // iOS detection from: http://stackoverflow.com/a/9039885/177710
-    if (/iPad|iPhone|iPod/.test(userAgent) && !window.MSStream) {
-        return true;
-    }
-    return false;
-}
-function getIsSupported() {
-    return (typeof window !== 'undefined' &&
-        window.isSecureContext &&
-        typeof document !== 'undefined' &&
-        !isMobileOperatingSystem());
-}
-/**
- * This burner wallet adapter is unsafe to use and is only included to provide an easy way for applications to test
- * Wallet Adapter without using a third-party wallet.
- */
-class SolanaMobileWalletAdapterRemote extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
-    constructor(config) {
-        super();
-        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]);
-        this.name = SolanaMobileWalletAdapterRemoteWalletName;
-        this.url = 'https://solanamobile.com/wallets';
-        this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
-        this._connecting = false;
-        /**
-         * Every time the connection is recycled in some way (eg. `disconnect()` is called)
-         * increment this and use it to make sure that `transact` calls from the previous
-         * 'generation' don't continue to do work and throw exceptions.
-         */
-        this._connectionGeneration = 0;
-        this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
-        this._authorizationResultCache = config.authorizationResultCache;
-        this._addressSelector = config.addressSelector;
-        this._appIdentity = config.appIdentity;
-        this._chain = config.chain;
-        this._hostAuthority = config.remoteHostAuthority;
-        this._onWalletNotFound = config.onWalletNotFound;
-        if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
-            this._authorizationResultCache.get().then((authorizationResult) => {
-                if (authorizationResult) {
-                    // Having a prior authorization result is, right now, the best
-                    // indication that a mobile wallet is installed. There is no API
-                    // we can use to test for whether the association URI is supported.
-                    this.declareWalletAsInstalled();
-                }
-            });
-        }
-    }
-    get publicKey() {
-        if (this._publicKey == null && this._selectedAddress != null) {
-            try {
-                this._publicKey = getPublicKeyFromAddress(this._selectedAddress);
-            }
-            catch (e) {
-                throw new walletAdapterBase.WalletPublicKeyError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
-            }
-        }
-        return this._publicKey ? this._publicKey : null;
-    }
-    get connected() {
-        return !!this._authorizationResult;
-    }
-    get connecting() {
-        return this._connecting;
-    }
-    get readyState() {
-        return this._readyState;
-    }
-    declareWalletAsInstalled() {
-        if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
-            this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
-        }
-    }
-    runWithGuard(callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                return yield callback();
-            }
-            catch (e) {
-                this.emit('error', e);
-                throw e;
-            }
-        });
-    }
-    autoConnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.connecting || this.connected) {
-                return;
-            }
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
-                    throw new walletAdapterBase.WalletNotReadyError();
-                }
-                this._connecting = true;
-                try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
+                    else {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
                     }
                 }
                 catch (e) {
                     throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
                 }
                 finally {
-                    this._connecting = false;
+                    __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, false, "f");
                 }
             }));
         });
     }
-    connect() {
+    signMessage(message) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.connecting || this.connected) {
-                return;
-            }
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
-                    throw new walletAdapterBase.WalletNotReadyError();
-                }
-                this._connecting = true;
+            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 {
-                    yield this.performAuthorization();
-                }
-                catch (e) {
-                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    this._connecting = false;
-                }
-            }));
-        });
-    }
-    performAuthorization(signInPayload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                if (cachedAuthorizationResult) {
-                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                    this.handleAuthorizationResult(cachedAuthorizationResult);
-                    return cachedAuthorizationResult;
-                }
-                if (this._wallet)
-                    delete this._wallet;
-                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                    this._wallet = wallet;
-                    const authorizationResult = yield wallet.authorize({
-                        chain: this._chain,
-                        identity: this._appIdentity,
-                        sign_in_payload: signInPayload,
+                    const outputs = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[walletStandardFeatures.SolanaSignMessage].signMessage({
+                        account, message: message
                     });
-                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                    Promise.all([
-                        this._authorizationResultCache.set(authorizationResult),
-                        this.handleAuthorizationResult(authorizationResult),
-                    ]);
-                    return authorizationResult;
-                }));
-            }
-            catch (e) {
-                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-            }
-        });
-    }
-    handleAuthorizationResult(authorizationResult) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const didPublicKeysChange = 
-            // Case 1: We started from having no authorization.
-            this._authorizationResult == null ||
-                // Case 2: The number of authorized accounts changed.
-                ((_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.accounts.length) !== authorizationResult.accounts.length ||
-                // Case 3: The new list of addresses isn't exactly the same as the old list, in the same order.
-                this._authorizationResult.accounts.some((account, ii) => account.address !== authorizationResult.accounts[ii].address);
-            this._authorizationResult = authorizationResult;
-            this.declareWalletAsInstalled();
-            if (didPublicKeysChange) {
-                const nextSelectedAddress = yield this._addressSelector.select(authorizationResult.accounts.map(({ address }) => address));
-                if (nextSelectedAddress !== this._selectedAddress) {
-                    this._selectedAddress = nextSelectedAddress;
-                    delete this._publicKey;
-                    this.emit('connect', 
-                    // Having just set `this._selectedAddress`, `this.publicKey` is definitely non-null
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    this.publicKey);
+                    return outputs[0].signature;
                 }
-            }
-        });
-    }
-    performReauthorization(wallet, authToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const authorizationResult = yield wallet.authorize({
-                    auth_token: authToken,
-                    identity: this._appIdentity,
-                });
-                // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                Promise.all([
-                    this._authorizationResultCache.set(authorizationResult),
-                    this.handleAuthorizationResult(authorizationResult),
-                ]);
-            }
-            catch (e) {
-                this.disconnect();
-                throw new walletAdapterBase.WalletDisconnectedError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
-            }
-        });
-    }
-    disconnect() {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // TODO: figure out why this call throws "TypeError: _a.terminateSession is not a function"
-            //  even though the session termination is actually executed (websocket closes). 
-            try {
-                (_a = this._wallet) === null || _a === void 0 ? void 0 : _a.terminateSession();
-            }
-            catch (e) { }
-            this._authorizationResultCache.clear(); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-            this._connecting = false;
-            this._connectionGeneration++;
-            delete this._authorizationResult;
-            delete this._publicKey;
-            delete this._selectedAddress;
-            delete this._wallet;
-            this.emit('disconnect');
-        });
-    }
-    transact(callback) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.wallet_uri_base;
-            const baseConfig = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            const remoteConfig = Object.assign(Object.assign({}, baseConfig), { remoteHostAuthority: this._hostAuthority });
-            const currentConnectionGeneration = this._connectionGeneration;
-            const modal = new EmbeddedModal('MWA QR');
-            if (this._wallet) {
-                return callback(this._wallet);
-            }
-            try {
-                const { associationUrl, result: promise } = yield mobileWalletAdapterProtocolWeb3js.transactRemote((wallet) => __awaiter(this, void 0, void 0, function* () {
-                    const result = yield callback(wallet);
-                    modal.close();
-                    return result;
-                }), remoteConfig);
-                modal.init(associationUrl.toString());
-                modal.open();
-                return yield promise;
-            }
-            catch (e) {
-                modal.close();
-                if (this._connectionGeneration !== currentConnectionGeneration) {
-                    yield new Promise(() => { }); // Never resolve.
-                }
-                if (e instanceof Error &&
-                    e.name === 'SolanaMobileWalletAdapterError' &&
-                    e.code === 'ERROR_WALLET_NOT_FOUND') {
-                    yield this._onWalletNotFound(this);
+                catch (error) {
+                    throw new walletAdapterBase.WalletSignMessageError(error === null || error === void 0 ? void 0 : error.message, error);
                 }
-                throw e;
-            }
-        });
-    }
-    assertIsAuthorized() {
-        if (!this._authorizationResult || !this._selectedAddress)
-            throw new walletAdapterBase.WalletNotConnectedError();
-        return {
-            authToken: this._authorizationResult.auth_token,
-            selectedAddress: this._selectedAddress,
-        };
-    }
-    performSignTransactions(transactions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { authToken } = this.assertIsAuthorized();
-            try {
-                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                    yield this.performReauthorization(wallet, authToken);
-                    const signedTransactions = yield wallet.signTransactions({
-                        transactions,
-                    });
-                    return signedTransactions;
-                }));
-            }
-            catch (error) {
-                throw new walletAdapterBase.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
-            }
+            }));
         });
     }
     sendTransaction(transaction, connection, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const { authToken } = this.assertIsAuthorized();
-                const minContextSlot = options === null || options === void 0 ? void 0 : options.minContextSlot;
+            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 {
-                    return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        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;
+                    function getTargetCommitment() {
+                        let targetCommitment;
+                        switch (connection.commitment) {
+                            case 'confirmed':
+                            case 'finalized':
+                            case 'processed':
+                                targetCommitment = connection.commitment;
+                                break;
+                            default:
+                                targetCommitment = 'finalized';
                         }
-                        const [capabilities, _1, _2] = yield Promise.all([
-                            wallet.getCapabilities(),
-                            this.performReauthorization(wallet, authToken),
-                            walletAdapterBase.isVersionedTransaction(transaction)
-                                ? null
-                                : /**
-                                   * Unlike versioned transactions, legacy `Transaction` objects
-                                   * may not have an associated `feePayer` or `recentBlockhash`.
-                                   * This code exists to patch them up in case they are missing.
-                                   */
-                                    (() => __awaiter(this, void 0, void 0, function* () {
-                                        var _a;
-                                        transaction.feePayer || (transaction.feePayer = (_a = this.publicKey) !== null && _a !== void 0 ? _a : undefined);
-                                        if (transaction.recentBlockhash == null) {
-                                            const { blockhash } = yield connection.getLatestBlockhash({
-                                                commitment: getTargetCommitment(),
-                                            });
-                                            transaction.recentBlockhash = blockhash;
-                                        }
-                                    }))(),
-                        ]);
-                        if (capabilities.supports_sign_and_send_transactions) {
-                            const signatures = yield wallet.signAndSendTransactions({
-                                minContextSlot,
-                                transactions: [transaction],
-                            });
-                            return signatures[0];
+                        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 (walletStandardFeatures.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[walletStandardFeatures.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] = yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_performSignTransactions).call(this, [transaction]);
+                        if (isVersionedTransaction(signedTransaction)) {
+                            return yield connection.sendTransaction(signedTransaction);
                         }
                         else {
-                            const [signedTransaction] = yield wallet.signTransactions({
-                                transactions: [transaction],
-                            });
-                            if (walletAdapterBase.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 yield connection.sendRawTransaction(serializedTransaction, Object.assign(Object.assign({}, options), { preflightCommitment: getTargetCommitment() }));
                         }
-                    }));
+                    }
                 }
                 catch (error) {
                     throw new walletAdapterBase.WalletSendTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
@@ -1218,74 +356,157 @@ class SolanaMobileWalletAdapterRemote extends walletAdapterBase.BaseSignInMessag
     }
     signTransaction(transaction) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const [signedTransaction] = yield this.performSignTransactions([transaction]);
+            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;
             }));
         });
     }
     signAllTransactions(transactions) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const signedTransactions = yield this.performSignTransactions(transactions);
+            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;
             }));
         });
     }
-    signMessage(message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                const { authToken, selectedAddress } = this.assertIsAuthorized();
-                try {
-                    return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        yield this.performReauthorization(wallet, authToken);
-                        const [signedMessage] = yield wallet.signMessages({
-                            addresses: [selectedAddress],
-                            payloads: [message],
-                        });
-                        const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES);
-                        return signature;
-                    }));
-                }
-                catch (error) {
-                    throw new walletAdapterBase.WalletSignMessageError(error === null || error === void 0 ? void 0 : error.message, error);
-                }
-            }));
+}
+_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;
+        }
+        return yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_instances, "m", _BaseSolanaMobileWalletAdapter_runWithGuard).call(this, () => __awaiter(this, void 0, void 0, function* () {
+            if (__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== walletAdapterBase.WalletReadyState.Installed && __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_readyState, "f") !== walletAdapterBase.WalletReadyState.Loadable) {
+                throw new walletAdapterBase.WalletNotReadyError();
+            }
+            __classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_connecting, true, "f");
+            try {
+                yield __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[StandardConnect].connect({ silent: autoConnect });
+            }
+            catch (e) {
+                throw new walletAdapterBase.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") !== walletAdapterBase.WalletReadyState.Installed) {
+        this.emit('readyStateChange', (__classPrivateFieldSet(this, _BaseSolanaMobileWalletAdapter_readyState, walletAdapterBase.WalletReadyState.Installed, "f")));
+    }
+}, _BaseSolanaMobileWalletAdapter_assertIsAuthorized = function _BaseSolanaMobileWalletAdapter_assertIsAuthorized() {
+    if (!__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").isAuthorized || !__classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_selectedAccount, "f"))
+        throw new walletAdapterBase.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);
+        try {
+            if (walletStandardFeatures.SolanaSignTransaction in __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features) {
+                return __classPrivateFieldGet(this, _BaseSolanaMobileWalletAdapter_wallet, "f").features[walletStandardFeatures.SolanaSignTransaction].signTransaction(...transactions.map((value) => {
+                    return { account, transaction: value.serialize() };
+                })).then((outputs) => {
+                    return outputs.map((output) => {
+                        const byteArray = output.signedTransaction;
+                        const numSignatures = byteArray[0];
+                        const messageOffset = numSignatures * SIGNATURE_LENGTH_IN_BYTES + 1;
+                        const version = web3_js.VersionedMessage.deserializeMessageVersion(byteArray.slice(messageOffset, byteArray.length));
+                        if (version === 'legacy') {
+                            return web3_js.Transaction.from(byteArray);
+                        }
+                        else {
+                            return web3_js.VersionedTransaction.deserialize(byteArray);
+                        }
+                    });
+                });
+            }
+            else {
+                throw new Error('Connected wallet does not support signing transactions');
+            }
+        }
+        catch (error) {
+            throw new walletAdapterBase.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
+        }
+    });
+}, _BaseSolanaMobileWalletAdapter_runWithGuard = function _BaseSolanaMobileWalletAdapter_runWithGuard(callback) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            return yield 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);
+        super(new walletStandardMobile.LocalSolanaMobileWalletAdapterWallet({
+            appIdentity: config.appIdentity,
+            authorizationCache: {
+                set: config.authorizationResultCache.set,
+                get: () => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield config.authorizationResultCache.get();
+                    if (authorizationResult && 'chain' in authorizationResult) {
+                        return authorizationResult;
+                    }
+                    else if (authorizationResult) {
+                        return Object.assign(Object.assign({}, authorizationResult), { chain: chain });
+                    }
+                    else
+                        return undefined;
+                }),
+                clear: config.authorizationResultCache.clear,
+            },
+            chains: [chain],
+            chainSelector: walletStandardMobile.createDefaultChainSelector(),
+            onWalletNotFound: () => __awaiter(this, void 0, void 0, function* () {
+                config.onWalletNotFound(this);
+            }),
+        }), {
+            addressSelector: config.addressSelector,
+            chain: chain,
         });
     }
-    signIn(input) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
-                var _a, _b;
-                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
-                    throw new walletAdapterBase.WalletNotReadyError();
-                }
-                this._connecting = true;
-                try {
-                    const authorizationResult = yield this.performAuthorization(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 (!authorizationResult.sign_in_result) {
-                        throw new Error("Sign in failed, no sign in result returned by wallet");
+}
+class RemoteSolanaMobileWalletAdapter extends BaseSolanaMobileWalletAdapter {
+    constructor(config) {
+        const chain = chainOrClusterToChainId(config.chain);
+        super(new walletStandardMobile.RemoteSolanaMobileWalletAdapterWallet({
+            appIdentity: config.appIdentity,
+            authorizationCache: {
+                set: config.authorizationResultCache.set,
+                get: () => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield config.authorizationResultCache.get();
+                    if (authorizationResult && 'chain' in authorizationResult) {
+                        return authorizationResult;
                     }
-                    const signedInAddress = authorizationResult.sign_in_result.address;
-                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
-                        address: signedInAddress
-                    }), { publicKey: jsBase64.toUint8Array(signedInAddress) });
-                    return {
-                        account: signedInAccount,
-                        signedMessage: jsBase64.toUint8Array(authorizationResult.sign_in_result.signed_message),
-                        signature: jsBase64.toUint8Array(authorizationResult.sign_in_result.signature)
-                    };
-                }
-                catch (e) {
-                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
-                }
-                finally {
-                    this._connecting = false;
-                }
-            }));
+                    else if (authorizationResult) {
+                        return Object.assign(Object.assign({}, authorizationResult), { chain: chain });
+                    }
+                    else
+                        return undefined;
+                }),
+                clear: config.authorizationResultCache.clear,
+            },
+            chains: [chain],
+            chainSelector: walletStandardMobile.createDefaultChainSelector(),
+            remoteHostAuthority: config.remoteHostAuthority,
+            onWalletNotFound: () => __awaiter(this, void 0, void 0, function* () {
+                config.onWalletNotFound(this);
+            }),
+        }), {
+            addressSelector: config.addressSelector,
+            chain: chain,
         });
     }
 }
+class SolanaMobileWalletAdapter extends LocalSolanaMobileWalletAdapter {
+}
 
 function createDefaultAddressSelector() {
     return {
@@ -1297,68 +518,22 @@ function createDefaultAddressSelector() {
     };
 }
 
-const CACHE_KEY = 'SolanaMobileWalletAdapterDefaultAuthorizationCache';
 function createDefaultAuthorizationResultCache() {
-    let storage;
-    try {
-        storage = window.localStorage;
-        // eslint-disable-next-line no-empty
-    }
-    catch (_a) { }
-    return {
-        clear() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!storage) {
-                    return;
-                }
-                try {
-                    storage.removeItem(CACHE_KEY);
-                    // eslint-disable-next-line no-empty
-                }
-                catch (_a) { }
-            });
-        },
-        get() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!storage) {
-                    return;
-                }
-                try {
-                    return JSON.parse(storage.getItem(CACHE_KEY)) || undefined;
-                    // eslint-disable-next-line no-empty
-                }
-                catch (_a) { }
-            });
-        },
-        set(authorizationResult) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!storage) {
-                    return;
-                }
-                try {
-                    storage.setItem(CACHE_KEY, JSON.stringify(authorizationResult));
-                    // eslint-disable-next-line no-empty
-                }
-                catch (_a) { }
-            });
-        },
-    };
+    return walletStandardMobile.createDefaultAuthorizationCache();
 }
 
 function defaultWalletNotFoundHandler(mobileWalletAdapter) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (typeof window !== 'undefined') {
-            window.location.assign(mobileWalletAdapter.url);
-        }
+        return walletStandardMobile.defaultErrorModalWalletNotFoundHandler();
     });
 }
 function createDefaultWalletNotFoundHandler() {
     return defaultWalletNotFoundHandler;
 }
 
+exports.LocalSolanaMobileWalletAdapter = LocalSolanaMobileWalletAdapter;
+exports.RemoteSolanaMobileWalletAdapter = RemoteSolanaMobileWalletAdapter;
 exports.SolanaMobileWalletAdapter = SolanaMobileWalletAdapter;
-exports.SolanaMobileWalletAdapterRemote = SolanaMobileWalletAdapterRemote;
-exports.SolanaMobileWalletAdapterRemoteWalletName = SolanaMobileWalletAdapterRemoteWalletName;
 exports.SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName;
 exports.createDefaultAddressSelector = createDefaultAddressSelector;
 exports.createDefaultAuthorizationResultCache = createDefaultAuthorizationResultCache;