@solana-mobile/wallet-adapter-mobile 0.0.1-alpha.0 → 0.0.1-alpha.3

package/lib/cjs/index.browser.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var mobileWalletAdapterProtocol = require('@solana-mobile/mobile-wallet-adapter-protocol');
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -31,16 +31,15 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
-function getBase64StringFromByteArray(byteArray) {
-    return btoa(String.fromCharCode.call(null, ...byteArray));
-}
-function getByteArrayFromBase64String(base64EncodedByteArray) {
-    return new Uint8Array(atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
 class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
     constructor(config) {
         super();
@@ -48,12 +47,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this.url = 'https://solanamobile.com';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
-        this._readyState = typeof window === 'undefined' ||
-            typeof document === 'undefined' ||
-            !/android/i.test(navigator.userAgent) ||
-            !window.isSecureContext
-            ? walletAdapterBase.WalletReadyState.Unsupported
-            : walletAdapterBase.WalletReadyState.Loadable;
+        this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
         this._authorizationResultCache = config.authorizationResultCache;
         this._appIdentity = config.appIdentity;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
@@ -104,8 +98,8 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 return;
             }
             try {
-                yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield mobileWallet('authorize', { identity: this._appIdentity });
+                yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield walletAPI({ method: 'authorize', identity: this._appIdentity });
                     try {
                         this._publicKey = new web3_js.PublicKey(base58PublicKey);
                     }
@@ -137,10 +131,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             yield this._authorizationResultCache.set(authorizationResult);
         });
     }
-    performReauthorization(mobileWallet, currentAuthorizationResult) {
+    performReauthorization(walletAPI, currentAuthorizationResult) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { auth_token } = yield mobileWallet('reauthorize', {
+                const { auth_token } = yield walletAPI({
+                    method: 'reauthorize',
                     auth_token: currentAuthorizationResult.authToken,
                 });
                 if (currentAuthorizationResult.authToken !== auth_token) {
@@ -162,12 +157,12 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             this.emit('disconnect');
         });
     }
-    withWallet(callback) {
+    transact(callback) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.walletUriBase;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield mobileWalletAdapterProtocol.withLocalWallet(callback, config);
+            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
         });
     }
     assertIsAuthorized() {
@@ -181,17 +176,14 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    const serializedTransactions = transactions.map((transaction) => transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    }));
-                    const payloads = serializedTransactions.map((serializedTransaction) => serializedTransaction.toString('base64'));
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: base64EncodedCompiledTransactions } = yield mobileWallet('sign_transaction', { auth_token: freshAuthToken, payloads });
-                        const compiledTransactions = base64EncodedCompiledTransactions.map(getByteArrayFromBase64String);
-                        const transactions = compiledTransactions.map(web3_js.Transaction.from);
-                        return transactions;
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signedTransactions = yield walletAPI({
+                            method: 'sign_transaction',
+                            auth_token: freshAuthToken,
+                            transactions,
+                        });
+                        return signedTransactions;
                     }));
                 }
                 catch (error) {
@@ -209,34 +201,14 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    if (transaction.feePayer == null) {
-                        transaction.feePayer = this.publicKey || undefined;
-                    }
-                    if (transaction.recentBlockhash == null) {
-                        const { blockhash } = yield connection.getRecentBlockhash(connection.commitment);
-                        transaction.recentBlockhash = blockhash;
-                    }
-                    const serializedTransaction = transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    });
-                    const payloads = [serializedTransaction.toString('base64')];
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        let targetCommitment;
-                        switch (connection.commitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetCommitment = connection.commitment;
-                                break;
-                            default:
-                                targetCommitment = 'finalized';
-                        }
-                        const { signatures } = yield mobileWallet('sign_and_send_transaction', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signatures = yield walletAPI({
+                            method: 'sign_and_send_transaction',
                             auth_token: freshAuthToken,
-                            commitment: targetCommitment,
-                            payloads,
+                            fee_payer: this.publicKey || undefined,
+                            connection,
+                            transactions: [transaction],
                         });
                         return signatures[0];
                     }));
@@ -268,13 +240,13 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: [base64EncodedSignedMessage], } = yield mobileWallet('sign_message', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const [signedMessage] = yield walletAPI({
+                            method: 'sign_message',
                             auth_token: freshAuthToken,
-                            payloads: [getBase64StringFromByteArray(message)],
+                            byteArrays: [message],
                         });
-                        const signedMessage = getByteArrayFromBase64String(base64EncodedSignedMessage);
                         const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES);
                         return signature;
                     }));

