@solana-mobile/mobile-wallet-adapter-protocol 2.2.0 → 2.2.2

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:8.9.2'
+    classpath 'com.android.tools.build:gradle:8.10.1'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }

package/package.json

@@ -1,31 +1,42 @@
 {
     "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.0",
+    "version": "2.2.2",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/solana-mobile/mobile-wallet-adapter.git"
     },
     "license": "Apache-2.0",
-    "type": "module",
-    "sideEffects": false,
-    "main": "lib/cjs/index.js",
-    "react-native": "lib/cjs/index.native.js",
-    "module": "lib/esm/index.js",
-    "types": "lib/types/index.d.ts",
+    "exports": {
+        "edge-light": {
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "workerd": {
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "browser": {
+            "import": "./lib/cjs/index.browser.js",
+            "require": "./lib/esm/index.browser.js"
+        },
+        "node": {
+            "import": "./lib/esm/index.js",
+            "require": "./lib/cjs/index.js"
+        },
+        "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.js": "./lib/esm/index.browser.js"
     },
-    "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "import": "./lib/esm/index.js",
-            "require": "./lib/cjs/index.js",
-            "types": "./lib/types/index.d.ts"
-        }
-    },
+    "main": "lib/cjs/index.js",
+    "module": "lib/esm/index.js",
+    "react-native": "lib/cjs/index.native.js",
+    "types": "lib/types/index.d.ts",
+    "type": "module",
     "files": [
         "android",
         "src/codegenSpec",
@@ -33,6 +44,7 @@
         "lib",
         "LICENSE"
     ],
+    "sideEffects": false,
     "publishConfig": {
         "access": "public"
     },
@@ -57,7 +69,6 @@
         "shx": "^0.3.4"
     },
     "peerDependencies": {
-        "@solana/web3.js": "^1.58.0",
         "react-native": ">0.69"
     },
     "codegenConfig": {
@@ -68,4 +79,4 @@
             "javaPackageName": "com.solanamobile.mobilewalletadapter.reactnative"
         }
     }
-}
+}

package/src/createSIWSMessage.ts

