Merge origin/main into MWA CAIP-2 chain fix

Resolve conflicts in SolanaMobileWalletAdapter.cs against main's MWA refactor
(IMwaAuthCache / AuthorizeOperation / ReauthorizeOperation / RunPrivileged).

- Re-thread the CAIP-2 `chain` parameter through main's AuthorizeOperation
  helper (new optional `chain` ctor arg) and its call sites: _Login and the
  authorize path in RunPrivileged. SignAllTransactions / SignMessage now reach
  authorize via RunPrivileged, which carries chain.
- Drop the AuthCacheVersion / InvalidateStaleAuthCache self-heal mechanism per
  maintainer review (PR #288 lines 30/37/83). Main's IMwaAuthCache layer
  supersedes the PlayerPrefs version hack.
- Add MobileWalletAdapterClient tests asserting Params.Chain is forwarded and
  omitted when null (CodeRabbit feedback).

Author: lopeselio

Runtime/Plugins/SolanaMobileStack.meta

@@ -0,0 +1,79 @@
+package com.solana.unity.mwa;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+
+/** System wallet chooser + {@link Intent#EXTRA_CHOSEN_COMPONENT} capture. No manifest entry */
+public final class MwaChooserHelper {
+
+    private static final String ACTION_CHOSEN = "com.solana.unity.mwa.WALLET_CHOSEN";
+
+    // RECEIVER_NOT_EXPORTED (API 33) as literal for older compileSdk.
+    private static final int RECEIVER_NOT_EXPORTED = 0x4;
+
+    private static final String EXTRA_NONCE = "chooser_nonce";
+
+    private static volatile String sChosenPackage = null;
+    private static volatile String sChooserNonce = null;
+    private static BroadcastReceiver sReceiver = null;
+
+    private MwaChooserHelper() {}
+
+    /** Last chosen package, then clear. Null if none. */
+    public static synchronized String consumeChosenPackage() {
+        String pkg = sChosenPackage;
+        sChosenPackage = null;
+        return pkg;
+    }
+
+    /** createChooser + IntentSender callback = launches MWA target intent */
+    public static void launchWithChooser(Activity activity, Intent target, String title) {
+        sChosenPackage = null;
+        sChooserNonce = java.util.UUID.randomUUID().toString();
+        registerReceiver(activity.getApplicationContext());
+
+        Intent broadcast = new Intent(ACTION_CHOSEN)
+            .setPackage(activity.getPackageName())
+            .putExtra(EXTRA_NONCE, sChooserNonce);
+
+        int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            flags |= PendingIntent.FLAG_MUTABLE;
+        }
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(activity, 0, broadcast, flags);
+
+        Intent chooser = Intent.createChooser(target, title, pendingIntent.getIntentSender());
+        activity.startActivity(chooser);
+    }
+
+    private static synchronized void registerReceiver(Context context) {
+        if (sReceiver != null) {
+            return;
+        }
+        sReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context ctx, Intent intent) {
+                String nonce = intent.getStringExtra(EXTRA_NONCE);
+                if (nonce == null || !nonce.equals(sChooserNonce)) {
+                    return;
+                }
+                ComponentName chosen = intent.getParcelableExtra(Intent.EXTRA_CHOSEN_COMPONENT);
+                if (chosen != null) {
+                    sChosenPackage = chosen.getPackageName();
+                }
+            }
+        };
+        IntentFilter filter = new IntentFilter(ACTION_CHOSEN);
+        if (Build.VERSION.SDK_INT >= 33) {
+            context.registerReceiver(sReceiver, filter, RECEIVER_NOT_EXPORTED);
+        } else {
+            context.registerReceiver(sReceiver, filter);
+        }
+    }
+}

Runtime/Plugins/SolanaMobileStack/Android.meta

@@ -168,4 +168,125 @@ mergeInto(LibraryManager.library, {
       {{{ makeDynCall('vi', 'callback') }}}(null);
     }
   },