package/lib/cjs/index.js

@@ -2,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var mobileWalletAdapterProtocol = require('@solana-mobile/mobile-wallet-adapter-protocol');
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
 var walletAdapterBase = require('@solana/wallet-adapter-base');
 var web3_js = require('@solana/web3.js');
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -31,16 +31,15 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
-function getBase64StringFromByteArray(byteArray) {
-    return btoa(String.fromCharCode.call(null, ...byteArray));
-}
-function getByteArrayFromBase64String(base64EncodedByteArray) {
-    return new Uint8Array(atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
 class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
     constructor(config) {
         super();
@@ -48,12 +47,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this.url = 'https://solanamobile.com';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
-        this._readyState = typeof window === 'undefined' ||
-            typeof document === 'undefined' ||
-            !/android/i.test(navigator.userAgent) ||
-            !window.isSecureContext
-            ? walletAdapterBase.WalletReadyState.Unsupported
-            : walletAdapterBase.WalletReadyState.Loadable;
+        this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
         this._authorizationResultCache = config.authorizationResultCache;
         this._appIdentity = config.appIdentity;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
@@ -104,8 +98,8 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 return;
             }
             try {
-                yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield mobileWallet('authorize', { identity: this._appIdentity });
+                yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield walletAPI({ method: 'authorize', identity: this._appIdentity });
                     try {
                         this._publicKey = new web3_js.PublicKey(base58PublicKey);
                     }
@@ -137,10 +131,11 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             yield this._authorizationResultCache.set(authorizationResult);
         });
     }
-    performReauthorization(mobileWallet, currentAuthorizationResult) {
+    performReauthorization(walletAPI, currentAuthorizationResult) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { auth_token } = yield mobileWallet('reauthorize', {
+                const { auth_token } = yield walletAPI({
+                    method: 'reauthorize',
                     auth_token: currentAuthorizationResult.authToken,
                 });
                 if (currentAuthorizationResult.authToken !== auth_token) {
@@ -162,12 +157,12 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             this.emit('disconnect');
         });
     }
-    withWallet(callback) {
+    transact(callback) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.walletUriBase;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield mobileWalletAdapterProtocol.withLocalWallet(callback, config);
+            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
         });
     }
     assertIsAuthorized() {
@@ -181,17 +176,14 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    const serializedTransactions = transactions.map((transaction) => transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    }));
-                    const payloads = serializedTransactions.map((serializedTransaction) => serializedTransaction.toString('base64'));
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: base64EncodedCompiledTransactions } = yield mobileWallet('sign_transaction', { auth_token: freshAuthToken, payloads });
-                        const compiledTransactions = base64EncodedCompiledTransactions.map(getByteArrayFromBase64String);
-                        const transactions = compiledTransactions.map(web3_js.Transaction.from);
-                        return transactions;
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signedTransactions = yield walletAPI({
+                            method: 'sign_transaction',
+                            auth_token: freshAuthToken,
+                            transactions,
+                        });
+                        return signedTransactions;
                     }));
                 }
                 catch (error) {
@@ -209,34 +201,14 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    if (transaction.feePayer == null) {
-                        transaction.feePayer = this.publicKey || undefined;
-                    }
-                    if (transaction.recentBlockhash == null) {
-                        const { blockhash } = yield connection.getRecentBlockhash(connection.commitment);
-                        transaction.recentBlockhash = blockhash;
-                    }
-                    const serializedTransaction = transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    });
-                    const payloads = [serializedTransaction.toString('base64')];
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        let targetCommitment;
-                        switch (connection.commitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetCommitment = connection.commitment;
-                                break;
-                            default:
-                                targetCommitment = 'finalized';
-                        }
-                        const { signatures } = yield mobileWallet('sign_and_send_transaction', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signatures = yield walletAPI({
+                            method: 'sign_and_send_transaction',
                             auth_token: freshAuthToken,
-                            commitment: targetCommitment,
-                            payloads,
+                            fee_payer: this.publicKey || undefined,
+                            connection,
+                            transactions: [transaction],
                         });
                         return signatures[0];
                     }));
