Merge pull request #288 from lopeselio/fix/mwa-2.0-caip2-chain-network-mismatch

fix(mwa): send CAIP-2 chain so MWA 2.0 wallets (Seeker Seed Vault) use the correct network

Author: Kuldotha

Runtime/codebase/SolanaMobileStack/Interfaces/IAdapterOperations.cs

@@ -9,9 +9,14 @@
 public interface IAdapterOperations
 {
     [Preserve]
-    public Task<AuthorizationResult> Authorize(Uri identityUri, Uri iconUri, string identityName, string rpcCluster);
+    // chain: optional CAIP-2 identifier (e.g. "solana:devnet") for MWA 2.0 wallets.
+    public Task<AuthorizationResult> Authorize(Uri identityUri, Uri iconUri, string identityName, string rpcCluster, string chain = null);
     [Preserve]
-    public Task<AuthorizationResult> Reauthorize(Uri identityUri, Uri iconUri, string identityName, string authToken);
+    // rpcCluster/chain: MWA 2.0 requires the network identifier on reauthorize too.
+    // The spec deprecates the standalone reauthorize in favour of authorize carrying an
+    // auth_token; when chain is absent the wallet (e.g. Seeker Seed Vault) defaults the
+    // re-established session to solana:mainnet, causing a "Network mismatch" at sign time.
+    public Task<AuthorizationResult> Reauthorize(Uri identityUri, Uri iconUri, string identityName, string authToken, string rpcCluster = null, string chain = null);
     [Preserve]
     public Task Deauthorize(string authToken);
     [Preserve]

Runtime/codebase/SolanaMobileStack/JsonRpcClient/JsonRequest.cs

@@ -48,6 +48,15 @@ public class JsonRequestParams
             [RequiredMember]
             public string Cluster { get; set; }
 
+            // MWA 2.0 renamed the network identifier from "cluster" to "chain" using
+            // CAIP-2 values (e.g. "solana:devnet"). Wallets implementing the 2.0 spec
+            // (e.g. Seeker Seed Vault) ignore the legacy "cluster" field and default to
+            // "solana:mainnet" when "chain" is absent. Both are serialized for
+            // backward/forward compatibility across MWA 1.x and 2.0 wallets.
+            [JsonProperty("chain", NullValueHandling = NullValueHandling.Ignore)]
+            [RequiredMember]
+            public string Chain { get; set; }
+
             [JsonProperty("auth_token", NullValueHandling = NullValueHandling.Ignore)]
             [RequiredMember]
 

Runtime/codebase/SolanaMobileStack/MobileWalletAdapterClient.cs

@@ -21,27 +21,35 @@ public MobileWalletAdapterClient(IMessageSender messageSender) : base(messageSen
     }
 
     [Preserve]
-    public Task<AuthorizationResult> Authorize(Uri identityUri, Uri iconUri, string identityName, string cluster)
+    public Task<AuthorizationResult> Authorize(Uri identityUri, Uri iconUri, string identityName, string cluster, string chain = null)
     {
         var request = PrepareAuthRequest(
             identityUri,
-            iconUri, 
-            identityName, 
+            iconUri,
+            identityName,
             cluster,
-            "authorize");
-        
+            "authorize",
+            chain);
+
         return SendRequest<AuthorizationResult>(request);
     }
 
-    public Task<AuthorizationResult> Reauthorize(Uri identityUri, Uri iconUri, string identityName, string authToken)
+    public Task<AuthorizationResult> Reauthorize(Uri identityUri, Uri iconUri, string identityName, string authToken, string cluster = null, string chain = null)
     {
+        // MWA 2.0 deprecated the standalone `reauthorize` method in favour of `authorize`
+        // carrying an `auth_token`. The `chain` MUST be re-sent here: when it is absent the
+        // wallet (e.g. Seeker Seed Vault) defaults the re-established session to
+        // solana:mainnet, producing a "Network mismatch" at sign time even though the
+        // original authorize was devnet. When the chain matches the token's binding the
+        // wallet silently reuses the existing auth_token (no extra user prompt).
         var request = PrepareAuthRequest(
             identityUri,
-            iconUri, 
-            identityName, 
-            null,
-            "reauthorize");
-        
+            iconUri,
+            identityName,
+            cluster,
+            "authorize",
+            chain);
+
         request.Params.AuthToken = authToken;
 
         return SendRequest<AuthorizationResult>(request);
