Upgrade WC, add default chains, network add/switch

Author: 0xFirekeeper

Assets/Thirdweb/Examples/Scripts/PlaygroundManager.cs

@@ -84,7 +84,6 @@ private async void ConnectWallet(WalletOptions options)
         {
             // Connect the wallet
 
-            Debug.Log(1);
             var wallet = await ThirdwebManager.Instance.ConnectWallet(options);
 
             // Initialize the wallet panel
@@ -395,7 +394,7 @@ private async void InitializeAccountAbstractionPanel()
                 }
                 catch (System.Exception e)
                 {
-                    Log(panel.LogText, e.ToString());
+                    Log(panel.LogText, e.Message);
                 }
             });
 

Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/CHANGELOG.md

@@ -5,6 +5,42 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.10] - 2024-07-31
+
+### Changed
+
+- Upgraded WalletConnectSharp to [v2.4.1](https://github.com/WalletConnect/WalletConnectSharp/releases/tag/v2.4.1)
+
+### Fixed
+
+- Occasionally a grey texture would appear instead of a QR code
+- Deep linking didn't work with some wallets on mobile
+
+## [3.1.10] - 2024-07-16
+
+- Upgraded WalletConnectSharp to [v2.4.0](https://github.com/WalletConnect/WalletConnectSharp/releases/tag/v2.4.0)
+
+## [3.1.8] - 2024-06-26
+
+### Fixed
+
+- Incorrect Ronin chain explorer URL
+- Warming about unnecessary zxing asmdef file
+
+## [3.1.7] - 2024-06-07
+
+### Changed
+
+- Upgraded WalletConnectSharp to [v2.3.8](https://github.com/WalletConnect/WalletConnectSharp/releases/tag/v2.3.8)
+
+### Fixed
+
+- `Unreachable code detected` warnings
+- `WalletConnectInterceptor` doesn't support `eth_signTypedData_v4` requests with more than 1 parameter
+- Deprecated Polygon RPC URL
+- Dependency collision with UniRx and Cysharp/R3
+- Generated QR code textures taking up too much memory
+
 ## [3.1.6] - 2024-05-09
 
 ### Added

Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/Plugins.meta

@@ -7,6 +7,9 @@ namespace WalletConnectUnity.Core
     public class Chain
     {
         public virtual string Name { get; }
+        
+        // https://github.com/wevm/viem/blob/main/src/chains/index.ts
+        public virtual string ViemName { get; }
         public virtual Currency NativeCurrency { get; }
         public virtual BlockExplorer BlockExplorer { get; }
         public virtual string RpcUrl { get; }
@@ -28,7 +31,8 @@ public Chain(
             BlockExplorer blockExplorer,
             string rpcUrl,
             bool isTestnet,
-            string imageUrl)
+            string imageUrl,
+            string viemName = null)
         {
             ChainNamespace = chainNamespace;
             ChainReference = chainReference;
@@ -38,6 +42,7 @@ public Chain(
             RpcUrl = rpcUrl;
             IsTestnet = isTestnet;
             ImageUrl = imageUrl;
+            ViemName = viemName;
         }
     }
 
@@ -141,7 +146,8 @@ public static class Chains
                 new BlockExplorer("Etherscan", "https://etherscan.io"),
                 "https://cloudflare-eth.com",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Ethereum]}"
+                $"{ChainImageUrl}/{ImageIds[References.Ethereum]}",
+                "mainnet"
             );
 
             public static readonly Chain EthereumGoerli = new(
@@ -152,7 +158,8 @@ public static class Chains
                 new BlockExplorer("Etherscan", "https://goerli.etherscan.io"),
                 "https://goerli.infura.io/v3/",
                 true,
-                $"{ChainImageUrl}/{ImageIds[References.EthereumGoerli]}"
+                $"{ChainImageUrl}/{ImageIds[References.EthereumGoerli]}",
+                "goerli"
             );
 
             public static readonly Chain Optimism = new(
@@ -163,18 +170,20 @@ public static class Chains
                 new BlockExplorer("Optimistic Etherscan", "https://optimistic.etherscan.io"),
                 "https://mainnet.optimism.io",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Optimism]}"