@@ -268,13 +240,13 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: [base64EncodedSignedMessage], } = yield mobileWallet('sign_message', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const [signedMessage] = yield walletAPI({
+                            method: 'sign_message',
                             auth_token: freshAuthToken,
-                            payloads: [getBase64StringFromByteArray(message)],
+                            byteArrays: [message],
                         });
-                        const signedMessage = getByteArrayFromBase64String(base64EncodedSignedMessage);
                         const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES);
                         return signature;
                     }));

package/lib/cjs/index.native.js

@@ -0,0 +1,304 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var mobileWalletAdapterProtocolWeb3js = require('@solana-mobile/mobile-wallet-adapter-protocol-web3js');
+var walletAdapterBase = require('@solana/wallet-adapter-base');
+var web3_js = require('@solana/web3.js');
+var reactNative = require('react-native');
+var AsyncStorage = require('@react-native-async-storage/async-storage');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var AsyncStorage__default = /*#__PURE__*/_interopDefaultLegacy(AsyncStorage);
+
+/******************************************************************************
+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 getIsSupported() {
+    return reactNative.Platform.OS === 'android';
+}
+
+const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
+const SIGNATURE_LENGTH_IN_BYTES = 64;
+class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
+    constructor(config) {
+        super();
+        this.name = SolanaMobileWalletAdapterWalletName;
+        this.url = 'https://solanamobile.com';
+        this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
+        this._connecting = false;
+        this._readyState = getIsSupported() ? walletAdapterBase.WalletReadyState.Loadable : walletAdapterBase.WalletReadyState.Unsupported;
+        this._authorizationResultCache = config.authorizationResultCache;
+        this._appIdentity = config.appIdentity;
+        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.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                }
+            });
+        }
+    }
+    get publicKey() {
+        if (this._publicKey == null && this._authorizationResult != null) {
+            this._publicKey = new web3_js.PublicKey(this._authorizationResult.publicKey);
+        }
+        return this._publicKey ? this._publicKey : null;
+    }
+    get connected() {
+        return !!this._authorizationResult;
+    }
+    get connecting() {
+        return this._connecting;
+    }
+    get readyState() {
+        return this._readyState;
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                const err = new walletAdapterBase.WalletNotReadyError();
+                this.emit('error', err);
+                throw err;
+            }
+            this._connecting = true;
+            const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+            if (cachedAuthorizationResult) {
+                this._authorizationResult = cachedAuthorizationResult;
+                this._connecting = false;
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed) {
+                    this.emit('readyStateChange', (this._readyState = walletAdapterBase.WalletReadyState.Installed));
+                }
+                this.emit('connect', 
+                // Having just set an `authorizationResult`, `this.publicKey` is definitely non-null
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                this.publicKey);
+                return;
+            }
+            try {
+                yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield walletAPI({ method: 'authorize', identity: this._appIdentity });
+                    try {
+                        this._publicKey = new web3_js.PublicKey(base58PublicKey);
+                    }
+                    catch (e) {
+                        throw new walletAdapterBase.WalletPublicKeyError((e instanceof Error && (e === null || e === void 0 ? void 0 : e.message)) || 'Unknown error', e);
+                    }
+                    this.handleAuthorizationResult({
+                        authToken: auth_token,
+                        publicKey: base58PublicKey,
+                        walletUriBase: wallet_uri_base,
+                    }); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.emit('connect', 
+                    // Having just set an `authorizationResult`, `this.publicKey` is definitely non-null
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    this.publicKey);
+                }));
+            }
+            catch (e) {
+                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+            finally {
+                this._connecting = false;
+            }
+        });
+    }
+    handleAuthorizationResult(authorizationResult) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._authorizationResult = authorizationResult;
+            yield this._authorizationResultCache.set(authorizationResult);
+        });
+    }
+    performReauthorization(walletAPI, currentAuthorizationResult) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const { auth_token } = yield walletAPI({
+                    method: 'reauthorize',
+                    auth_token: currentAuthorizationResult.authToken,
+                });
+                if (currentAuthorizationResult.authToken !== auth_token) {
+                    this.handleAuthorizationResult(Object.assign(Object.assign({}, currentAuthorizationResult), { authToken: auth_token })); // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                }
+                return auth_token;
+            }
+            catch (e) {
+                this.disconnect();
+                throw new walletAdapterBase.WalletDisconnectedError((e instanceof Error && (e === null || e === void 0 ? void 0 : 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
+            delete this._authorizationResult;
+            delete this._publicKey;
+            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.walletUriBase;
+            const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
+            return yield mobileWalletAdapterProtocolWeb3js.transact(callback, config);
+        });
+    }
+    assertIsAuthorized() {
+        const authorizationResult = this._authorizationResult;
+        if (!authorizationResult)
+            throw new walletAdapterBase.WalletNotConnectedError();
+        return authorizationResult;
+    }
+    performSignTransactions(transactions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const authorizationResult = this.assertIsAuthorized();
+                try {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signedTransactions = yield walletAPI({
+                            method: 'sign_transaction',
+                            auth_token: freshAuthToken,
+                            transactions,
+                        });
+                        return signedTransactions;
+                    }));
+                }
+                catch (error) {
+                    throw new walletAdapterBase.WalletSignTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
+                }
+            }
+            catch (error) {
+                this.emit('error', error);
+                throw error;
+            }
+        });
+    }
+    sendTransaction(transaction, connection, _options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const authorizationResult = this.assertIsAuthorized();
+                try {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signatures = yield walletAPI({
+                            method: 'sign_and_send_transaction',
+                            auth_token: freshAuthToken,
+                            fee_payer: this.publicKey || undefined,
+                            connection,
+                            transactions: [transaction],
+                        });
+                        return signatures[0];
+                    }));
+                }
+                catch (error) {
+                    throw new walletAdapterBase.WalletSendTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
+                }
+            }
+            catch (error) {
+                this.emit('error', error);
+                throw error;
+            }
+        });
+    }
+    signTransaction(transaction) {
+        return __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* () {
+            const signedTransactions = yield this.performSignTransactions(transactions);
+            return signedTransactions;
+        });
+    }
+    signMessage(message) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const authorizationResult = this.assertIsAuthorized();
+                try {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const [signedMessage] = yield walletAPI({
+                            method: 'sign_message',
+                            auth_token: freshAuthToken,
+                            byteArrays: [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);
+                }
+            }
+            catch (error) {
+                this.emit('error', error);
+                throw error;
+            }
+        });
+    }
+}
+
+const CACHE_KEY = 'SolanaMobileWalletAdapterDefaultAuthorizationCache';
+function createDefaultAuthorizationResultCache() {
+    return {
+        clear() {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield AsyncStorage__default["default"].removeItem(CACHE_KEY);
+                    // eslint-disable-next-line no-empty
+                }
+                catch (_a) { }
+            });
+        },
+        get() {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    return (JSON.parse((yield AsyncStorage__default["default"].getItem(CACHE_KEY))) || undefined);
+                    // eslint-disable-next-line no-empty
+                }
+                catch (_a) { }
+            });
+        },
+        set(authorizationResult) {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    yield AsyncStorage__default["default"].setItem(CACHE_KEY, JSON.stringify(authorizationResult));
+                    // eslint-disable-next-line no-empty
+                }
+                catch (_a) { }
+            });
+        },
+    };
+}
+
+exports.SolanaMobileWalletAdapter = SolanaMobileWalletAdapter;
+exports.SolanaMobileWalletAdapterWalletName = SolanaMobileWalletAdapterWalletName;
+exports.createDefaultAuthorizationResultCache = createDefaultAuthorizationResultCache;

package/lib/esm/index.browser.mjs

@@ -1,8 +1,8 @@
-import { withLocalWallet } from '@solana-mobile/mobile-wallet-adapter-protocol';
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletNotReadyError, WalletPublicKeyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -27,16 +27,15 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
-function getBase64StringFromByteArray(byteArray) {
-    return btoa(String.fromCharCode.call(null, ...byteArray));
-}
-function getByteArrayFromBase64String(base64EncodedByteArray) {
-    return new Uint8Array(atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
 class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     constructor(config) {
         super();
@@ -44,12 +43,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this.url = 'https://solanamobile.com';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
-        this._readyState = typeof window === 'undefined' ||
-            typeof document === 'undefined' ||
-            !/android/i.test(navigator.userAgent) ||
-            !window.isSecureContext
-            ? WalletReadyState.Unsupported
-            : WalletReadyState.Loadable;
+        this._readyState = getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported;
         this._authorizationResultCache = config.authorizationResultCache;
         this._appIdentity = config.appIdentity;
         if (this._readyState !== WalletReadyState.Unsupported) {
@@ -100,8 +94,8 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 return;
             }
             try {
-                yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield mobileWallet('authorize', { identity: this._appIdentity });
+                yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield walletAPI({ method: 'authorize', identity: this._appIdentity });
                     try {
                         this._publicKey = new PublicKey(base58PublicKey);
                     }
@@ -133,10 +127,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             yield this._authorizationResultCache.set(authorizationResult);
         });
     }
-    performReauthorization(mobileWallet, currentAuthorizationResult) {
+    performReauthorization(walletAPI, currentAuthorizationResult) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { auth_token } = yield mobileWallet('reauthorize', {
+                const { auth_token } = yield walletAPI({
+                    method: 'reauthorize',
                     auth_token: currentAuthorizationResult.authToken,
                 });
                 if (currentAuthorizationResult.authToken !== auth_token) {
@@ -158,12 +153,12 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             this.emit('disconnect');
         });
     }
-    withWallet(callback) {
+    transact(callback) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.walletUriBase;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield withLocalWallet(callback, config);
+            return yield transact(callback, config);
         });
     }
     assertIsAuthorized() {
@@ -177,17 +172,14 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    const serializedTransactions = transactions.map((transaction) => transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    }));
-                    const payloads = serializedTransactions.map((serializedTransaction) => serializedTransaction.toString('base64'));
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: base64EncodedCompiledTransactions } = yield mobileWallet('sign_transaction', { auth_token: freshAuthToken, payloads });
-                        const compiledTransactions = base64EncodedCompiledTransactions.map(getByteArrayFromBase64String);
-                        const transactions = compiledTransactions.map(Transaction.from);
-                        return transactions;
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signedTransactions = yield walletAPI({
+                            method: 'sign_transaction',
+                            auth_token: freshAuthToken,
+                            transactions,
+                        });
+                        return signedTransactions;
                     }));
                 }
                 catch (error) {
@@ -205,34 +197,14 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    if (transaction.feePayer == null) {
-                        transaction.feePayer = this.publicKey || undefined;
-                    }
-                    if (transaction.recentBlockhash == null) {
-                        const { blockhash } = yield connection.getRecentBlockhash(connection.commitment);
-                        transaction.recentBlockhash = blockhash;
-                    }
-                    const serializedTransaction = transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    });
-                    const payloads = [serializedTransaction.toString('base64')];
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        let targetCommitment;
-                        switch (connection.commitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetCommitment = connection.commitment;
-                                break;
-                            default:
-                                targetCommitment = 'finalized';
-                        }
-                        const { signatures } = yield mobileWallet('sign_and_send_transaction', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signatures = yield walletAPI({
+                            method: 'sign_and_send_transaction',
                             auth_token: freshAuthToken,
-                            commitment: targetCommitment,
-                            payloads,
+                            fee_payer: this.publicKey || undefined,
+                            connection,
+                            transactions: [transaction],
                         });
                         return signatures[0];
                     }));
@@ -264,13 +236,13 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: [base64EncodedSignedMessage], } = yield mobileWallet('sign_message', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const [signedMessage] = yield walletAPI({
+                            method: 'sign_message',
                             auth_token: freshAuthToken,
-                            payloads: [getBase64StringFromByteArray(message)],
+                            byteArrays: [message],
                         });
-                        const signedMessage = getByteArrayFromBase64String(base64EncodedSignedMessage);
                         const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES);
                         return signature;
                     }));

package/lib/esm/index.mjs

@@ -1,8 +1,8 @@
-import { withLocalWallet } from '@solana-mobile/mobile-wallet-adapter-protocol';
+import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletNotReadyError, WalletPublicKeyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
-import { PublicKey, Transaction } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -27,16 +27,15 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
+function getIsSupported() {
+    return (typeof window !== 'undefined' &&
+        window.isSecureContext &&
+        typeof document !== 'undefined' &&
+        /android/i.test(navigator.userAgent));
+}
+
 const SolanaMobileWalletAdapterWalletName = 'Default wallet app';
 const SIGNATURE_LENGTH_IN_BYTES = 64;
-function getBase64StringFromByteArray(byteArray) {
-    return btoa(String.fromCharCode.call(null, ...byteArray));
-}
-function getByteArrayFromBase64String(base64EncodedByteArray) {
-    return new Uint8Array(atob(base64EncodedByteArray)
-        .split('')
-        .map((c) => c.charCodeAt(0)));
-}
 class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     constructor(config) {
         super();
@@ -44,12 +43,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this.url = 'https://solanamobile.com';
         this.icon = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI4IiB3aWR0aD0iMjgiIHZpZXdCb3g9Ii0zIDAgMjggMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI0RDQjhGRiI+PHBhdGggZD0iTTE3LjQgMTcuNEgxNXYyLjRoMi40di0yLjRabTEuMi05LjZoLTIuNHYyLjRoMi40VjcuOFoiLz48cGF0aCBkPSJNMjEuNiAzVjBoLTIuNHYzaC0zLjZWMGgtMi40djNoLTIuNHY2LjZINC41YTIuMSAyLjEgMCAxIDEgMC00LjJoMi43VjNINC41QTQuNSA0LjUgMCAwIDAgMCA3LjVWMjRoMjEuNnYtNi42aC0yLjR2NC4ySDIuNFYxMS41Yy41LjMgMS4yLjQgMS44LjVoNy41QTYuNiA2LjYgMCAwIDAgMjQgOVYzaC0yLjRabTAgNS43YTQuMiA0LjIgMCAxIDEtOC40IDBWNS40aDguNHYzLjNaIi8+PC9nPjwvc3ZnPg==';
         this._connecting = false;
-        this._readyState = typeof window === 'undefined' ||
-            typeof document === 'undefined' ||
-            !/android/i.test(navigator.userAgent) ||
-            !window.isSecureContext
-            ? WalletReadyState.Unsupported
-            : WalletReadyState.Loadable;
+        this._readyState = getIsSupported() ? WalletReadyState.Loadable : WalletReadyState.Unsupported;
         this._authorizationResultCache = config.authorizationResultCache;
         this._appIdentity = config.appIdentity;
         if (this._readyState !== WalletReadyState.Unsupported) {
@@ -100,8 +94,8 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 return;
             }
             try {
-                yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield mobileWallet('authorize', { identity: this._appIdentity });
+                yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                    const { auth_token, pub_key: base58PublicKey, wallet_uri_base, } = yield walletAPI({ method: 'authorize', identity: this._appIdentity });
                     try {
                         this._publicKey = new PublicKey(base58PublicKey);
                     }
@@ -133,10 +127,11 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             yield this._authorizationResultCache.set(authorizationResult);
         });
     }
-    performReauthorization(mobileWallet, currentAuthorizationResult) {
+    performReauthorization(walletAPI, currentAuthorizationResult) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { auth_token } = yield mobileWallet('reauthorize', {
+                const { auth_token } = yield walletAPI({
+                    method: 'reauthorize',
                     auth_token: currentAuthorizationResult.authToken,
                 });
                 if (currentAuthorizationResult.authToken !== auth_token) {
@@ -158,12 +153,12 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             this.emit('disconnect');
         });
     }
-    withWallet(callback) {
+    transact(callback) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const walletUriBase = (_a = this._authorizationResult) === null || _a === void 0 ? void 0 : _a.walletUriBase;
             const config = walletUriBase ? { baseUri: walletUriBase } : undefined;
-            return yield withLocalWallet(callback, config);
+            return yield transact(callback, config);
         });
     }
     assertIsAuthorized() {
@@ -177,17 +172,14 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    const serializedTransactions = transactions.map((transaction) => transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    }));
-                    const payloads = serializedTransactions.map((serializedTransaction) => serializedTransaction.toString('base64'));
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: base64EncodedCompiledTransactions } = yield mobileWallet('sign_transaction', { auth_token: freshAuthToken, payloads });
-                        const compiledTransactions = base64EncodedCompiledTransactions.map(getByteArrayFromBase64String);
-                        const transactions = compiledTransactions.map(Transaction.from);
-                        return transactions;
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signedTransactions = yield walletAPI({
+                            method: 'sign_transaction',
+                            auth_token: freshAuthToken,
+                            transactions,
+                        });
+                        return signedTransactions;
                     }));
                 }
                 catch (error) {
@@ -205,34 +197,14 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    if (transaction.feePayer == null) {
-                        transaction.feePayer = this.publicKey || undefined;
-                    }
-                    if (transaction.recentBlockhash == null) {
-                        const { blockhash } = yield connection.getRecentBlockhash(connection.commitment);
-                        transaction.recentBlockhash = blockhash;
-                    }
-                    const serializedTransaction = transaction.serialize({
-                        requireAllSignatures: false,
-                        verifySignatures: false,
-                    });
-                    const payloads = [serializedTransaction.toString('base64')];
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        let targetCommitment;
-                        switch (connection.commitment) {
-                            case 'confirmed':
-                            case 'finalized':
-                            case 'processed':
-                                targetCommitment = connection.commitment;
-                                break;
-                            default:
-                                targetCommitment = 'finalized';
-                        }
-                        const { signatures } = yield mobileWallet('sign_and_send_transaction', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const signatures = yield walletAPI({
+                            method: 'sign_and_send_transaction',
                             auth_token: freshAuthToken,
-                            commitment: targetCommitment,
-                            payloads,
+                            fee_payer: this.publicKey || undefined,
+                            connection,
+                            transactions: [transaction],
                         });
                         return signatures[0];
                     }));
@@ -264,13 +236,13 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             try {
                 const authorizationResult = this.assertIsAuthorized();
                 try {
-                    return yield this.withWallet((mobileWallet) => __awaiter(this, void 0, void 0, function* () {
-                        const freshAuthToken = yield this.performReauthorization(mobileWallet, authorizationResult);
-                        const { signed_payloads: [base64EncodedSignedMessage], } = yield mobileWallet('sign_message', {
+                    return yield this.transact((walletAPI) => __awaiter(this, void 0, void 0, function* () {
+                        const freshAuthToken = yield this.performReauthorization(walletAPI, authorizationResult);
+                        const [signedMessage] = yield walletAPI({
+                            method: 'sign_message',
                             auth_token: freshAuthToken,
-                            payloads: [getBase64StringFromByteArray(message)],
+                            byteArrays: [message],
                         });
-                        const signedMessage = getByteArrayFromBase64String(base64EncodedSignedMessage);
                         const signature = signedMessage.slice(-SIGNATURE_LENGTH_IN_BYTES);
                         return signature;
                     }));

package/lib/types/index.browser.d.mts

@@ -6,9 +6,9 @@ interface AuthorizationResultCache {
     get(): Promise<AuthorizationResult | undefined>;
     set(authorizationResult: AuthorizationResult): Promise<void>;
 }
-declare const SolanaMobileWalletAdapterWalletName: WalletName;
+declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
 declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
-    name: WalletName;
+    name: WalletName<string>;
     url: string;
     icon: string;
     private _appIdentity;
@@ -29,7 +29,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
-    private withWallet;
+    private transact;
     private assertIsAuthorized;
     private performSignTransactions;
     sendTransaction(transaction: Transaction, connection: Connection, _options?: SendOptions): Promise<TransactionSignature>;

package/lib/types/index.browser.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.browser.d.ts

@@ -6,9 +6,9 @@ interface AuthorizationResultCache {
     get(): Promise<AuthorizationResult | undefined>;
     set(authorizationResult: AuthorizationResult): Promise<void>;
 }
-declare const SolanaMobileWalletAdapterWalletName: WalletName;
+declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
 declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
-    name: WalletName;
+    name: WalletName<string>;
     url: string;
     icon: string;
     private _appIdentity;
@@ -29,7 +29,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
-    private withWallet;
+    private transact;
     private assertIsAuthorized;
     private performSignTransactions;
     sendTransaction(transaction: Transaction, connection: Connection, _options?: SendOptions): Promise<TransactionSignature>;

package/lib/types/index.browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.browser.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.d.mts

@@ -6,9 +6,9 @@ interface AuthorizationResultCache {
     get(): Promise<AuthorizationResult | undefined>;
     set(authorizationResult: AuthorizationResult): Promise<void>;
 }
-declare const SolanaMobileWalletAdapterWalletName: WalletName;
+declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
 declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
-    name: WalletName;
+    name: WalletName<string>;
     url: string;
     icon: string;
     private _appIdentity;
@@ -29,7 +29,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
-    private withWallet;
+    private transact;
     private assertIsAuthorized;
     private performSignTransactions;
     sendTransaction(transaction: Transaction, connection: Connection, _options?: SendOptions): Promise<TransactionSignature>;

package/lib/types/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.mts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.d.ts

@@ -6,9 +6,9 @@ interface AuthorizationResultCache {
     get(): Promise<AuthorizationResult | undefined>;
     set(authorizationResult: AuthorizationResult): Promise<void>;
 }
-declare const SolanaMobileWalletAdapterWalletName: WalletName;
+declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
 declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
-    name: WalletName;
+    name: WalletName<string>;
     url: string;
     icon: string;
     private _appIdentity;
@@ -29,7 +29,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
-    private withWallet;
+    private transact;
     private assertIsAuthorized;
     private performSignTransactions;
     sendTransaction(transaction: Transaction, connection: Connection, _options?: SendOptions): Promise<TransactionSignature>;

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts"],"names":[],"mappings":""}

package/lib/types/index.native.d.ts

@@ -0,0 +1,42 @@
+import { AppIdentity, AuthorizationResult } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { BaseMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
+import { Connection, PublicKey, SendOptions, Transaction, TransactionSignature } from "@solana/web3.js";
+interface AuthorizationResultCache {
+    clear(): Promise<void>;
+    get(): Promise<AuthorizationResult | undefined>;
+    set(authorizationResult: AuthorizationResult): Promise<void>;
+}
+declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
+declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+    name: WalletName<string>;
+    url: string;
+    icon: string;
+    private _appIdentity;
+    private _authorizationResult;
+    private _authorizationResultCache;
+    private _connecting;
+    private _publicKey;
+    private _readyState;
+    constructor(config: {
+        appIdentity: AppIdentity;
+        authorizationResultCache: AuthorizationResultCache;
+    });
+    get publicKey(): PublicKey | null;
+    get connected(): boolean;
+    get connecting(): boolean;
+    get readyState(): WalletReadyState;
+    connect(): Promise<void>;
+    private handleAuthorizationResult;
+    private performReauthorization;
+    disconnect(): Promise<void>;
+    private transact;
+    private assertIsAuthorized;
+    private performSignTransactions;
+    sendTransaction(transaction: Transaction, connection: Connection, _options?: SendOptions): Promise<TransactionSignature>;
+    signTransaction(transaction: Transaction): Promise<Transaction>;
+    signAllTransactions(transactions: Transaction[]): Promise<Transaction[]>;
+    signMessage(message: Uint8Array): Promise<Uint8Array>;
+}
+declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;
+export { AuthorizationResultCache, SolanaMobileWalletAdapterWalletName, SolanaMobileWalletAdapter, createDefaultAuthorizationResultCache };
+//# sourceMappingURL=index.native.d.ts.map

package/lib/types/index.native.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/getIsSupported.ts","../../src/adapter.ts","../../src/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/createDefaultAuthorizationResultCache.ts","../../src/__forks__/react-native/getIsSupported.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,22 +1,26 @@
 {
     "name": "@solana-mobile/wallet-adapter-mobile",
     "description": "An adapter for mobile wallet apps that conform to the Solana Mobile Wallet Adapter protocol",
-    "version": "0.0.1-alpha.0",
+    "version": "0.0.1-alpha.3",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
-    "repository": "https://github.com/solana-mobile/wallet-adapter-mobile",
+    "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
     "license": "Apache-2.0",
     "type": "module",
     "sideEffects": false,
     "main": "lib/cjs/index.js",
     "module": "lib/esm/index.mjs",
+    "react-native": "lib/cjs/index.native.js",
     "types": "lib/types/index.d.ts",
     "browser": {
         "./lib/cjs/index.js": "./lib/cjs/index.browser.js",
         "./lib/esm/index.mjs": "./lib/esm/index.browser.mjs"
     },
     "exports": {
-        "import": "./lib/esm/index.mjs",
-        "require": "./lib/cjs/index.js"
+        "./package.json": "./package.json",
+        ".": {
+            "import": "./lib/esm/index.mjs",
+            "require": "./lib/esm/index.cjs"
+        }
     },
     "files": [
         "lib",
@@ -36,11 +40,14 @@
         "@solana/web3.js": "^1.36.0"
     },
     "dependencies": {
-        "@solana-mobile/mobile-wallet-adapter-protocol": "^0.0.1-alpha.0",
-        "@solana/wallet-adapter-base": "^0.9.0",
+        "@react-native-async-storage/async-storage": "^1.17.7",
+        "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^0.0.1-alpha.3",
+        "@solana/wallet-adapter-base": "^0.9.8",
         "@solana/web3.js": "^1.20.0"
     },
     "devDependencies": {
-        "agadoo": "^2.0.0"
-    }
+        "agadoo": "^2.0.0",
+        "shx": "^0.3.4"
+    },
+    "gitHead": "33b0d8a9bdac3960a95bde4012b66a2ee0f02695"
 }