@@ -1,14 +1,14 @@
-import {
-    SolanaSignInInputWithRequiredFields, 
-    createSignInMessageText,
-} from '@solana/wallet-standard-util';
-import { SignInPayload } from './types';
-import { encode } from './base64Utils';
-
-export function createSIWSMessage(payload: SolanaSignInInputWithRequiredFields & SignInPayload): string {
-    return createSignInMessageText(payload);
-}
-
-export function createSIWSMessageBase64(payload: SolanaSignInInputWithRequiredFields & SignInPayload): string {
-    return encode(createSIWSMessage(payload));
+import {
+    SolanaSignInInputWithRequiredFields, 
+    createSignInMessageText,
+} from '@solana/wallet-standard-util';
+import { SignInPayload } from './types';
+import { encode } from './base64Utils';
+
+export function createSIWSMessage(payload: SolanaSignInInputWithRequiredFields & SignInPayload): string {
+    return createSignInMessageText(payload);
+}
+
+export function createSIWSMessageBase64(payload: SolanaSignInInputWithRequiredFields & SignInPayload): string {
+    return encode(createSIWSMessage(payload));
 }

package/src/encryptedMessage.ts

@@ -1,60 +1,60 @@
-import createSequenceNumberVector, { SEQUENCE_NUMBER_BYTES } from './createSequenceNumberVector.js';
-import { SharedSecret } from './parseHelloRsp.js';
-
-const INITIALIZATION_VECTOR_BYTES = 12;
-export const ENCODED_PUBLIC_KEY_LENGTH_BYTES = 65;
-
-export async function encryptMessage(
-    plaintext: string,
-    sequenceNumber: number,
-    sharedSecret: SharedSecret,
-) {
-    const sequenceNumberVector = createSequenceNumberVector(sequenceNumber);
-    const initializationVector = new Uint8Array(INITIALIZATION_VECTOR_BYTES);
-    crypto.getRandomValues(initializationVector);
-    const ciphertext = await crypto.subtle.encrypt(
-        getAlgorithmParams(sequenceNumberVector, initializationVector),
-        sharedSecret,
-        new TextEncoder().encode(plaintext),
-    );
-    const response = new Uint8Array(
-        sequenceNumberVector.byteLength + initializationVector.byteLength + ciphertext.byteLength,
-    );
-    response.set(new Uint8Array(sequenceNumberVector), 0);
-    response.set(new Uint8Array(initializationVector), sequenceNumberVector.byteLength);
-    response.set(new Uint8Array(ciphertext), sequenceNumberVector.byteLength + initializationVector.byteLength);
-    return response;
-}
-
-export async function decryptMessage(message: ArrayBuffer, sharedSecret: SharedSecret) {
-    const sequenceNumberVector = message.slice(0, SEQUENCE_NUMBER_BYTES);
-    const initializationVector = message.slice(
-        SEQUENCE_NUMBER_BYTES,
-        SEQUENCE_NUMBER_BYTES + INITIALIZATION_VECTOR_BYTES,
-    );
-    const ciphertext = message.slice(SEQUENCE_NUMBER_BYTES + INITIALIZATION_VECTOR_BYTES);
-    const plaintextBuffer = await crypto.subtle.decrypt(
-        getAlgorithmParams(sequenceNumberVector, initializationVector),
-        sharedSecret,
-        ciphertext,
-    );
-    const plaintext = getUtf8Decoder().decode(plaintextBuffer);
-    return plaintext
-}
-
-function getAlgorithmParams(sequenceNumber: ArrayBuffer, initializationVector: ArrayBuffer) {
-    return {
-        additionalData: sequenceNumber,
-        iv: initializationVector,
-        name: 'AES-GCM',
-        tagLength: 128, // 16 byte tag => 128 bits
-    };
-}
-
-let _utf8Decoder: TextDecoder | undefined;
-function getUtf8Decoder() {
-    if (_utf8Decoder === undefined) {
-        _utf8Decoder = new TextDecoder('utf-8');
-    }
-    return _utf8Decoder;
+import createSequenceNumberVector, { SEQUENCE_NUMBER_BYTES } from './createSequenceNumberVector.js';
+import { SharedSecret } from './parseHelloRsp.js';
+
+const INITIALIZATION_VECTOR_BYTES = 12;
+export const ENCODED_PUBLIC_KEY_LENGTH_BYTES = 65;
+
+export async function encryptMessage(
+    plaintext: string,
+    sequenceNumber: number,
+    sharedSecret: SharedSecret,
+) {
+    const sequenceNumberVector = createSequenceNumberVector(sequenceNumber);
+    const initializationVector = new Uint8Array(INITIALIZATION_VECTOR_BYTES);
+    crypto.getRandomValues(initializationVector);
+    const ciphertext = await crypto.subtle.encrypt(
+        getAlgorithmParams(sequenceNumberVector, initializationVector),
+        sharedSecret,
+        new TextEncoder().encode(plaintext),
+    );
+    const response = new Uint8Array(
+        sequenceNumberVector.byteLength + initializationVector.byteLength + ciphertext.byteLength,
+    );
+    response.set(new Uint8Array(sequenceNumberVector), 0);
+    response.set(new Uint8Array(initializationVector), sequenceNumberVector.byteLength);
+    response.set(new Uint8Array(ciphertext), sequenceNumberVector.byteLength + initializationVector.byteLength);
+    return response;
+}
+
+export async function decryptMessage(message: ArrayBuffer, sharedSecret: SharedSecret) {
+    const sequenceNumberVector = message.slice(0, SEQUENCE_NUMBER_BYTES);
+    const initializationVector = message.slice(
+        SEQUENCE_NUMBER_BYTES,
+        SEQUENCE_NUMBER_BYTES + INITIALIZATION_VECTOR_BYTES,
+    );
+    const ciphertext = message.slice(SEQUENCE_NUMBER_BYTES + INITIALIZATION_VECTOR_BYTES);
+    const plaintextBuffer = await crypto.subtle.decrypt(
+        getAlgorithmParams(sequenceNumberVector, initializationVector),
+        sharedSecret,
+        ciphertext,
+    );
+    const plaintext = getUtf8Decoder().decode(plaintextBuffer);
+    return plaintext
+}
+
+function getAlgorithmParams(sequenceNumber: ArrayBuffer, initializationVector: ArrayBuffer) {
+    return {
+        additionalData: sequenceNumber,
+        iv: initializationVector,
+        name: 'AES-GCM',
+        tagLength: 128, // 16 byte tag => 128 bits
+    };
+}
+
+let _utf8Decoder: TextDecoder | undefined;
+function getUtf8Decoder() {
+    if (_utf8Decoder === undefined) {
+        _utf8Decoder = new TextDecoder('utf-8');
+    }
+    return _utf8Decoder;
 }

package/src/jsonRpcMessage.ts

@@ -1,38 +1,38 @@
-import { decryptMessage, encryptMessage } from './encryptedMessage.js';
-import { SolanaMobileWalletAdapterProtocolError } from './errors.js';
-import { SharedSecret } from './parseHelloRsp.js';
-
-interface JSONRPCRequest<TParams> {
-    id: number;
-    jsonrpc: '2.0';
-    method: string;
-    params: TParams;
-}
-
-type JSONRPCResponse<TMessage> = {
-    id: number;
-    jsonrpc: '2.0';
-    result: TMessage;
-};
-
-export async function encryptJsonRpcMessage<TParams>(
-    jsonRpcMessage: JSONRPCRequest<TParams>,
-    sharedSecret: SharedSecret,
-) {
-    const plaintext = JSON.stringify(jsonRpcMessage);
-    const sequenceNumber = jsonRpcMessage.id;
-    return encryptMessage(plaintext, sequenceNumber, sharedSecret);
-}
-
-export async function decryptJsonRpcMessage<TMessage>(message: ArrayBuffer, sharedSecret: SharedSecret) {
-    const plaintext = await decryptMessage(message, sharedSecret);
-    const jsonRpcMessage = JSON.parse(plaintext);
-    if (Object.hasOwnProperty.call(jsonRpcMessage, 'error')) {
-        throw new SolanaMobileWalletAdapterProtocolError<typeof jsonRpcMessage.error.code>(
-            jsonRpcMessage.id,
-            jsonRpcMessage.error.code,
-            jsonRpcMessage.error.message,
-        );
-    }
-    return jsonRpcMessage as JSONRPCResponse<TMessage>;
-}
+import { decryptMessage, encryptMessage } from './encryptedMessage.js';
+import { SolanaMobileWalletAdapterProtocolError } from './errors.js';
+import { SharedSecret } from './parseHelloRsp.js';
+
+interface JSONRPCRequest<TParams> {
+    id: number;
+    jsonrpc: '2.0';
+    method: string;
+    params: TParams;
+}
+
+type JSONRPCResponse<TMessage> = {
+    id: number;
+    jsonrpc: '2.0';
+    result: TMessage;
+};
+
+export async function encryptJsonRpcMessage<TParams>(
+    jsonRpcMessage: JSONRPCRequest<TParams>,
+    sharedSecret: SharedSecret,
+) {
+    const plaintext = JSON.stringify(jsonRpcMessage);
+    const sequenceNumber = jsonRpcMessage.id;
+    return encryptMessage(plaintext, sequenceNumber, sharedSecret);
+}
+
+export async function decryptJsonRpcMessage<TMessage>(message: ArrayBuffer, sharedSecret: SharedSecret) {
+    const plaintext = await decryptMessage(message, sharedSecret);
+    const jsonRpcMessage = JSON.parse(plaintext);
+    if (Object.hasOwnProperty.call(jsonRpcMessage, 'error')) {
+        throw new SolanaMobileWalletAdapterProtocolError<typeof jsonRpcMessage.error.code>(
+            jsonRpcMessage.id,
+            jsonRpcMessage.error.code,
+            jsonRpcMessage.error.message,
+        );
+    }
+    return jsonRpcMessage as JSONRPCResponse<TMessage>;
+}

package/src/parseHelloRsp.ts

@@ -1,46 +1,46 @@
-import { ENCODED_PUBLIC_KEY_LENGTH_BYTES } from "./encryptedMessage";
-
-/**
- * A secret agreed upon by the app and the wallet. Used as
- * a symmetric key to encrypt and decrypt messages over an
- * unsecured channel.
- */
-export type SharedSecret = CryptoKey;
-
-export default async function parseHelloRsp(
-    payloadBuffer: ArrayBuffer, // The X9.62-encoded wallet endpoint ephemeral ECDH public keypoint.
-    associationPublicKey: CryptoKey,
-    ecdhPrivateKey: CryptoKey,
-): Promise<SharedSecret> {
-    const [associationPublicKeyBuffer, walletPublicKey] = await Promise.all([
-        crypto.subtle.exportKey('raw', associationPublicKey),
-        crypto.subtle.importKey(
-            'raw',
-            payloadBuffer.slice(0, ENCODED_PUBLIC_KEY_LENGTH_BYTES),
-            { name: 'ECDH', namedCurve: 'P-256' },
-            false /* extractable */,
-            [] /* keyUsages */,
-        ),
-    ]);
-    const sharedSecret = await crypto.subtle.deriveBits({ name: 'ECDH', public: walletPublicKey }, ecdhPrivateKey, 256);
-    const ecdhSecretKey = await crypto.subtle.importKey(
-        'raw',
-        sharedSecret,
-        'HKDF',
-        false /* extractable */,
-        ['deriveKey'] /* keyUsages */,
-    );
-    const aesKeyMaterialVal = await crypto.subtle.deriveKey(
-        {
-            name: 'HKDF',
-            hash: 'SHA-256',
-            salt: new Uint8Array(associationPublicKeyBuffer),
-            info: new Uint8Array(),
-        },
-        ecdhSecretKey,
-        { name: 'AES-GCM', length: 128 },
-        false /* extractable */,
-        ['encrypt', 'decrypt'],
-    );
-    return aesKeyMaterialVal as SharedSecret;
-}
+import { ENCODED_PUBLIC_KEY_LENGTH_BYTES } from "./encryptedMessage";
+
+/**
+ * A secret agreed upon by the app and the wallet. Used as
+ * a symmetric key to encrypt and decrypt messages over an
+ * unsecured channel.
+ */
+export type SharedSecret = CryptoKey;
+
+export default async function parseHelloRsp(
+    payloadBuffer: ArrayBuffer, // The X9.62-encoded wallet endpoint ephemeral ECDH public keypoint.
+    associationPublicKey: CryptoKey,
+    ecdhPrivateKey: CryptoKey,
+): Promise<SharedSecret> {
+    const [associationPublicKeyBuffer, walletPublicKey] = await Promise.all([
+        crypto.subtle.exportKey('raw', associationPublicKey),
+        crypto.subtle.importKey(
+            'raw',
+            payloadBuffer.slice(0, ENCODED_PUBLIC_KEY_LENGTH_BYTES),
+            { name: 'ECDH', namedCurve: 'P-256' },
+            false /* extractable */,
+            [] /* keyUsages */,
+        ),
+    ]);
+    const sharedSecret = await crypto.subtle.deriveBits({ name: 'ECDH', public: walletPublicKey }, ecdhPrivateKey, 256);
+    const ecdhSecretKey = await crypto.subtle.importKey(
+        'raw',
+        sharedSecret,
+        'HKDF',
+        false /* extractable */,
+        ['deriveKey'] /* keyUsages */,
+    );
+    const aesKeyMaterialVal = await crypto.subtle.deriveKey(
+        {
+            name: 'HKDF',
+            hash: 'SHA-256',
+            salt: new Uint8Array(associationPublicKeyBuffer),
+            info: new Uint8Array(),
+        },
+        ecdhSecretKey,
+        { name: 'AES-GCM', length: 128 },
+        false /* extractable */,
+        ['encrypt', 'decrypt'],
+    );
+    return aesKeyMaterialVal as SharedSecret;
+}

package/src/parseSessionProps.ts

@@ -1,33 +1,33 @@
-import { decryptMessage } from "./encryptedMessage";
-import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from "./errors";
-import { SharedSecret } from "./parseHelloRsp";
-import { ProtocolVersion, SessionProperties } from "./types";
-
-export default async function parseSessionProps(
-    message: ArrayBuffer, 
-    sharedSecret: SharedSecret
-): Promise<SessionProperties> {
-    const plaintext = await decryptMessage(message, sharedSecret);
-    const jsonProperties = JSON.parse(plaintext);
-    let protocolVersion: ProtocolVersion = 'legacy';
-    if (Object.hasOwnProperty.call(jsonProperties, 'v')) {
-        switch (jsonProperties.v) {
-            case 1:
-            case '1':
-            case 'v1':
-                protocolVersion = 'v1'
-                break;
-            case 'legacy':
-                protocolVersion = 'legacy'
-                break;
-            default:
-                throw new SolanaMobileWalletAdapterError(
-                    SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION, 
-                    `Unknown/unsupported protocol version: ${jsonProperties.v}`
-                );
-        }
-    }
-    return <SessionProperties>({
-        protocol_version: protocolVersion
-    })
+import { decryptMessage } from "./encryptedMessage";
+import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from "./errors";
+import { SharedSecret } from "./parseHelloRsp";
+import { ProtocolVersion, SessionProperties } from "./types";
+
+export default async function parseSessionProps(
+    message: ArrayBuffer, 
+    sharedSecret: SharedSecret
+): Promise<SessionProperties> {
+    const plaintext = await decryptMessage(message, sharedSecret);
+    const jsonProperties = JSON.parse(plaintext);
+    let protocolVersion: ProtocolVersion = 'legacy';
+    if (Object.hasOwnProperty.call(jsonProperties, 'v')) {
+        switch (jsonProperties.v) {
+            case 1:
+            case '1':
+            case 'v1':
+                protocolVersion = 'v1'
+                break;
+            case 'legacy':
+                protocolVersion = 'legacy'
+                break;
+            default:
+                throw new SolanaMobileWalletAdapterError(
+                    SolanaMobileWalletAdapterErrorCode.ERROR_INVALID_PROTOCOL_VERSION, 
+                    `Unknown/unsupported protocol version: ${jsonProperties.v}`
+                );
+        }
+    }
+    return <SessionProperties>({
+        protocol_version: protocolVersion
+    })
 }

package/src/reflectorId.ts

@@ -1,31 +1,31 @@
-import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from './errors.js';
-
-declare const tag: unique symbol;
-export type ReflectorId = number & { readonly [tag]: 'ReflectorId' };
-
-export function getRandomReflectorId(): ReflectorId {
-    return assertReflectorId(getRandomInt(0, 9007199254740991)); // 0 < id < 2^53 - 1
-}
-
-function getRandomInt(min: number, max: number) {
-    const randomBuffer = new Uint32Array(1);
-
-    window.crypto.getRandomValues(randomBuffer);
-
-    let randomNumber = randomBuffer[0] / (0xffffffff + 1);
-
-    min = Math.ceil(min);
-    max = Math.floor(max);
-    return Math.floor(randomNumber * (max - min + 1)) + min;
-}
-
-export function assertReflectorId(id: number): ReflectorId {
-    if (id < 0 || id > 9007199254740991) { // 0 < id < 2^53 - 1
-        throw new SolanaMobileWalletAdapterError(
-            SolanaMobileWalletAdapterErrorCode.ERROR_REFLECTOR_ID_OUT_OF_RANGE,
-            `Association port number must be between 49152 and 65535. ${id} given.`,
-            { id },
-        );
-    }
-    return id as ReflectorId;
+import { SolanaMobileWalletAdapterError, SolanaMobileWalletAdapterErrorCode } from './errors.js';
+
+declare const tag: unique symbol;
+export type ReflectorId = number & { readonly [tag]: 'ReflectorId' };
+
+export function getRandomReflectorId(): ReflectorId {
+    return assertReflectorId(getRandomInt(0, 9007199254740991)); // 0 < id < 2^53 - 1
+}
+
+function getRandomInt(min: number, max: number) {
+    const randomBuffer = new Uint32Array(1);
+
+    window.crypto.getRandomValues(randomBuffer);
+
+    let randomNumber = randomBuffer[0] / (0xffffffff + 1);
+
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(randomNumber * (max - min + 1)) + min;
+}
+
+export function assertReflectorId(id: number): ReflectorId {
+    if (id < 0 || id > 9007199254740991) { // 0 < id < 2^53 - 1
+        throw new SolanaMobileWalletAdapterError(
+            SolanaMobileWalletAdapterErrorCode.ERROR_REFLECTOR_ID_OUT_OF_RANGE,
+            `Association port number must be between 49152 and 65535. ${id} given.`,
+            { id },
+        );
+    }
+    return id as ReflectorId;
 }