+                $"{ChainImageUrl}/{ImageIds[References.Optimism]}",
+                "optimism"
             );
 
             public static readonly Chain Ronin = new(
                 Namespaces.Evm,
                 References.Ronin,
                 "Ronin",
                 new Currency("Ronin", "RON", 18),
-                new BlockExplorer("Ronin Explorer", "https://api-gateway.skymavis.com/rpc"),
+                new BlockExplorer("Ronin Explorer", "https://app.roninchain.com/"),
                 "https://api.roninchain.com/rpc",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Ronin]}"
+                $"{ChainImageUrl}/{ImageIds[References.Ronin]}",
+                "ronin"
             );
 
             public static readonly Chain RoninSaigon = new(
@@ -185,7 +194,8 @@ public static class Chains
                 new BlockExplorer("Ronin Explorer", "https://explorer.roninchain.com"),
                 "\thttps://api-gateway.skymavis.com/rpc/testnet",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Ronin]}"
+                $"{ChainImageUrl}/{ImageIds[References.Ronin]}",
+                "saigon"
             );
 
             public static readonly Chain Arbitrum = new(
@@ -196,7 +206,8 @@ public static class Chains
                 new BlockExplorer("Arbitrum Explorer", "https://arbiscan.io"),
                 "https://arb1.arbitrum.io/rpc",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Arbitrum]}"
+                $"{ChainImageUrl}/{ImageIds[References.Arbitrum]}",
+                "arbitrum"
             );
 
             public static readonly Chain Celo = new(
@@ -207,7 +218,8 @@ public static class Chains
                 new BlockExplorer("Celo Explorer", "https://explorer.celo.org"),
                 "https://forno.celo.org",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Celo]}"
+                $"{ChainImageUrl}/{ImageIds[References.Celo]}",
+                "celo"
             );
 
             public static readonly Chain CeloAlfajores = new(
@@ -218,7 +230,8 @@ public static class Chains
                 new BlockExplorer("Celo Explorer", "https://alfajores-blockscout.celo-testnet.org"),
                 "https://alfajores-forno.celo-testnet.org",
                 true,
-                $"{ChainImageUrl}/{ImageIds[References.CeloAlfajores]}"
+                $"{ChainImageUrl}/{ImageIds[References.CeloAlfajores]}",
+                "celoAlfajores"
             );
 
             public static readonly Chain Base = new(
@@ -229,7 +242,8 @@ public static class Chains
                 new BlockExplorer("BaseScan", "https://basescan.org/"),
                 "https://mainnet.base.org",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Base]}"
+                $"{ChainImageUrl}/{ImageIds[References.Base]}",
+                "base"
             );
 
             public static readonly Chain BaseGoerli = new(
@@ -240,7 +254,8 @@ public static class Chains
                 new BlockExplorer("BaseScan", "https://goerli.basescan.org/"),
                 "https://goerli.base.org",
                 true,
-                $"{ChainImageUrl}/{ImageIds[References.BaseGoerli]}"
+                $"{ChainImageUrl}/{ImageIds[References.BaseGoerli]}",
+                "baseGoerli"
             );
 
             public static readonly Chain Polygon = new(
@@ -249,9 +264,10 @@ public static class Chains
                 "Polygon",
                 new Currency("Matic", "MATIC", 18),
                 new BlockExplorer("Polygon Explorer", "https://polygonscan.com"),
-                "https://rpc-mainnet.maticvigil.com",
+                "https://polygon-rpc.com",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Polygon]}"
+                $"{ChainImageUrl}/{ImageIds[References.Polygon]}",
+                "polygon"
             );
 
             public static readonly Chain Avalanche = new(
@@ -262,7 +278,8 @@ public static class Chains
                 new BlockExplorer("Avalanche Explorer", "https://snowtrace.io/"),
                 "https://api.avax.network/ext/bc/C/rpc",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Avalanche]}"