@@ -71,7 +79,7 @@ public Task<SignedResult> SignMessages(IEnumerable<byte[]> messages, IEnumerable
         return SendRequest<SignedResult>(request);
     }
 
-    private JsonRequest PrepareAuthRequest(Uri uriIdentity, Uri icon, string name, string cluster, string method)
+    private JsonRequest PrepareAuthRequest(Uri uriIdentity, Uri icon, string name, string cluster, string method, string chain = null)
     {
         if (uriIdentity != null && !uriIdentity.IsAbsoluteUri)
         {
@@ -93,7 +101,8 @@ private JsonRequest PrepareAuthRequest(Uri uriIdentity, Uri icon, string name, s
                     Icon = icon,
                     Name = name
                 },
-                Cluster = cluster
+                Cluster = cluster,
+                Chain = chain
             },
             Id = NextMessageId()
         };

Runtime/codebase/SolanaMobileStack/SolanaMobileWalletAdapter.cs

@@ -42,7 +42,7 @@ private void OnApplicationFocus(bool hasFocus)
         // below still touches PlayerPrefs directly. Live reads and writes
         // for the auth token go through _authCache (see IMwaAuthCache).
         private const string PrefKeyAuthToken = PlayerPrefsAuthCache.DefaultKey;
-        
+
         private readonly SolanaMobileWalletAdapterOptions _walletOptions;
 
         private Transaction _currentTransaction;
@@ -59,6 +59,17 @@ private void OnApplicationFocus(bool hasFocus)
         public event Action OnWalletDisconnected;
         public event Action OnWalletReconnected;
 