+  ExternSubscribeWalletEvents: function (walletNamePtr, callback) {
+    try {
+      const walletName = UTF8ToString(walletNamePtr);
+      window.unityWalletEventUnsubs = window.unityWalletEventUnsubs || {};
+
+      if (window.unityWalletEventUnsubs[walletName]) {
+        window.unityWalletEventUnsubs[walletName]();
+        delete window.unityWalletEventUnsubs[walletName];
+      }
+
+      const toPkString = (v) => {
+        try {
+          if (!v) return null;
+          if (typeof v === "string") return v;
+          if (Array.isArray(v) && v.length > 0) {
+            const first = v[0];
+            if (!first) return null;
+            return typeof first === "string" ? first : (first.toString ? first.toString() : null);
+          }
+          return v.toString ? v.toString() : null;
+        } catch (_) {
+          return null;
+        }
+      };
+
+      const emit = (evt, data) => {
+        const payload = {
+          event: evt,
+          walletName: walletName,
+          publicKey: data && data.publicKey ? toPkString(data.publicKey) : toPkString(data),
+          account: data && data.account ? toPkString(data.account) : null,
+          accounts: data && data.accounts ? data.accounts.map(toPkString).filter(Boolean) : null,
+          error: data && data.message ? String(data.message) : null,
+        };
+        const json = JSON.stringify(payload);
+        const len = lengthBytesUTF8(json) + 1;
+        const ptr = _malloc(len);
+        stringToUTF8(json, ptr, len);
+        {{{ makeDynCall('vi', 'callback') }}}(ptr);
+        _free(ptr);
+      };
+
+      const tryResolveProvider = () => {
+        if (walletName === "XNFT" && window.xnft && window.xnft.solana) {
+          return window.xnft.solana;
+        }
+
+        if (window.walletAdapterLib) {
+          if (typeof window.walletAdapterLib.getWalletAdapter === "function") {
+            const a = window.walletAdapterLib.getWalletAdapter(walletName);
+            if (a) return a;
+          }
+          if (typeof window.walletAdapterLib.getWalletByName === "function") {
+            const w = window.walletAdapterLib.getWalletByName(walletName);
+            if (w && w.adapter) return w.adapter;
+            if (w) return w;
+          }
+          const pools = [window.walletAdapterLib.walletAdapters, window.walletAdapterLib.wallets];
+          for (const pool of pools) {
+            if (!Array.isArray(pool)) continue;
+            for (const item of pool) {
+              if (!item) continue;
+              if (item.name === walletName) return item.adapter || item;
+              if (item.adapter && item.adapter.name === walletName) return item.adapter;
+              if (item.wallet && item.wallet.name === walletName) return item.wallet.adapter || item.wallet;
+            }
+          }
+        }
+
+        if (window.solana && walletName.toLowerCase().includes("phantom")) {
+          return window.solana;
+        }
+
+        return null;
+      };
+
+      const provider = tryResolveProvider();
+      if (!provider || typeof provider.on !== "function") {
+        return;
+      }
+
+      const subscriptions = [];
+      const on = (evt, fn) => {
+        try {
+          provider.on(evt, fn);
+          subscriptions.push([evt, fn]);
+        } catch (_) {}
+      };
+
+      on("accountsChanged", (accounts) => emit("accountsChanged", { accounts }));
+      on("accountChanged", (account) => emit("accountChanged", { account }));
+      on("disconnect", (info) => emit("disconnect", info));
+      on("connect", (info) => emit("connect", info));
+      on("change", (info) => emit("change", info));
+
+      window.unityWalletEventUnsubs[walletName] = () => {
+        if (typeof provider.off === "function") {
+          subscriptions.forEach(([evt, fn]) => {
+            try {
+              provider.off(evt, fn);
+            } catch (_) {}
+          });
+        }
+      };
+    } catch (err) {
+      console.error(err && err.message ? err.message : err);
+    }
+  },
+
+  ExternUnsubscribeWalletEvents: function (walletNamePtr) {
+    try {
+      const walletName = UTF8ToString(walletNamePtr);
+      if (!window.unityWalletEventUnsubs || !window.unityWalletEventUnsubs[walletName]) {
+        return;
+      }
+      window.unityWalletEventUnsubs[walletName]();
+      delete window.unityWalletEventUnsubs[walletName];
+    } catch (err) {
+      console.error(err && err.message ? err.message : err);
+    }
+  },
 });

Runtime/Plugins/SolanaMobileStack/Android/MwaChooserHelper.java

@@ -28,14 +28,12 @@ private SessionWallet(RpcCluster rpcCluster = RpcCluster.DevNet,
             string customRpcUri = null, string customStreamingRpcUri = null,
             bool autoConnectOnStartup = false) : base(rpcCluster, customRpcUri, customStreamingRpcUri, autoConnectOnStartup)
         {
-            if (Instance == null)
+            if (Instance != null)
             {
-                Instance = this;
-            }
-            else
-            {
-                throw new Exception("SessionWallet already exists");
+                Debug.LogWarning($"there are more than one {nameof(SessionWallet)} in the scene");
             }
+
+            Instance = this;
         }
 
         /// <summary>
@@ -65,6 +63,26 @@ public void SignInitSessionTx(Transaction tx)
         {
             tx.PartialSign(new[] { _externalWallet.Account, Account });
         }
