Wallet Connect QR code error fix

Packages/.gitignore

@@ -79,10 +79,15 @@ crashlytics-build.properties
 !*.meta
 
 # Ignore the build artifacts from our libraries
-# /io.chainsafe.web3-unity/Runtime/Libraries/*.dll
-# /io.chainsafe.web3-unity/Runtime/Libraries/*.dll.meta
+/io.chainsafe.web3-unity/Runtime/Libraries/*.dll
+/io.chainsafe.web3-unity/Runtime/Libraries/*.dll.meta
 /io.chainsafe.web3-unity/Runtime/Libraries/*.pdb
 /io.chainsafe.web3-unity/Runtime/Libraries/*.pdb.meta
 
+/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/*.dll
+/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/*.dll.meta
+/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/*.pdb
+/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/*.pdb.meta
+
 # Since the folder is called 'Debug', it's being ignored, so negate that
 !/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Debug

Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs

@@ -185,7 +185,8 @@ private void BuildWalletConnectConfig()
             // try and get saved value
             SavedSessionTopic = walletConnectConfig?.SavedSessionTopic,
             SupportedWallets = supportedWallets,
-            StoragePath = Application.persistentDataPath,
+            // save file closer to assets when in editor, more accessible
+            StoragePath = Application.isEditor ? Application.dataPath : Application.persistentDataPath,
             RedirectToWallet = redirectToWallet,
             KeepSessionAlive = autoLogin || rememberMeToggle.isOn,
             DefaultWallet = defaultWallet,

Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Utilities/PlayerData.cs

@@ -14,14 +14,24 @@ public class PlayerData
 {
     #region Save & Load
 
-    private static string _path = $"{Path.Combine(Application.persistentDataPath, nameof(PlayerData))}.json";
+    private string Path
+    {
+        get
+        {
+            // save closer to assets when in editor
+            // more accessible
+            string directory = Application.isEditor ? Application.dataPath : Application.persistentDataPath;
+
+            return $"{System.IO.Path.Combine(directory, nameof(PlayerData))}.json";
+        }
+    }
 
     /// <summary>
     /// Singleton instance.
     /// </summary>
     public static PlayerData Instance { get; private set; } = new PlayerData();
 
-    private bool FileExists => File.Exists(_path);
+    private bool FileExists => File.Exists(Path);
 
     /// <summary>
     /// Loads Data when runtime starts.
@@ -41,26 +51,26 @@ private void LoadData()
             return;
         }
 
-        using (FileStream fs = new FileStream(_path, FileMode.Open, FileAccess.Read))
+        using (FileStream fs = new FileStream(Path, FileMode.Open, FileAccess.Read))
         using (StreamReader sr = new StreamReader(fs))
         {
             string rawJson = sr.ReadToEnd();
 
             Instance = JsonConvert.DeserializeObject<PlayerData>(rawJson);
 
-            Debug.Log($"{nameof(PlayerData)} loaded from path {_path}.");
+            Debug.Log($"{nameof(PlayerData)} loaded from path {Path}.");
         }
     }
 
     private void SaveData()
     {
         // create file
-        using (FileStream fs = new FileStream(_path, FileMode.OpenOrCreate, FileAccess.Write))
+        using (FileStream fs = new FileStream(Path, FileMode.OpenOrCreate, FileAccess.Write))
         using (StreamWriter sw = new StreamWriter(fs))
         {
             sw.WriteLine(JsonConvert.SerializeObject(Instance));
 
-            Debug.Log($"{nameof(PlayerData)} saved at path {_path}.");
+            Debug.Log($"{nameof(PlayerData)} saved at path {Path}.");
         }
     }
 

src/ChainSafe.Gaming.WalletConnect/WalletConnectCustomProvider.cs

@@ -379,6 +379,13 @@ private FileSystemStorage BuildStorage()
         {
             var path = Path.Combine(config.StoragePath, "walletconnect.json");
 
+            // If we're not restoring a session and save WC file exists remove it.
+            // This is done to mitigate for a WC error that happens intermittently where generated Uri doesn't connect wallet.
+            if (string.IsNullOrEmpty(config.SavedSessionTopic) && File.Exists(path))
+            {
+                File.Delete(path);
+            }
+
             WCLogger.Log($"Wallet Connect Storage set to {path}");
 
             return new FileSystemStorage(path);

src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs

@@ -185,7 +185,8 @@ private void BuildWalletConnectConfig()
             // try and get saved value
             SavedSessionTopic = walletConnectConfig?.SavedSessionTopic,
             SupportedWallets = supportedWallets,
-            StoragePath = Application.persistentDataPath,
+            // save file closer to assets when in editor, more accessible
+            StoragePath = Application.isEditor ? Application.dataPath : Application.persistentDataPath,
             RedirectToWallet = redirectToWallet,
             KeepSessionAlive = autoLogin || rememberMeToggle.isOn,
             DefaultWallet = defaultWallet,

src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Utilities/PlayerData.cs

@@ -14,14 +14,24 @@ public class PlayerData
 {
     #region Save & Load
 
-    private static string _path = $"{Path.Combine(Application.persistentDataPath, nameof(PlayerData))}.json";
+    private string Path
+    {
+        get
+        {
+            // save closer to assets when in editor
+            // more accessible
+            string directory = Application.isEditor ? Application.dataPath : Application.persistentDataPath;
+
+            return $"{System.IO.Path.Combine(directory, nameof(PlayerData))}.json";
+        }
+    }
 
     /// <summary>
     /// Singleton instance.
     /// </summary>
     public static PlayerData Instance { get; private set; } = new PlayerData();
 
-    private bool FileExists => File.Exists(_path);
+    private bool FileExists => File.Exists(Path);
 
     /// <summary>
     /// Loads Data when runtime starts.
@@ -41,26 +51,26 @@ private void LoadData()
             return;
         }
 
-        using (FileStream fs = new FileStream(_path, FileMode.Open, FileAccess.Read))
+        using (FileStream fs = new FileStream(Path, FileMode.Open, FileAccess.Read))
         using (StreamReader sr = new StreamReader(fs))
         {
             string rawJson = sr.ReadToEnd();
 
             Instance = JsonConvert.DeserializeObject<PlayerData>(rawJson);
 
-            Debug.Log($"{nameof(PlayerData)} loaded from path {_path}.");
+            Debug.Log($"{nameof(PlayerData)} loaded from path {Path}.");
         }
     }
 
     private void SaveData()
     {
         // create file
-        using (FileStream fs = new FileStream(_path, FileMode.OpenOrCreate, FileAccess.Write))
+        using (FileStream fs = new FileStream(Path, FileMode.OpenOrCreate, FileAccess.Write))
         using (StreamWriter sw = new StreamWriter(fs))
         {
             sw.WriteLine(JsonConvert.SerializeObject(Instance));
 
-            Debug.Log($"{nameof(PlayerData)} saved at path {_path}.");
+            Debug.Log($"{nameof(PlayerData)} saved at path {Path}.");
         }
     }