@solana-mobile/mobile-wallet-adapter-protocol 2.0.1 → 2.1.0-alpha1

package/lib/types/index.d.ts

@@ -1,4 +1,6 @@
 import { TransactionVersion } from "@solana/web3.js";
+import { SolanaSignInInput } from "@solana/wallet-standard";
+import { IdentifierArray, IdentifierString, WalletAccount, WalletIcon } from "@wallet-standard/core";
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_ASSOCIATION_PORT_OUT_OF_RANGE: "ERROR_ASSOCIATION_PORT_OUT_OF_RANGE";
@@ -7,6 +9,7 @@ declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_SESSION_CLOSED: "ERROR_SESSION_CLOSED";
     readonly ERROR_SESSION_TIMEOUT: "ERROR_SESSION_TIMEOUT";
     readonly ERROR_WALLET_NOT_FOUND: "ERROR_WALLET_NOT_FOUND";
+    readonly ERROR_INVALID_PROTOCOL_VERSION: "ERROR_INVALID_PROTOCOL_VERSION";
 };
 type SolanaMobileWalletAdapterErrorCodeEnum = (typeof SolanaMobileWalletAdapterErrorCode)[keyof typeof SolanaMobileWalletAdapterErrorCode];
 type ErrorDataTypeMap = {
@@ -20,6 +23,7 @@ type ErrorDataTypeMap = {
     };
     [SolanaMobileWalletAdapterErrorCode.ERROR_SESSION_TIMEOUT]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND]: undefined;
+    [SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION]: undefined;
 };
 declare class SolanaMobileWalletAdapterError<TErrorCode extends SolanaMobileWalletAdapterErrorCodeEnum> extends Error {
     data: ErrorDataTypeMap[TErrorCode] | undefined;
@@ -74,7 +78,10 @@ declare class SolanaMobileWalletAdapterProtocolError<TErrorCode extends SolanaMo
 type Account = Readonly<{
     address: Base64EncodedAddress;
     label?: string;
-}>;
+    icon?: WalletIcon;
+    chains?: IdentifierArray;
+    features?: IdentifierArray;
+}> | WalletAccount;
 /**
  * Properties that wallets may present to users when an app
  * asks for authorization to execute privileged methods (see
@@ -91,6 +98,10 @@ type AppIdentity = Readonly<{
  * The private key is used during session establishment.
  */
 type AssociationKeypair = CryptoKeyPair;
+type ProtocolVersion = "v1" | "legacy";
+type SessionProperties = Readonly<{
+    protocol_version: ProtocolVersion;
+}>;
 /**
  * The context returned from a wallet after having authorized a given
  * account for use with a given application. You can cache this and
@@ -100,6 +111,7 @@ type AuthorizationResult = Readonly<{
     accounts: Account[];
     auth_token: AuthToken;
     wallet_uri_base: string;
+    sign_in_result?: SignInResult;
 }>;
 type AuthToken = string;
 type Base64EncodedAddress = string;
@@ -108,16 +120,31 @@ type Base64EncodedMessage = string;
 type Base64EncodedSignedMessage = string;
 type Base64EncodedSignedTransaction = string;
 type Base64EncodedTransaction = string;
+/**
+ * @deprecated Replaced by the 'chain' parameter, which adds multi-chain capability as per MWA 2.0 spec.
+ */
 type Cluster = "devnet" | "testnet" | "mainnet-beta";