+        
+        public static SessionWallet GetSessionWallet(string publicKey, string privateKey, PublicKey targetProgram)
+        {
+            _externalWallet = Web3.Wallet;
+            if (_externalWallet?.ActiveRpcClient == null)
+                throw new InvalidOperationException("Web3.Wallet and its ActiveRpcClient must be initialized before creating a SessionWallet from raw keys.");
+
+            var sessionAccount = new Account(privateKey, publicKey); 
+            
+            // TODO: ActiveRpcClient can be null, get node address some other way
+            var sessionWallet = new SessionWallet(_externalWallet.RpcCluster, _externalWallet.ActiveRpcClient.NodeAddress.ToString())
+            {
+                TargetProgram = targetProgram,
+                EncryptedKeystoreKey = $"{_externalWallet.Account.PublicKey}_SessionKeyStore",
+                SessionTokenPDA = FindSessionToken(targetProgram, sessionAccount, _externalWallet.Account),
+                Account = sessionAccount,
+            };
+
+            return sessionWallet;
+        }
 
         /// <summary>
         /// Creates a new SessionWallet instance based on the signature we get from signing a specific message.
@@ -75,9 +93,6 @@ public void SignInitSessionTx(Transaction tx)
         /// <returns>A SessionWallet instance.</returns>
         public static async Task<SessionWallet> GetSessionWallet(PublicKey targetProgram, WalletBase externalWallet = null, string seed = "MagicBlock.SessionKey")
         {
-            // TODO: This class behaves like a singleton, what if I want multiple session wallets active at the same time?
-            if (Instance != null) return Instance;
-            
             externalWallet ??= Web3.Wallet;
             _externalWallet = externalWallet;
 
@@ -108,8 +123,6 @@ public static async Task<SessionWallet> GetSessionWallet(PublicKey targetProgram
         /// <returns>A SessionWallet instance.</returns>
         public static async Task<SessionWallet> GetSessionWallet(PublicKey targetProgram, string password, WalletBase externalWallet = null)
         {
-            if (Instance != null) return Instance;
-            
             externalWallet ??= Web3.Wallet;
             _externalWallet = externalWallet;
 
@@ -131,6 +144,7 @@ public static async Task<SessionWallet> GetSessionWallet(PublicKey targetProgram
                     sessionWallet.DeleteSessionWallet();
                     sessionWallet.Logout();
                     Instance = null;
+                    
                     return await GetSessionWallet(targetProgram, password, externalWallet);
                 }
 

Runtime/Plugins/SolanaMobileStack/Android/MwaChooserHelper.java.meta

@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+
+// ReSharper disable once CheckNamespace
+
+namespace Solana.Unity.SDK
+{
+    /// <summary>
+    /// Stores the selected Android wallet package used for MWA association.
+    /// </summary>
+    public interface IMwaWalletSelectionCache
+    {
+        Task<string> GetSelectedWalletPackage();
+        Task SetSelectedWalletPackage(string packageName);
+        Task ClearSelectedWalletPackage();
+    }
+}

Runtime/Plugins/SolanaWalletAdapterWebGL/SolanaWalletAdapterWebGL.jslib

@@ -5,17 +5,24 @@
 public static class LocalAssociationIntentCreator
 {
 
-    public static AndroidJavaObject CreateAssociationIntent(string associationToken, int port)
+    public static AndroidJavaObject CreateAssociationIntent(
+        string associationToken, int port, string targetPackage = null)
     {
         var intent = new AndroidJavaObject("android.content.Intent");
         intent.Call<AndroidJavaObject>("setAction", "android.intent.action.VIEW");
         intent.Call<AndroidJavaObject>("addCategory", "android.intent.category.BROWSABLE");
         var url = $"{AssociationContract.SchemeMobileWalletAdapter}:/" +
                   $"{AssociationContract.LocalPathSuffix}?association={associationToken}&port={port}";
         var uriClass = new AndroidJavaClass("android.net.Uri");
-        var uriData = uriClass.CallStatic<AndroidJavaObject>("parse", url);     
+        var uriData = uriClass.CallStatic<AndroidJavaObject>("parse", url);
         intent.Call<AndroidJavaObject>("setData", uriData);
-        //intent.Call<AndroidJavaObject>("addFlags", 0x14000000);
+
+        if (!string.IsNullOrEmpty(targetPackage))
+        {
+            intent.Call<AndroidJavaObject>("setPackage", targetPackage);
+            UnityEngine.Debug.Log($"[MWA] Intent targeting package: {targetPackage}");
+        }
+
         return intent;
     }
 }