@solana-mobile/mobile-wallet-adapter-protocol 2.2.3 → 2.2.5

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.12.0'
+    classpath 'com.android.tools.build:gradle:8.13.0'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -144,7 +144,7 @@ def kotlin_version = getExtOrDefault('kotlinVersion')
 dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"  // From node_modules
-  implementation "com.solanamobile:mobile-wallet-adapter-clientlib:2.0.8"
+  implementation "com.solanamobile:mobile-wallet-adapter-clientlib:2.1.0"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
 }

package/android/src/main/java/com/solanamobile/mobilewalletadapter/reactnative/SolanaMobileWalletAdapterModule.kt

@@ -49,7 +49,7 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
     private val mActivityEventListener: ActivityEventListener =
         object : BaseActivityEventListener() {
             override fun onActivityResult(
-                activity: Activity?,
+                activity: Activity,
                 requestCode: Int,
                 resultCode: Int,
                 data: Intent?
@@ -61,10 +61,10 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
 
     private val sessionBackgroundTaskConfig
         get() = HeadlessJsTaskConfig(
-            taskKey = "SolanaMobileWalletAdapterSessionBackgroundTask",
-            timeout = 0,
-            data = Arguments.createMap(),
-            isAllowedInForeground = true
+            "SolanaMobileWalletAdapterSessionBackgroundTask",
+            Arguments.createMap(),
+            0,
+            true
         )
 
     init {
@@ -87,6 +87,10 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
                     if (taskId != null && headlessJsTaskContext.isTaskRunning(taskId)) {
                         headlessJsTaskContext.finishTask(taskId)
                     }
+                    // fix for Expo 52/RN 0.72/0.73 where the older kotlin/gradle toolchain complains 
+                    // about the above if statement being used as an expression. Explicitly returning 
+                    // Unit here tells the compiler that the above if is not an expression
+                    Unit
                 } catch (e: Exception) {
                     Log.w(TAG, "Failed to finish headless JS task", e)
                 }
@@ -121,10 +125,11 @@ class SolanaMobileWalletAdapterModule(reactContext: ReactApplicationContext) :
                     // stop the headless js task, regardless if the association was successful or not
                     finishHeadlessTask(sessionTaskId)
                 }
-                currentActivity?.startActivityForResult(intent, REQUEST_LOCAL_ASSOCIATION)
-                    ?: throw NullPointerException(
-                        "Could not find a current activity from which to launch a local association"
-                    )
+                reactApplicationContext.currentActivity?.apply {
+                    startActivityForResult(intent, REQUEST_LOCAL_ASSOCIATION)
+                } ?: throw NullPointerException(
+                    "Could not find a current activity from which to launch a local association"
+                )
                 val client = localAssociation.start()
                     .get(ASSOCIATION_TIMEOUT_MS.toLong(), TimeUnit.MILLISECONDS)
                 sessionState = SessionState(client, localAssociation)

package/lib/cjs/index.browser.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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 = {
@@ -74,7 +75,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
 function encode(input) {
     return window.btoa(input);
 }
-function fromUint8Array(byteArray, urlsafe) {
+function fromUint8Array$1(byteArray, urlsafe) {
     const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
     if (urlsafe) {
         return base64
@@ -106,8 +107,11 @@ function createHelloReq(ecdhPublicKey, associationKeypairPrivateKey) {
 function createSIWSMessage(payload) {
     return walletStandardUtil.createSignInMessageText(payload);
 }
-function createSIWSMessageBase64(payload) {
-    return encode(createSIWSMessage(payload));
+function createSIWSMessageBase64Url(payload) {
+    return encode(createSIWSMessage(payload))
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=+$/, ''); // convert to base64url encoding;
 }
 
 // optional features
@@ -115,6 +119,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(toUint8Array(base64EncodedString));
+}
+
 /**
  * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
  *
@@ -261,15 +272,21 @@ function signInFallback(signInPayload, authorizationResult, protocolRequestHandl
     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 siwsMessage = createSIWSMessageBase64Url(Object.assign(Object.assign({}, signInPayload), { domain, address: base64ToBase58(address) }));
         const signMessageResult = yield protocolRequestHandler('sign_messages', {
             addresses: [address],
             payloads: [siwsMessage]
         });
+        const signedPayload = toUint8Array(signMessageResult.signed_payloads[0]);
+        const signedMessage = fromUint8Array$1(signedPayload.slice(0, signedPayload.length - 64));
+        const signature = fromUint8Array$1(signedPayload.slice(signedPayload.length - 64));
         const signInResult = {
             address: address,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
+            // 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;
     });
@@ -422,7 +439,7 @@ function getRemoteAssociateAndroidIntentURL(associationPublicKey, hostAuthority,
         const url = getIntentURL('v1/associate/remote', associationURLBase);
         url.searchParams.set('association', getStringWithURLUnsafeCharactersReplaced(encodedKey));
         url.searchParams.set('reflector', `${hostAuthority}`);
-        url.searchParams.set('id', `${fromUint8Array(reflectorId, true)}`);
+        url.searchParams.set('id', `${fromUint8Array$1(reflectorId, true)}`);
         protocolVersions.forEach((version) => {
             url.searchParams.set('v', version);
         });
@@ -953,7 +970,7 @@ function startRemoteScenario(config) {
                             const ecdhKeypair = yield generateECDHKeypair();
                             const binaryMsg = yield createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey);
                             if (encoding == 'base64') {
-                                socket.send(fromUint8Array(binaryMsg));
+                                socket.send(fromUint8Array$1(binaryMsg));
                             }
                             else {
                                 socket.send(binaryMsg);
@@ -1011,7 +1028,7 @@ function startRemoteScenario(config) {
                                     params: params !== null && params !== void 0 ? params : {},
                                 }, sharedSecret);
                                 if (encoding == 'base64') {
-                                    socket.send(fromUint8Array(binaryMsg));
+                                    socket.send(fromUint8Array$1(binaryMsg));
                                 }
                                 else {
                                     socket.send(binaryMsg);

package/lib/cjs/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 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 = {
@@ -74,7 +75,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
 function encode(input) {
     return window.btoa(input);
 }
-function fromUint8Array(byteArray, urlsafe) {
+function fromUint8Array$1(byteArray, urlsafe) {
     const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
     if (urlsafe) {
         return base64
@@ -106,8 +107,11 @@ function createHelloReq(ecdhPublicKey, associationKeypairPrivateKey) {
 function createSIWSMessage(payload) {
     return walletStandardUtil.createSignInMessageText(payload);
 }
-function createSIWSMessageBase64(payload) {
-    return encode(createSIWSMessage(payload));
+function createSIWSMessageBase64Url(payload) {
+    return encode(createSIWSMessage(payload))
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=+$/, ''); // convert to base64url encoding;
 }
 
 // optional features
@@ -115,6 +119,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(toUint8Array(base64EncodedString));
+}
+
 /**
  * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
  *
@@ -261,15 +272,21 @@ function signInFallback(signInPayload, authorizationResult, protocolRequestHandl
     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 siwsMessage = createSIWSMessageBase64Url(Object.assign(Object.assign({}, signInPayload), { domain, address: base64ToBase58(address) }));
         const signMessageResult = yield protocolRequestHandler('sign_messages', {
             addresses: [address],
             payloads: [siwsMessage]
         });
+        const signedPayload = toUint8Array(signMessageResult.signed_payloads[0]);
+        const signedMessage = fromUint8Array$1(signedPayload.slice(0, signedPayload.length - 64));
+        const signature = fromUint8Array$1(signedPayload.slice(signedPayload.length - 64));
         const signInResult = {
             address: address,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
+            // 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;
     });
@@ -422,7 +439,7 @@ function getRemoteAssociateAndroidIntentURL(associationPublicKey, hostAuthority,
         const url = getIntentURL('v1/associate/remote', associationURLBase);
         url.searchParams.set('association', getStringWithURLUnsafeCharactersReplaced(encodedKey));
         url.searchParams.set('reflector', `${hostAuthority}`);
-        url.searchParams.set('id', `${fromUint8Array(reflectorId, true)}`);
+        url.searchParams.set('id', `${fromUint8Array$1(reflectorId, true)}`);
         protocolVersions.forEach((version) => {
             url.searchParams.set('v', version);
         });
@@ -953,7 +970,7 @@ function startRemoteScenario(config) {
                             const ecdhKeypair = yield generateECDHKeypair();
                             const binaryMsg = yield createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey);
                             if (encoding == 'base64') {
-                                socket.send(fromUint8Array(binaryMsg));
+                                socket.send(fromUint8Array$1(binaryMsg));
                             }
                             else {
                                 socket.send(binaryMsg);
@@ -1011,7 +1028,7 @@ function startRemoteScenario(config) {
                                     params: params !== null && params !== void 0 ? params : {},
                                 }, sharedSecret);
                                 if (encoding == 'base64') {
-                                    socket.send(fromUint8Array(binaryMsg));
+                                    socket.send(fromUint8Array$1(binaryMsg));
                                 }
                                 else {
                                     socket.send(binaryMsg);

package/lib/cjs/index.native.js

@@ -3,8 +3,9 @@
 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 = {
@@ -78,8 +79,11 @@ var NativeSolanaMobileWalletAdapter = reactNative.TurboModuleRegistry.getEnforci
 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 +91,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.
  *
@@ -233,15 +244,21 @@ function signInFallback(signInPayload, authorizationResult, protocolRequestHandl
     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 siwsMessage = createSIWSMessageBase64Url(Object.assign(Object.assign({}, signInPayload), { domain, address: base64ToBase58(address) }));
         const signMessageResult = yield 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,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
+            // 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;
     });

package/lib/esm/index.browser.js

@@ -1,4 +1,5 @@
 import { createSignInMessageText } from '@solana/wallet-standard-util';
+import { getBase58Decoder } from '@solana/codecs-strings';
 
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 const SolanaMobileWalletAdapterErrorCode = {
@@ -70,7 +71,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
 function encode(input) {
     return window.btoa(input);
 }
-function fromUint8Array(byteArray, urlsafe) {
+function fromUint8Array$1(byteArray, urlsafe) {
     const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
     if (urlsafe) {
         return base64
@@ -102,8 +103,11 @@ function createHelloReq(ecdhPublicKey, associationKeypairPrivateKey) {
 function createSIWSMessage(payload) {
     return createSignInMessageText(payload);
 }
-function createSIWSMessageBase64(payload) {
-    return encode(createSIWSMessage(payload));
+function createSIWSMessageBase64Url(payload) {
+    return encode(createSIWSMessage(payload))
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=+$/, ''); // convert to base64url encoding;
 }
 
 // optional features
@@ -111,6 +115,13 @@ const SolanaSignTransactions = 'solana:signTransactions';
 const SolanaCloneAuthorization = 'solana:cloneAuthorization';
 const SolanaSignInWithSolana = 'solana:signInWithSolana';
 
+function fromUint8Array(byteArray) {
+    return getBase58Decoder().decode(byteArray);
+}
+function base64ToBase58(base64EncodedString) {
+    return fromUint8Array(toUint8Array(base64EncodedString));
+}
+
 /**
  * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
  *
@@ -257,15 +268,21 @@ function signInFallback(signInPayload, authorizationResult, protocolRequestHandl
     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 siwsMessage = createSIWSMessageBase64Url(Object.assign(Object.assign({}, signInPayload), { domain, address: base64ToBase58(address) }));
         const signMessageResult = yield protocolRequestHandler('sign_messages', {
             addresses: [address],
             payloads: [siwsMessage]
         });
+        const signedPayload = toUint8Array(signMessageResult.signed_payloads[0]);
+        const signedMessage = fromUint8Array$1(signedPayload.slice(0, signedPayload.length - 64));
+        const signature = fromUint8Array$1(signedPayload.slice(signedPayload.length - 64));
         const signInResult = {
             address: address,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
+            // 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;
     });
@@ -418,7 +435,7 @@ function getRemoteAssociateAndroidIntentURL(associationPublicKey, hostAuthority,
         const url = getIntentURL('v1/associate/remote', associationURLBase);
         url.searchParams.set('association', getStringWithURLUnsafeCharactersReplaced(encodedKey));
         url.searchParams.set('reflector', `${hostAuthority}`);
-        url.searchParams.set('id', `${fromUint8Array(reflectorId, true)}`);
+        url.searchParams.set('id', `${fromUint8Array$1(reflectorId, true)}`);
         protocolVersions.forEach((version) => {
             url.searchParams.set('v', version);
         });
@@ -949,7 +966,7 @@ function startRemoteScenario(config) {
                             const ecdhKeypair = yield generateECDHKeypair();
                             const binaryMsg = yield createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey);
                             if (encoding == 'base64') {
-                                socket.send(fromUint8Array(binaryMsg));
+                                socket.send(fromUint8Array$1(binaryMsg));
                             }
                             else {
                                 socket.send(binaryMsg);
@@ -1007,7 +1024,7 @@ function startRemoteScenario(config) {
                                     params: params !== null && params !== void 0 ? params : {},
                                 }, sharedSecret);
                                 if (encoding == 'base64') {
-                                    socket.send(fromUint8Array(binaryMsg));
+                                    socket.send(fromUint8Array$1(binaryMsg));
                                 }
                                 else {
                                     socket.send(binaryMsg);

package/lib/esm/index.js

@@ -1,4 +1,5 @@
 import { createSignInMessageText } from '@solana/wallet-standard-util';
+import { getBase58Decoder } from '@solana/codecs-strings';
 
 // Typescript `enums` thwart tree-shaking. See https://bargsten.org/jsts/enums/
 const SolanaMobileWalletAdapterErrorCode = {
@@ -70,7 +71,7 @@ function __awaiter(thisArg, _arguments, P, generator) {
 function encode(input) {
     return window.btoa(input);
 }
-function fromUint8Array(byteArray, urlsafe) {
+function fromUint8Array$1(byteArray, urlsafe) {
     const base64 = window.btoa(String.fromCharCode.call(null, ...byteArray));
     if (urlsafe) {
         return base64
@@ -102,8 +103,11 @@ function createHelloReq(ecdhPublicKey, associationKeypairPrivateKey) {
 function createSIWSMessage(payload) {
     return createSignInMessageText(payload);
 }
-function createSIWSMessageBase64(payload) {
-    return encode(createSIWSMessage(payload));
+function createSIWSMessageBase64Url(payload) {
+    return encode(createSIWSMessage(payload))
+        .replace(/\+/g, '-')
+        .replace(/\//g, '_')
+        .replace(/=+$/, ''); // convert to base64url encoding;
 }
 
 // optional features
@@ -111,6 +115,13 @@ const SolanaSignTransactions = 'solana:signTransactions';
 const SolanaCloneAuthorization = 'solana:cloneAuthorization';
 const SolanaSignInWithSolana = 'solana:signInWithSolana';
 
+function fromUint8Array(byteArray) {
+    return getBase58Decoder().decode(byteArray);
+}
+function base64ToBase58(base64EncodedString) {
+    return fromUint8Array(toUint8Array(base64EncodedString));
+}
+
 /**
  * Creates a {@link MobileWallet} proxy that handles backwards compatibility and API to RPC conversion.
  *
@@ -257,15 +268,21 @@ function signInFallback(signInPayload, authorizationResult, protocolRequestHandl
     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 siwsMessage = createSIWSMessageBase64Url(Object.assign(Object.assign({}, signInPayload), { domain, address: base64ToBase58(address) }));
         const signMessageResult = yield protocolRequestHandler('sign_messages', {
             addresses: [address],
             payloads: [siwsMessage]
         });
+        const signedPayload = toUint8Array(signMessageResult.signed_payloads[0]);
+        const signedMessage = fromUint8Array$1(signedPayload.slice(0, signedPayload.length - 64));
+        const signature = fromUint8Array$1(signedPayload.slice(signedPayload.length - 64));
         const signInResult = {
             address: address,
-            signed_message: siwsMessage,
-            signature: signMessageResult.signed_payloads[0].slice(siwsMessage.length)
+            // 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;
     });
@@ -418,7 +435,7 @@ function getRemoteAssociateAndroidIntentURL(associationPublicKey, hostAuthority,
         const url = getIntentURL('v1/associate/remote', associationURLBase);
         url.searchParams.set('association', getStringWithURLUnsafeCharactersReplaced(encodedKey));
         url.searchParams.set('reflector', `${hostAuthority}`);
-        url.searchParams.set('id', `${fromUint8Array(reflectorId, true)}`);
+        url.searchParams.set('id', `${fromUint8Array$1(reflectorId, true)}`);
         protocolVersions.forEach((version) => {
             url.searchParams.set('v', version);
         });
@@ -949,7 +966,7 @@ function startRemoteScenario(config) {
                             const ecdhKeypair = yield generateECDHKeypair();
                             const binaryMsg = yield createHelloReq(ecdhKeypair.publicKey, associationKeypair.privateKey);
                             if (encoding == 'base64') {
-                                socket.send(fromUint8Array(binaryMsg));
+                                socket.send(fromUint8Array$1(binaryMsg));
                             }
                             else {
                                 socket.send(binaryMsg);
@@ -1007,7 +1024,7 @@ function startRemoteScenario(config) {
                                     params: params !== null && params !== void 0 ? params : {},
                                 }, sharedSecret);
                                 if (encoding == 'base64') {
-                                    socket.send(fromUint8Array(binaryMsg));
+                                    socket.send(fromUint8Array$1(binaryMsg));
                                 }
                                 else {
                                     socket.send(binaryMsg);

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

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

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

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

package/lib/types/index.d.ts

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

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

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

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

@@ -247,7 +247,7 @@ type SignInPayloadWithRequiredFields = Partial<SignInPayload> & Required<Pick<Si
 type SignInResult = Readonly<{
     address: Base64EncodedAddress;
     signed_message: Base64EncodedSignedMessage;
-    signature: Base64EncodedAddress;
+    signature: Base64EncodedSignature;
     signature_type?: string;
 }>;
 type Scenario = Readonly<{

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/base64Utils.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/createSIWSMessage.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/arrayBufferToBase64String.ts","../../src/associationPort.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/startSession.ts","../../src/transact.ts","../../src/codegenSpec/NativeSolanaMobileWalletAdapter.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/base64Utils.ts","../../src/createHelloReq.ts","../../src/types.ts","../../src/createSIWSMessage.ts","../../src/base58Utils.ts","../../src/createMobileWalletProxy.ts","../../src/createSequenceNumberVector.ts","../../src/parseHelloRsp.ts","../../src/encryptedMessage.ts","../../src/generateAssociationKeypair.ts","../../src/generateECDHKeypair.ts","../../src/arrayBufferToBase64String.ts","../../src/associationPort.ts","../../src/getStringWithURLUnsafeBase64CharactersReplaced.ts","../../src/getAssociateAndroidIntentURL.ts","../../src/jsonRpcMessage.ts","../../src/parseSessionProps.ts","../../src/startSession.ts","../../src/transact.ts","../../src/codegenSpec/NativeSolanaMobileWalletAdapter.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.2.3",
+    "version": "2.2.5",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": {
         "type": "git",
@@ -18,8 +18,8 @@
             "require": "./lib/cjs/index.js"
         },
         "browser": {
-            "import": "./lib/cjs/index.browser.js",
-            "require": "./lib/esm/index.browser.js"
+            "import": "./lib/esm/index.browser.js",
+            "require": "./lib/cjs/index.browser.js"
         },
         "node": {
             "import": "./lib/esm/index.js",
@@ -56,6 +56,7 @@
         "prepublishOnly": "agadoo"
     },
     "dependencies": {
+        "@solana/codecs-strings": "^4.0.0",
         "@solana/wallet-standard": "^1.1.2",
         "@solana/wallet-standard-util": "^1.1.1",
         "@wallet-standard/core": "^1.0.3",