+                $"{ChainImageUrl}/{ImageIds[References.Avalanche]}",
+                "avalanche"
             );
 
             public static readonly Chain Solana = new(
@@ -273,7 +290,8 @@ public static class Chains
                 new BlockExplorer("Solana Explorer", "https://explorer.solana.com"),
                 "https://api.mainnet-beta.solana.com",
                 false,
-                $"{ChainImageUrl}/{ImageIds[References.Solana]}"
+                $"{ChainImageUrl}/{ImageIds[References.Solana]}",
+                "solana"
             );
 
             public static readonly IReadOnlyCollection<Chain> All = new HashSet<Chain>

Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/Runtime/Chain.cs

@@ -13,7 +13,8 @@ public static async Task SwitchEthereumChainAsync(this IWalletConnect walletConn
                 throw new ArgumentNullException(nameof(ethereumChain));
 
             var ciap2ChainId = $"eip155:{ethereumChain.chainIdDecimal}";
-            if (!walletConnect.ActiveSession.Namespaces.TryGetValue("eip155", out var @namespace) || !@namespace.Chains.Contains(ciap2ChainId))
+            if (!walletConnect.ActiveSession.Namespaces.TryGetValue("eip155", out var @namespace)
+                || !@namespace.Chains.Contains(ciap2ChainId))
             {
                 var request = new WalletAddEthereumChain(ethereumChain);
 
@@ -31,4 +32,4 @@ public static async Task SwitchEthereumChainAsync(this IWalletConnect walletConn
             await walletConnect.RequestAsync<WalletSwitchEthereumChain, string>(data);
         }
     }
-}
+}

Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/Runtime/EVM/Extensions.cs

@@ -37,13 +37,12 @@ public static void OpenSessionProposalDeepLink(string uri, Wallet wallet)
 #if UNITY_EDITOR && (UNITY_IOS || UNITY_ANDROID)
             // In editor we cannot open _mobile_ deep links, so we just log the uri
             Debug.Log($"[Linker] Requested to open mobile deep link. The uri: {uri}");
-            return;
 #else
-
             var link = Application.isMobilePlatform ? wallet.MobileLink : wallet.DesktopLink;
 
             if (string.IsNullOrWhiteSpace(link))
-                throw new Exception($"[Linker] No link found for {Application.platform} platform in wallet {wallet.Name}.");
+                throw new Exception(
+                    $"[Linker] No link found for {Application.platform} platform in wallet {wallet.Name}.");
 
             var url = BuildConnectionDeepLink(link, uri);
 
@@ -58,20 +57,34 @@ public static void OpenSessionRequestDeepLink(in SessionStruct session)
             if (string.IsNullOrWhiteSpace(session.Topic))
                 throw new Exception("[Linker] No session topic found in provided session. Cannot open deep link.");
 
-            if (session.Peer.Metadata != null)
+            if (session.Peer.Metadata == null)
+                return;
+
+            var redirectNative = session.Peer.Metadata.Redirect?.Native;
+
+            if (string.IsNullOrWhiteSpace(redirectNative))
             {
-                var redirectNative = session.Peer.Metadata.Redirect.Native;
+                if (!WalletUtils.TryGetRecentWallet(out var recentWallet))
+                    return;
 
-                if (string.IsNullOrWhiteSpace(redirectNative) && WalletUtils.TryGetRecentWallet(out var recentWallet))
-                {
-                    WCLogger.LogError($"[Linker] No redirect found for {session.Peer.Metadata.Name}. Using deep link from the Recent Wallet.");
-                    Application.OpenURL(Application.isMobilePlatform ? recentWallet.MobileLink : recentWallet.DesktopLink);
-                }
-                else
-                {
-                    WCLogger.Log($"[Linker] Open native deep link: {redirectNative}");
-                    Application.OpenURL(redirectNative);
-                }
+                Debug.LogWarning(
+                    $"[Linker] No redirect found for {session.Peer.Metadata.Name}. Using deep link from the Recent Wallet."
+                );
+
+                redirectNative = Application.isMobilePlatform ? recentWallet.MobileLink : recentWallet.DesktopLink;
+                if (!redirectNative.EndsWith("://"))
+                    redirectNative = $"{redirectNative}://";
+
+                Application.OpenURL(redirectNative);
+            }
+            else
+            {
+                WCLogger.Log($"[Linker] Open native deep link: {redirectNative}");
+
+                if (!redirectNative.EndsWith("://"))
+                    redirectNative = $"{redirectNative}://";
+
+                Application.OpenURL(redirectNative);
             }
         }
 