+        // CAIP-2 chain identifiers for MWA 2.0 wallets (e.g. Seeker Seed Vault).
+        // Keyed to match RpcCluster / RPCNameMap. LocalNet has no standard CAIP-2
+        // value, so it maps to null and only the legacy "cluster" field is sent.
+        private static readonly Dictionary<int, string> ChainNameMap = new ()
+        {
+            { 0, "solana:mainnet" },
+            { 1, "solana:devnet" },
+            { 2, "solana:testnet" },
+            { 3, null },
+        };
+
         public SolanaMobileWalletAdapter(
             SolanaMobileWalletAdapterOptions solanaWalletOptions,
             RpcCluster rpcCluster = RpcCluster.DevNet,
@@ -178,7 +189,8 @@ private async Task RunPrivileged(Action<IAdapterOperations> privilegedAction, st
             // operation in one session, so only the operation itself prompts.
             if (!_authToken.IsNullOrEmpty())
             {
-                var reauthorize = new ReauthorizeOperation(_walletOptions, _authToken);
+                var reauthorize = new ReauthorizeOperation(
+                    _walletOptions, _authToken, RPCNameMap[(int)RpcCluster], ChainNameMap[(int)RpcCluster]);
                 using (var scenario = await CreateTargetedScenario())
                 {
                     var actions = reauthorize.BuildActions();
@@ -205,7 +217,8 @@ private async Task RunPrivileged(Action<IAdapterOperations> privilegedAction, st
             }
 
             // No usable token: authorize (prompts) and run the operation in one session.
-            var authorize = new AuthorizeOperation(_walletOptions, RPCNameMap[(int)RpcCluster]);
+            var authorize = new AuthorizeOperation(
+                _walletOptions, RPCNameMap[(int)RpcCluster], ChainNameMap[(int)RpcCluster]);
             using (var scenario = await CreateTargetedScenario())
             {
                 var actions = authorize.BuildActions();
@@ -300,8 +313,9 @@ private async Task<Account> _LoginInternal(string password = null)
             using var localAssociationScenario = await CreateTargetedScenario();
 
             var cluster = RPCNameMap[(int)RpcCluster];
-            var authorizationOperation = new AuthorizeOperation(_walletOptions, cluster);
-            
+            var chain = ChainNameMap[(int)RpcCluster];
+            var authorizationOperation = new AuthorizeOperation(_walletOptions, cluster, chain);
+
             var result = await localAssociationScenario.StartAndExecute(authorizationOperation.BuildActions());
             if (!result.WasSuccessful)
             {
@@ -564,13 +578,15 @@ internal sealed class AuthorizeOperation
 {
     private readonly SolanaMobileWalletAdapterOptions _opts;
     private readonly string _cluster;
+    private readonly string _chain;
 
     public AuthorizationResult Authorization { get; private set; }
 
-    public AuthorizeOperation(SolanaMobileWalletAdapterOptions opts, string cluster)
+    public AuthorizeOperation(SolanaMobileWalletAdapterOptions opts, string cluster, string chain = null)
     {
         _opts = opts;
         _cluster = cluster;
+        _chain = chain;
     }
 
     public List<Action<IAdapterOperations>> BuildActions()
@@ -583,7 +599,8 @@ public List<Action<IAdapterOperations>> BuildActions()
                     new Uri(_opts.identityUri),
                     new Uri(_opts.iconUri, UriKind.Relative),
                     _opts.name,
-                    _cluster);
+                    _cluster,
+                    _chain);
             }
         };
     }
@@ -593,13 +610,17 @@ internal sealed class ReauthorizeOperation
 {
     private readonly SolanaMobileWalletAdapterOptions _opts;
     private readonly string _authToken;
-    
+    private readonly string _cluster;
+    private readonly string _chain;
+
     public AuthorizationResult Authorization { get; private set; }
 
-    public ReauthorizeOperation(SolanaMobileWalletAdapterOptions opts, string authToken)
+    public ReauthorizeOperation(SolanaMobileWalletAdapterOptions opts, string authToken, string cluster = null, string chain = null)
     {
         _opts = opts;
         _authToken = authToken;
+        _cluster = cluster;
+        _chain = chain;
     }
 
     public List<Action<IAdapterOperations>> BuildActions()
@@ -611,7 +632,7 @@ public List<Action<IAdapterOperations>> BuildActions()
                 Authorization = await client.Reauthorize(
                     new Uri(_opts.identityUri),
                     new Uri(_opts.iconUri, UriKind.Relative),
-                    _opts.name, _authToken);
+                    _opts.name, _authToken, _cluster, _chain);
             }
         };
     }

Tests/EditMode/Contracts/IAdapterOperationsContractTests.cs

@@ -46,8 +46,8 @@ public void Interface_Has_Authorize_WithExpectedSignature()
             Assert.IsNotNull(method, "IAdapterOperations.Authorize must exist");
             Assert.AreEqual(typeof(Task<AuthorizationResult>), method.ReturnType,
                 "Authorize must return Task<AuthorizationResult>");
-            Assert.IsTrue(HasParams(method, typeof(Uri), typeof(Uri), typeof(string), typeof(string)),
-                "Authorize params must be (Uri identityUri, Uri iconUri, string identityName, string rpcCluster)");
+            Assert.IsTrue(HasParams(method, typeof(Uri), typeof(Uri), typeof(string), typeof(string), typeof(string)),
+                "Authorize params must be (Uri identityUri, Uri iconUri, string identityName, string rpcCluster, string chain)");
         }
 
 
@@ -60,8 +60,8 @@ public void Interface_Has_Reauthorize_WithExpectedSignature()
             Assert.IsNotNull(method, "IAdapterOperations.Reauthorize must exist");
             Assert.AreEqual(typeof(Task<AuthorizationResult>), method.ReturnType,
                 "Reauthorize must return Task<AuthorizationResult>");