+type Chain = IdentifierString | Cluster;
 type Finality = "confirmed" | "finalized" | "processed";
 type WalletAssociationConfig = Readonly<{
     baseUri?: string;
 }>;
 interface AuthorizeAPI {
+    /**
+     * @deprecated Replaced by updated authorize() method, which adds MWA 2.0 spec support.
+     */
     authorize(params: {
         cluster: Cluster;
         identity: AppIdentity;
     }): Promise<AuthorizationResult>;
+    authorize(params: {
+        identity: AppIdentity;
+        chain?: Chain;
+        features?: IdentifierArray;
+        addresses?: string[];
+        auth_token?: AuthToken;
+        sign_in_payload?: SignInPayload;
+    }): Promise<AuthorizationResult>;
 }
 interface CloneAuthorizationAPI {
     cloneAuthorization(params: {
@@ -133,11 +160,18 @@ interface DeauthorizeAPI {
 }
 interface GetCapabilitiesAPI {
     getCapabilities(): Promise<Readonly<{
+        max_transactions_per_request: number;
+        max_messages_per_request: number;
+        supported_transaction_versions: ReadonlyArray<TransactionVersion>;
+        features: IdentifierArray;
+        /**
+         * @deprecated Replaced by features array.
+         */
         supports_clone_authorization: boolean;
+        /**
+         * @deprecated Replaced by features array.
+         */
         supports_sign_and_send_transactions: boolean;
-        max_transactions_per_request: boolean;
-        max_messages_per_request: boolean;
-        supported_transaction_versions: ReadonlyArray<TransactionVersion>;
     }>>;
 }
 interface ReauthorizeAPI {
@@ -165,6 +199,10 @@ interface SignAndSendTransactionsAPI {
     signAndSendTransactions(params: {
         options?: Readonly<{
             min_context_slot?: number;
+            commitment?: string;
+            skip_preflight?: boolean;
+            max_retries?: number;
+            wait_for_commitment_to_send_next_transaction?: boolean;
         }>;
         payloads: Base64EncodedTransaction[];
     }): Promise<Readonly<{
@@ -173,6 +211,31 @@ interface SignAndSendTransactionsAPI {
 }
 interface MobileWallet extends AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI {
 }
+// optional features
+declare const SolanaSignTransactions = "solana:signTransactions";
+declare const SolanaCloneAuthorization = "solana:cloneAuthorization";
+declare const SolanaSignInWithSolana = "solana:signInWithSolana";
+type SignInPayload = Readonly<{
+    domain?: string;
+    address?: string;
+    statement?: string;
+    uri?: string;
+    version?: string;
+    chainId?: string;
+    nonce?: string;
+    issuedAt?: string;
+    expirationTime?: string;
+    notBefore?: string;
+    requestId?: string;
+    resources?: readonly string[];
+}> | SolanaSignInInput;
+type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<SignInPayload, "domain" | "address">>;
+type SignInResult = Readonly<{
+    address: Base64EncodedAddress;
+    signed_message: Base64EncodedSignedMessage;
+    signature: Base64EncodedAddress;
+    signature_type?: string;
+}>;
 declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
-export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, Account, AppIdentity, AssociationKeypair, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Finality, WalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet };
+export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/createSequenceNumberVector.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/parseHelloRsp.ts","../../src/jsonRpcMessage.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/types.ts","../../src/transact.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/base64Utils.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/transact.ts"],"names":[],"mappings":""}

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

@@ -1,4 +1,6 @@
 import { TransactionVersion } from "@solana/web3.js";
+import { SolanaSignInInput } from "@solana/wallet-standard";
+import { IdentifierArray, IdentifierString, WalletAccount, WalletIcon } from "@wallet-standard/core";
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_ASSOCIATION_PORT_OUT_OF_RANGE: "ERROR_ASSOCIATION_PORT_OUT_OF_RANGE";
@@ -7,6 +9,7 @@ declare const SolanaMobileWalletAdapterErrorCode: {
     readonly ERROR_SESSION_CLOSED: "ERROR_SESSION_CLOSED";
     readonly ERROR_SESSION_TIMEOUT: "ERROR_SESSION_TIMEOUT";
     readonly ERROR_WALLET_NOT_FOUND: "ERROR_WALLET_NOT_FOUND";
+    readonly ERROR_INVALID_PROTOCOL_VERSION: "ERROR_INVALID_PROTOCOL_VERSION";
 };
 type SolanaMobileWalletAdapterErrorCodeEnum = (typeof SolanaMobileWalletAdapterErrorCode)[keyof typeof SolanaMobileWalletAdapterErrorCode];
 type ErrorDataTypeMap = {
@@ -20,6 +23,7 @@ type ErrorDataTypeMap = {
     };
     [SolanaMobileWalletAdapterErrorCode.ERROR_SESSION_TIMEOUT]: undefined;
     [SolanaMobileWalletAdapterErrorCode.ERROR_WALLET_NOT_FOUND]: undefined;
+    [SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION]: undefined;
 };
 declare class SolanaMobileWalletAdapterError<TErrorCode extends SolanaMobileWalletAdapterErrorCodeEnum> extends Error {
     data: ErrorDataTypeMap[TErrorCode] | undefined;
@@ -74,7 +78,10 @@ declare class SolanaMobileWalletAdapterProtocolError<TErrorCode extends SolanaMo
 type Account = Readonly<{
     address: Base64EncodedAddress;
     label?: string;
-}>;
+    icon?: WalletIcon;
+    chains?: IdentifierArray;
+    features?: IdentifierArray;
+}> | WalletAccount;
 /**
  * Properties that wallets may present to users when an app
  * asks for authorization to execute privileged methods (see
@@ -91,6 +98,10 @@ type AppIdentity = Readonly<{
  * The private key is used during session establishment.
  */
 type AssociationKeypair = CryptoKeyPair;
+type ProtocolVersion = "v1" | "legacy";
+type SessionProperties = Readonly<{
+    protocol_version: ProtocolVersion;
+}>;
 /**
  * The context returned from a wallet after having authorized a given
  * account for use with a given application. You can cache this and
@@ -100,6 +111,7 @@ type AuthorizationResult = Readonly<{
     accounts: Account[];
     auth_token: AuthToken;
     wallet_uri_base: string;
+    sign_in_result?: SignInResult;
 }>;
 type AuthToken = string;
 type Base64EncodedAddress = string;
@@ -108,16 +120,31 @@ type Base64EncodedMessage = string;
 type Base64EncodedSignedMessage = string;
 type Base64EncodedSignedTransaction = string;
 type Base64EncodedTransaction = string;
+/**
+ * @deprecated Replaced by the 'chain' parameter, which adds multi-chain capability as per MWA 2.0 spec.
+ */
 type Cluster = "devnet" | "testnet" | "mainnet-beta";
+type Chain = IdentifierString | Cluster;
 type Finality = "confirmed" | "finalized" | "processed";
 type WalletAssociationConfig = Readonly<{
     baseUri?: string;
 }>;
 interface AuthorizeAPI {
+    /**
+     * @deprecated Replaced by updated authorize() method, which adds MWA 2.0 spec support.
+     */
     authorize(params: {
         cluster: Cluster;
         identity: AppIdentity;
     }): Promise<AuthorizationResult>;
+    authorize(params: {
+        identity: AppIdentity;
+        chain?: Chain;
+        features?: IdentifierArray;
+        addresses?: string[];
+        auth_token?: AuthToken;
+        sign_in_payload?: SignInPayload;
+    }): Promise<AuthorizationResult>;
 }
 interface CloneAuthorizationAPI {
     cloneAuthorization(params: {
@@ -133,11 +160,18 @@ interface DeauthorizeAPI {
 }
 interface GetCapabilitiesAPI {
     getCapabilities(): Promise<Readonly<{
+        max_transactions_per_request: number;
+        max_messages_per_request: number;
+        supported_transaction_versions: ReadonlyArray<TransactionVersion>;
+        features: IdentifierArray;
+        /**
+         * @deprecated Replaced by features array.
+         */
         supports_clone_authorization: boolean;
+        /**
+         * @deprecated Replaced by features array.
+         */
         supports_sign_and_send_transactions: boolean;
-        max_transactions_per_request: boolean;
-        max_messages_per_request: boolean;
-        supported_transaction_versions: ReadonlyArray<TransactionVersion>;
     }>>;
 }
 interface ReauthorizeAPI {
@@ -165,6 +199,10 @@ interface SignAndSendTransactionsAPI {
     signAndSendTransactions(params: {
         options?: Readonly<{
             min_context_slot?: number;
+            commitment?: string;
+            skip_preflight?: boolean;
+            max_retries?: number;
+            wait_for_commitment_to_send_next_transaction?: boolean;
         }>;
         payloads: Base64EncodedTransaction[];
     }): Promise<Readonly<{
@@ -173,6 +211,31 @@ interface SignAndSendTransactionsAPI {
 }
 interface MobileWallet extends AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI {
 }
+// optional features
+declare const SolanaSignTransactions = "solana:signTransactions";
+declare const SolanaCloneAuthorization = "solana:cloneAuthorization";
+declare const SolanaSignInWithSolana = "solana:signInWithSolana";
+type SignInPayload = Readonly<{
+    domain?: string;
+    address?: string;
+    statement?: string;
+    uri?: string;
+    version?: string;
+    chainId?: string;
+    nonce?: string;
+    issuedAt?: string;
+    expirationTime?: string;
+    notBefore?: string;
+    requestId?: string;
+    resources?: readonly string[];
+}> | SolanaSignInInput;
+type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<SignInPayload, "domain" | "address">>;
+type SignInResult = Readonly<{
+    address: Base64EncodedAddress;
+    signed_message: Base64EncodedSignedMessage;
+    signature: Base64EncodedAddress;
+    signature_type?: string;
+}>;
 declare function transact<TReturn>(callback: (wallet: MobileWallet) => TReturn, config?: WalletAssociationConfig): Promise<TReturn>;
-export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, Account, AppIdentity, AssociationKeypair, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Finality, WalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet };
+export { SolanaMobileWalletAdapterErrorCode, SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolErrorCode, SolanaMobileWalletAdapterProtocolError, transact, Account, AppIdentity, AssociationKeypair, ProtocolVersion, SessionProperties, AuthorizationResult, AuthToken, Base64EncodedAddress, Base64EncodedTransaction, Cluster, Chain, Finality, WalletAssociationConfig, AuthorizeAPI, CloneAuthorizationAPI, DeauthorizeAPI, GetCapabilitiesAPI, ReauthorizeAPI, SignMessagesAPI, SignTransactionsAPI, SignAndSendTransactionsAPI, MobileWallet, SolanaSignTransactions, SolanaCloneAuthorization, SolanaSignInWithSolana, SignInPayload, SignInPayloadWithRequiredFields, SignInResult };
 //# sourceMappingURL=index.native.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/createSequenceNumberVector.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/parseHelloRsp.ts","../../src/jsonRpcMessage.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/types.ts","../../src/transact.ts","../../src/__forks__/react-native/transact.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.native.d.ts","sourceRoot":"","sources":["../../src/index.ts","../../src/errors.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/base64Utils.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/associationPort.ts","../../src/arrayBufferToBase64String.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/startSession.ts","../../src/transact.ts","../../src/__forks__/react-native/transact.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/mobile-wallet-adapter-protocol",
     "description": "An implementation of the Solana Mobile Mobile Wallet Adapter protocol. Use this to open a session with a mobile wallet app, and to issue API calls to it.",
-    "version": "2.0.1",
+    "version": "2.1.0-alpha1",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
     "license": "Apache-2.0",
@@ -38,13 +38,21 @@
         "postbuild": "cross-env echo {\\\"type\\\":\\\"commonjs\\\"} | npx json > lib/cjs/package.json && echo {\\\"type\\\":\\\"module\\\"} | npx json > lib/esm/package.json",
         "prepublishOnly": "agadoo"
     },
+    "dependencies": {
+        "@solana/wallet-standard": "^1.1.2",
+        "@solana/wallet-standard-util": "^1.1.1",
+        "@wallet-standard/core": "^1.0.3",
+        "js-base64": "^3.7.5"
+    },
     "devDependencies": {
         "@solana/web3.js": "^1.58.0",
         "@types/react-native": "^0.69.3",
         "agadoo": "^2.0.0",
-        "cross-env": "^7.0.3"
+        "cross-env": "^7.0.3",
+        "shx": "^0.3.4"
     },
     "peerDependencies": {
+        "@solana/web3.js": "^1.58.0",
         "react-native": ">0.69"
     }
 }

package/src/__forks__/react-native/base64Utils.ts

@@ -0,0 +1 @@
+export { encode } from 'js-base64';

package/src/__forks__/react-native/transact.ts

@@ -1,106 +1,92 @@
-import { NativeModules, Platform } from 'react-native';
-
-import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolError } from '../../errors.js';
-import { MobileWallet, WalletAssociationConfig } from '../../types.js';
-
-type ReactNativeError = Error & { code?: string; userInfo?: Record<string, unknown> };
-
-const LINKING_ERROR =
-    `The package 'solana-mobile-wallet-adapter-protocol' doesn't seem to be linked. Make sure: \n\n` +
-    '- You rebuilt the app after installing the package\n' +
-    '- If you are using Lerna workspaces\n' +
-    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` as an explicit dependency, and\n' +
-    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` to the `nohoist` section of your package.json\n' +
-    '- You are not using Expo managed workflow\n';
-
-const SolanaMobileWalletAdapter =
-    Platform.OS === 'android' && NativeModules.SolanaMobileWalletAdapter
-        ? NativeModules.SolanaMobileWalletAdapter
-        : new Proxy(
-              {},
-              {
-                  get() {
-                      throw new Error(
-                          Platform.OS !== 'android'
-                              ? 'The package `solana-mobile-wallet-adapter-protocol` is only compatible with React Native Android'
-                              : LINKING_ERROR,
-                      );
-                  },
-              },
-          );
-
-function getErrorMessage(e: ReactNativeError): string {
-    switch (e.code) {
-        case 'ERROR_WALLET_NOT_FOUND':
-            return 'Found no installed wallet that supports the mobile wallet protocol.';
-        default:
-            return e.message;
-    }
-}
-
-function handleError(e: any): never {
-    if (e instanceof Error) {
-        const reactNativeError: ReactNativeError = e;
-        switch (reactNativeError.code) {
-            case undefined:
-                throw e;
-            case 'JSON_RPC_ERROR': {
-                const details = reactNativeError.userInfo as Readonly<{ jsonRpcErrorCode: number }>;
-                throw new SolanaMobileWalletAdapterProtocolError(
-                    0 /* jsonRpcMessageId */,
-                    details.jsonRpcErrorCode,
-                    e.message,
-                );
-            }
-            default:
-                throw new SolanaMobileWalletAdapterError<any>(
-                    reactNativeError.code,
-                    getErrorMessage(reactNativeError),
-                    reactNativeError.userInfo,
-                );
-        }
-    }
-    throw e;
-}
-
-export async function transact<TReturn>(
-    callback: (wallet: MobileWallet) => TReturn,
-    config?: WalletAssociationConfig,
-): Promise<TReturn> {
-    let didSuccessfullyConnect = false;
-    try {
-        await SolanaMobileWalletAdapter.startSession(config);
-        didSuccessfullyConnect = true;
-        const wallet = new Proxy<MobileWallet>({} as MobileWallet, {
-            get<TMethodName extends keyof MobileWallet>(target: MobileWallet, p: TMethodName) {
-                if (target[p] == null) {
-                    const method = p
-                        .toString()
-                        .replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`)
-                        .toLowerCase();
-                    target[p] = async function (params: Parameters<MobileWallet[TMethodName]>[0]) {
-                        try {
-                            return await SolanaMobileWalletAdapter.invoke(method, params);
-                        } catch (e) {
-                            return handleError(e);
-                        }
-                    } as MobileWallet[TMethodName];
-                }
-                return target[p];
-            },
-            defineProperty() {
-                return false;
-            },
-            deleteProperty() {
-                return false;
-            },
-        });
-        return await callback(wallet);
-    } catch (e) {
-        return handleError(e);
-    } finally {
-        if (didSuccessfullyConnect) {
-            await SolanaMobileWalletAdapter.endSession();
-        }
-    }
-}
+import { NativeModules, Platform } from 'react-native';
+
+import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterProtocolError } from '../../errors.js';
+import { MobileWallet, SessionProperties,WalletAssociationConfig } from '../../types.js';
+import createMobileWalletProxy from '../../createMobileWalletProxy.js';
+
+type ReactNativeError = Error & { code?: string; userInfo?: Record<string, unknown> };
+
+const LINKING_ERROR =
+    `The package 'solana-mobile-wallet-adapter-protocol' doesn't seem to be linked. Make sure: \n\n` +
+    '- You rebuilt the app after installing the package\n' +
+    '- If you are using Lerna workspaces\n' +
+    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` as an explicit dependency, and\n' +
+    '  - You have added `@solana-mobile/mobile-wallet-adapter-protocol` to the `nohoist` section of your package.json\n' +
+    '- You are not using Expo managed workflow\n';
+
+const SolanaMobileWalletAdapter =
+    Platform.OS === 'android' && NativeModules.SolanaMobileWalletAdapter
+        ? NativeModules.SolanaMobileWalletAdapter
+        : new Proxy(
+              {},
+              {
+                  get() {
+                      throw new Error(
+                          Platform.OS !== 'android'
+                              ? 'The package `solana-mobile-wallet-adapter-protocol` is only compatible with React Native Android'
+                              : LINKING_ERROR,
+                      );
+                  },
+              },
+          );
+
+function getErrorMessage(e: ReactNativeError): string {
+    switch (e.code) {
+        case 'ERROR_WALLET_NOT_FOUND':
+            return 'Found no installed wallet that supports the mobile wallet protocol.';
+        default:
+            return e.message;
+    }
+}
+
+function handleError(e: any): never {
+    if (e instanceof Error) {
+        const reactNativeError: ReactNativeError = e;
+        switch (reactNativeError.code) {
+            case undefined:
+                throw e;
+            case 'JSON_RPC_ERROR': {
+                const details = reactNativeError.userInfo as Readonly<{ jsonRpcErrorCode: number }>;
+                throw new SolanaMobileWalletAdapterProtocolError(
+                    0 /* jsonRpcMessageId */,
+                    details.jsonRpcErrorCode,
+                    e.message,
+                );
+            }
+            default:
+                throw new SolanaMobileWalletAdapterError<any>(
+                    reactNativeError.code,
+                    getErrorMessage(reactNativeError),
+                    reactNativeError.userInfo,
+                );
+        }
+    }
+    throw e;
+}
+
+export async function transact<TReturn>(
+    callback: (wallet: MobileWallet) => TReturn,
+    config?: WalletAssociationConfig,
+): Promise<TReturn> {
+    let didSuccessfullyConnect = false;
+    try {
+        const sessionProperties: SessionProperties = await SolanaMobileWalletAdapter.startSession(config);
+        didSuccessfullyConnect = true;
+        const wallet = createMobileWalletProxy(sessionProperties.protocol_version, 
+            async (method, params) => {
+                try {
+                    return SolanaMobileWalletAdapter.invoke(method, params);
+                } catch (e) {
+                    return handleError(e);
+                }
+            }
+        );
+        return await callback(wallet);
+    } catch (e) {
+        return handleError(e);
+    } finally {
+        if (didSuccessfullyConnect) {
+            await SolanaMobileWalletAdapter.endSession();
+        }
+    }
+}

package/src/base64Utils.ts

@@ -0,0 +1,3 @@
+export function encode(input: string): string {
+    return window.btoa(input);
+}