@@ -90,7 +103,7 @@ public static string BuildConnectionDeepLink(string appLink, string wcUri)
                 safeAppUrl = $"{safeAppUrl}://";
             }
 
-            if (!safeAppUrl.EndsWith("/"))
+            if (!safeAppUrl.EndsWith('/'))
                 safeAppUrl = $"{safeAppUrl}/";
 
             var encodedWcUrl = Uri.EscapeDataString(wcUri);
@@ -112,24 +125,21 @@ public virtual void OpenSessionRequestDeepLink()
 
         protected virtual void OnPublisherPublishedMessage(object sender, PublishParams publishParams)
         {
-            WalletConnect.UnitySyncContext.Post(
-                _ =>
-                {
-                    if (string.IsNullOrWhiteSpace(publishParams.Topic))
-                        return;
+            WalletConnect.UnitySyncContext.Post(_ =>
+            {
+                if (string.IsNullOrWhiteSpace(publishParams.Topic))
+                    return;
 
-                    if (_sessionMessagesCounter.TryGetValue(publishParams.Topic, out var messageCount))
+                if (_sessionMessagesCounter.TryGetValue(publishParams.Topic, out var messageCount))
+                {
+                    WCLogger.Log($"[Linker] OnPublisherPublishedMessage. Message count: {messageCount}");
+                    if (messageCount != 0)
                     {
-                        WCLogger.Log($"[Linker] OnPublisherPublishedMessage. Message count: {messageCount}");
-                        if (messageCount != 0)
-                        {
-                            _sessionMessagesCounter[publishParams.Topic] = messageCount - 1;
-                            OpenSessionRequestDeepLink(publishParams.Topic);
-                        }
+                        _sessionMessagesCounter[publishParams.Topic] = messageCount - 1;
+                        OpenSessionRequestDeepLink(publishParams.Topic);
                     }
-                },
-                null
-            );
+                }
+            }, null);
         }
 
         public void OpenSessionRequestDeepLinkAfterMessageFromSession(string sessionTopic)
@@ -180,13 +190,12 @@ public void Dispose()
 
         protected virtual void Dispose(bool disposing)
         {
-            if (disposed)
-                return;
+            if (disposed) return;
 
             if (disposing)
                 _walletConnect.SignClient.Core.Relayer.Publisher.OnPublishedMessage -= OnPublisherPublishedMessage;
 
             disposed = true;
         }
     }
-}
+}

Assets/Thirdweb/Plugins/WalletConnectUnity/com.walletconnect.core/Runtime/Linker.cs

@@ -4,16 +4,13 @@ namespace WalletConnectUnity.Core.Networking
 {
     public static class UnityWebRequestExtensions
     {
-        public static string sdkType = "wcm";
-        public static string sdkVersion = "unity-sdk-v1.0.0";
-
         public static UnityWebRequest SetWalletConnectRequestHeaders(this UnityWebRequest uwr)
         {
             var projectId = ProjectConfiguration.Load().Id;
 
             uwr.SetRequestHeader("x-project-id", projectId);
-            uwr.SetRequestHeader("x-sdk-type", sdkType);
-            uwr.SetRequestHeader("x-sdk-version", sdkVersion);
+            uwr.SetRequestHeader("x-sdk-type", SdkMetadata.Type);
+            uwr.SetRequestHeader("x-sdk-version", SdkMetadata.Version);
 
             return uwr;
         }