-            Assert.IsTrue(HasParams(method, typeof(Uri), typeof(Uri), typeof(string), typeof(string)),
-                "Reauthorize params must be (Uri identityUri, Uri iconUri, string identityName, string authToken)");
+            Assert.IsTrue(HasParams(method, typeof(Uri), typeof(Uri), typeof(string), typeof(string), typeof(string), typeof(string)),
+                "Reauthorize params must be (Uri identityUri, Uri iconUri, string identityName, string authToken, string rpcCluster, string chain)");
         }
 
 

Tests/EditMode/MwaClient/MobileWalletAdapterClientTests.cs

@@ -119,6 +119,40 @@ public void Authorize_SendsJsonRpc_WithCorrectCluster()
                 "Params.Cluster must match the supplied cluster string");
         }
 
+        [Test]
+        public void Authorize_SendsJsonRpc_WithCorrectChain()
+        {
+            // Arrange
+            var identityUri = new Uri("https://example.com");
+            const string cluster = "devnet";
+            const string chain = "solana:devnet";
+
+            // Act
+            _ = _client.Authorize(identityUri, null, "TestApp", cluster, chain);
+
+            // Assert
+            var request = DecodeLastRequest();
+            Assert.AreEqual(chain, request.Params.Chain,
+                "Params.Chain must match the supplied CAIP-2 chain string");
+        }
+
+        [Test]
+        public void Authorize_OmitsChain_WhenChainIsNull()
+        {
+            // Arrange
+            var identityUri = new Uri("https://example.com");
+            const string cluster = "mainnet-beta";
+
+            // Act: no chain supplied (e.g. LocalNet) — Chain must stay null so
+            // NullValueHandling.Ignore drops it from the serialized request.
+            _ = _client.Authorize(identityUri, null, "TestApp", cluster);
+
+            // Assert
+            var request = DecodeLastRequest();
+            Assert.IsNull(request.Params.Chain,
+                "Params.Chain must be null when no chain is supplied");
+        }
+
         [Test]
         public void Authorize_MessageIds_AreIncrementing()
         {
@@ -176,8 +210,10 @@ public void Authorize_ThrowsArgumentException_WhenIconUri_IsAbsolute()
 
         // Reauthorize
         [Test]
-        public void Reauthorize_SendsJsonRpc_WithCorrectMethod()
+        public void Reauthorize_SendsJsonRpc_AsAuthorizeWithAuthToken()
         {
+            // MWA 2.0 deprecated the standalone `reauthorize` method; reauthorization is
+            // performed via `authorize` carrying an auth_token.
             // Arrange
             var identityUri = new Uri("https://example.com");
             const string authToken = "test-auth-token-abc123";
@@ -187,8 +223,8 @@ public void Reauthorize_SendsJsonRpc_WithCorrectMethod()
 
             // Assert
             var request = DecodeLastRequest();
-            Assert.AreEqual("reauthorize", request.Method,
-                "Method must be 'reauthorize'");
+            Assert.AreEqual("authorize", request.Method,
+                "Method must be 'authorize' (MWA 2.0 reauthorize-via-authorize)");
         }
 
         [Test]
@@ -206,5 +242,24 @@ public void Reauthorize_SendsJsonRpc_WithAuthToken()
             Assert.AreEqual(authToken, request.Params.AuthToken,
                 "Params.AuthToken must match the supplied auth token");
         }
+
+        [Test]
+        public void Reauthorize_SendsJsonRpc_WithChain()
+        {
+            // The chain MUST be forwarded on reauthorize, or the wallet defaults the
+            // re-established session to solana:mainnet (Network mismatch at sign time).
+            // Arrange
+            var identityUri = new Uri("https://example.com");
+            const string authToken = "test-auth-token-abc123";
+            const string chain = "solana:devnet";
+
+            // Act
+            _ = _client.Reauthorize(identityUri, null, "TestApp", authToken, "devnet", chain);
+
+            // Assert
+            var request = DecodeLastRequest();
+            Assert.AreEqual(chain, request.Params.Chain,
+                "Params.Chain must match the supplied CAIP-2 chain string on reauthorize");
+        }
     }
 }