@solana-mobile/mobile-wallet-adapter-protocol 2.2.4 → 2.2.6

package/lib/cjs/index.native.js

@@ -1,10 +1,9 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var reactNative = require('react-native');
-var walletStandardUtil = require('@solana/wallet-standard-util');
 var jsBase64 = require('js-base64');
+var walletStandardUtil = require('@solana/wallet-standard-util');
+var codecsStrings = require('@solana/codecs-strings');
 
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 const SolanaMobileWalletAdapterErrorCode = {
@@ -17,8 +16,12 @@ const SolanaMobileWalletAdapterErrorCode = {
     ERROR_WALLET_NOT_FOUND: 'ERROR_WALLET_NOT_FOUND',
     ERROR_INVALID_PROTOCOL_VERSION: 'ERROR_INVALID_PROTOCOL_VERSION',
     ERROR_BROWSER_NOT_SUPPORTED: 'ERROR_BROWSER_NOT_SUPPORTED',
+    ERROR_LOOPBACK_ACCESS_BLOCKED: 'ERROR_LOOPBACK_ACCESS_BLOCKED',
+    ERROR_ASSOCIATION_CANCELLED: 'ERROR_ASSOCIATION_CANCELLED',
 };
 class SolanaMobileWalletAdapterError extends Error {
+    data;
+    code;
     constructor(...args) {
         const [code, message, data] = args;
         super(message);
@@ -38,6 +41,9 @@ const SolanaMobileWalletAdapterProtocolErrorCode = {
     ERROR_ATTEST_ORIGIN_ANDROID: -100,
 };
 class SolanaMobileWalletAdapterProtocolError extends Error {
+    data;
+    code;
+    jsonRpcMessageId;
     constructor(...args) {
         const [jsonRpcMessageId, code, message, data] = args;
         super(message);
@@ -48,38 +54,16 @@ class SolanaMobileWalletAdapterProtocolError extends Error {
     }
 }
 
-/******************************************************************************
-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());
-    });
-}
-
 var NativeSolanaMobileWalletAdapter = reactNative.TurboModuleRegistry.getEnforcing('SolanaMobileWalletAdapter');
 
 function createSIWSMessage(payload) {
     return walletStandardUtil.createSignInMessageText(payload);
 }
-function createSIWSMessageBase64(payload) {
-    return jsBase64.encode(createSIWSMessage(payload));
+function createSIWSMessageBase64Url(payload) {
+    return jsBase64.encode(createSIWSMessage(payload))
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=+$/, ''); // convert to base64url encoding;
 }
 
 // optional features
@@ -87,6 +71,13 @@ const SolanaSignTransactions = 'solana:signTransactions';
 const SolanaCloneAuthorization = 'solana:cloneAuthorization';
 const SolanaSignInWithSolana = 'solana:signInWithSolana';
 
+function fromUint8Array(byteArray) {
+    return codecsStrings.getBase58Decoder().decode(byteArray);
+}
+function base64ToBase58(base64EncodedString) {
+    return fromUint8Array(jsBase64.toUint8Array(base64EncodedString));
+}
+
 /**
  * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
  *
@@ -105,16 +96,14 @@ function createMobileWalletProxy(protocolVersion, protocolRequestHandler) {
                 return null;
             }
             if (target[p] == null) {
-                target[p] = function (inputParams) {
-                    return __awaiter(this, void 0, void 0, function* () {
-                        const { method, params } = handleMobileWalletRequest(p, inputParams, protocolVersion);
-                        const result = yield protocolRequestHandler(method, params);
-                        // if the request tried to sign in but the wallet did not return a sign in result, fallback on message signing
-                        if (method === 'authorize' && params.sign_in_payload && !result.sign_in_result) {
-                            result['sign_in_result'] = yield signInFallback(params.sign_in_payload, result, protocolRequestHandler);
-                        }
-                        return handleMobileWalletResponse(p, result, protocolVersion);
-                    });
+                target[p] = async function (inputParams) {
+                    const { method, params } = handleMobileWalletRequest(p, inputParams, protocolVersion);
+                    const result = await protocolRequestHandler(method, params);
+                    // if the request tried to sign in but the wallet did not return a sign in result, fallback on message signing
+                    if (method === 'authorize' && params.sign_in_payload && !result.sign_in_result) {
+                        result['sign_in_result'] = await signInFallback(params.sign_in_payload, result, protocolRequestHandler);
+                    }
+                    return handleMobileWalletResponse(p, result, protocolVersion);
                 };
             }
             return target[p];
@@ -218,42 +207,52 @@ function handleMobileWalletResponse(method, response, protocolVersion) {
                     if (capabilities.supports_clone_authorization === true) {
                         features.push(SolanaCloneAuthorization);
                     }
-                    return Object.assign(Object.assign({}, capabilities), { features: features });
+                    return {
+                        ...capabilities,
+                        features: features,
+                    };
                 }
                 case 'v1': {
-                    return Object.assign(Object.assign({}, capabilities), { supports_sign_and_send_transactions: true, supports_clone_authorization: capabilities.features.includes(SolanaCloneAuthorization) });
+                    return {
+                        ...capabilities,
+                        supports_sign_and_send_transactions: true,
+                        supports_clone_authorization: capabilities.features.includes(SolanaCloneAuthorization)
+                    };
                 }
             }
         }
     }
     return response;
 }
-function signInFallback(signInPayload, authorizationResult, protocolRequestHandler) {
-    var _a;
-    return __awaiter(this, void 0, void 0, function* () {
-        const domain = (_a = signInPayload.domain) !== null && _a !== void 0 ? _a : window.location.host;
-        const address = authorizationResult.accounts[0].address;
-        const siwsMessage = createSIWSMessageBase64(Object.assign(Object.assign({}, signInPayload), { domain, address }));
-        const signMessageResult = yield protocolRequestHandler('sign_messages', {
-            addresses: [address],
-            payloads: [siwsMessage]
-        });
-        const signInResult = {
-            address: address,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
-        };
-        return signInResult;
+async function signInFallback(signInPayload, authorizationResult, protocolRequestHandler) {
+    const domain = signInPayload.domain ?? window.location.host;
+    const address = authorizationResult.accounts[0].address;
+    const siwsMessage = createSIWSMessageBase64Url({ ...signInPayload, domain, address: base64ToBase58(address) });
+    const signMessageResult = await protocolRequestHandler('sign_messages', {
+        addresses: [address],
+        payloads: [siwsMessage]
     });
+    const signedPayload = jsBase64.toUint8Array(signMessageResult.signed_payloads[0]);
+    const signedMessage = jsBase64.fromUint8Array(signedPayload.slice(0, signedPayload.length - 64));
+    const signature = jsBase64.fromUint8Array(signedPayload.slice(signedPayload.length - 64));
+    const signInResult = {
+        address: address,
+        // Workaround: some wallets have been observed to only reply with the message signature.
+        // This is non-compliant with the spec, but in the interest of maximizing compatibility,
+        // detect this case and reuse the original message.
+        signed_message: signedMessage.length == 0 ? siwsMessage : signedMessage,
+        signature
+    };
+    return signInResult;
 }
 
 reactNative.AppRegistry.registerHeadlessTask('SolanaMobileWalletAdapterSessionBackgroundTask', () => {
-    return () => __awaiter(void 0, void 0, void 0, function* () {
+    return async () => {
         // This is a no-op task that is used to keep the app alive while the session is active.
         // The actual session management is handled in the native module.
         // This is necessary for the React Native Android implementation to work correctly.
         // The task is started before startActivityResult and stopped when the activity result callback is triggered
-    });
+    };
 });
 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' +
@@ -294,31 +293,29 @@ function handleError(e) {
     }
     throw e;
 }
-function transact(callback, config) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let didSuccessfullyConnect = false;
-        try {
-            const sessionProperties = yield SolanaMobileWalletAdapter.startSession(config);
-            didSuccessfullyConnect = true;
-            const wallet = createMobileWalletProxy(sessionProperties.protocol_version, (method, params) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    return SolanaMobileWalletAdapter.invoke(method, params);
-                }
-                catch (e) {
-                    return handleError(e);
-                }
-            }));
-            return yield callback(wallet);
-        }
-        catch (e) {
-            return handleError(e);
-        }
-        finally {
-            if (didSuccessfullyConnect) {
-                yield SolanaMobileWalletAdapter.endSession();
+async function transact(callback, config) {
+    let didSuccessfullyConnect = false;
+    try {
+        const 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();
         }
-    });
+    }
 }
 
 exports.SolanaCloneAuthorization = SolanaCloneAuthorization;