From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 1/6] Revert "automated duplicating imported samples modifications (#595)" This reverts commit a5558941827a91df51e2dd200648dcd13a1231c8. --- .github/workflows/duplicate_sample.yaml | 28 ------------------- duplicate_package_sample.sh | 14 ---------- .../Samples~/Web3.Unity/Prefabs.meta | 8 ------ .../Samples~/Web3.Unity/Scenes.meta | 8 ------ .../Samples~/Web3.Unity/Scripts.meta | 8 ------ .../Samples~/Web3.Unity/Sprites.meta | 8 ------ 6 files changed, 74 deletions(-) delete mode 100644 .github/workflows/duplicate_sample.yaml delete mode 100644 duplicate_package_sample.sh delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta diff --git a/.github/workflows/duplicate_sample.yaml b/.github/workflows/duplicate_sample.yaml deleted file mode 100644 index 793149e56..000000000 --- a/.github/workflows/duplicate_sample.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Duplicate-Package-Sample - -on: - push: - branches: - - main - -jobs: - duplicate: - name: duplicate package sample - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Run duplicate script file - run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh - - - name: Commit and Push - run: | - git config --global user.email $git_email - git config --global user.name "${{ github.actor }}" - git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f - git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push - env: - git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file diff --git a/duplicate_package_sample.sh b/duplicate_package_sample.sh deleted file mode 100644 index f3a677742..000000000 --- a/duplicate_package_sample.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Specify the source directory and the destination directory -SOURCE_DIRECTORY="src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0-pre001/Web3.Unity Samples/" -DESTINATION_DIRECTORY="src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" - -# clear destination directory first -rm -r "$DESTINATION_DIRECTORY" - -# Copy source to the destination -cp -r "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY" - -#add all modified files -git add "src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/." -f \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta deleted file mode 100644 index 5b35daff8..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45a04d2621549e3458049c6c447c3941 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta deleted file mode 100644 index 5488a62ed..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f39f8dda9616349489a7803d7e0aff30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta deleted file mode 100644 index 9a1e8b8d4..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaef630f284e6e04a88b5939e0eb1cc5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta deleted file mode 100644 index 7175ee89d..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c06517aee7843642a091a67c72b1379 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 0cc92d47343be973ed70ff25b89593a9108b12d3 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Tue, 7 Nov 2023 10:03:23 +0300 Subject: [PATCH 2/6] Changes made + dlls ignored again in .gitignore for packages since we now use CI to generate them + Delete WC storage file if session isn't being restored + Save files closer to project when Application.isEditor for convenience --- Packages/.gitignore | 9 ++++++-- .../WalletConnectCustomProvider.cs | 7 ++++++ .../Scripts/Scenes/ExistingWalletLogin.cs | 3 ++- .../Scripts/Utilities/PlayerData.cs | 22 ++++++++++++++----- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Packages/.gitignore b/Packages/.gitignore index d51905818..4a12d5262 100644 --- a/Packages/.gitignore +++ b/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 \ No newline at end of file diff --git a/src/ChainSafe.Gaming.WalletConnect/WalletConnectCustomProvider.cs b/src/ChainSafe.Gaming.WalletConnect/WalletConnectCustomProvider.cs index 2a13cffa7..3a3b2646d 100644 --- a/src/ChainSafe.Gaming.WalletConnect/WalletConnectCustomProvider.cs +++ b/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); diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs index ec1fe181c..0c9ed5b43 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs +++ b/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, diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Utilities/PlayerData.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Utilities/PlayerData.cs index c9abc92ab..1bd28bc1e 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Utilities/PlayerData.cs +++ b/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"; + } + } /// /// Singleton instance. /// public static PlayerData Instance { get; private set; } = new PlayerData(); - private bool FileExists => File.Exists(_path); + private bool FileExists => File.Exists(Path); /// /// 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(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}."); } } From 1ebbce0a3a1e8835a578e26c23cd1649ca10400c Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Tue, 7 Nov 2023 07:15:13 +0000 Subject: [PATCH 3/6] Auto-duplicate Packages Samples --- .../Scripts/Scenes/ExistingWalletLogin.cs | 3 ++- .../Scripts/Utilities/PlayerData.cs | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs b/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs index ec1fe181c..0c9ed5b43 100644 --- a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs +++ b/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, diff --git a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Utilities/PlayerData.cs b/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Utilities/PlayerData.cs index c9abc92ab..1bd28bc1e 100644 --- a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Utilities/PlayerData.cs +++ b/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"; + } + } /// /// Singleton instance. /// public static PlayerData Instance { get; private set; } = new PlayerData(); - private bool FileExists => File.Exists(_path); + private bool FileExists => File.Exists(Path); /// /// 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(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}."); } } From d29ca058e7b2370d0c519957b58317105a46b9d2 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Tue, 7 Nov 2023 07:15:41 +0000 Subject: [PATCH 4/6] Published Solution Dependencies to Package Libraries as DLLs --- .../Libraries/ChainSafe.Gaming.Unity.dll | Bin 15360 -> 15360 bytes .../ChainSafe.Gaming.WalletConnect.dll | Bin 35840 -> 35840 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll index 674073b12eb59127ac7b40b9084b26bb4e157e60..a9af50acd0182a9dd1b45ef47951380acd667a72 100644 GIT binary patch delta 105 zcmZpuXsDRb!BX&D?fk}`8%hGwr&lbW(qG`T{6lEY^w&47HkT-y@UuuQaD6g)jZuKW zblrI&=Wh4=E{M4iv@E~t++-f(76qu_Uzi|Jb;|tv$N#yj_HFh&HD}-E4aNZ+0H(e) ATmS$7 delta 105 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 delta 10266 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 From 0c5ff79a7bec839a6f17106e81eee10d6748baf5 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Wed, 8 Nov 2023 09:13:07 +0300 Subject: [PATCH 5/6] reverted unwanted changes back to main --- src/UnitySampleProject/Packages/manifest.json | 3 +- .../Packages/packages-lock.json | 42 +++++++------------ .../ProjectSettings/ProjectVersion.txt | 4 +- 3 files changed, 19 insertions(+), 30 deletions(-) diff --git a/src/UnitySampleProject/Packages/manifest.json b/src/UnitySampleProject/Packages/manifest.json index 1ea5ff90c..38ca12ddc 100644 --- a/src/UnitySampleProject/Packages/manifest.json +++ b/src/UnitySampleProject/Packages/manifest.json @@ -9,12 +9,11 @@ "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.5", "com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.0", - "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "io.chainsafe.web3-unity": "file:../../../Packages/io.chainsafe.web3-unity", - "io.chainsafe.web3-unity.lootboxes": "file:../../../Packages/io.chainsafe.web3-unity.lootboxes", "io.chainsafe.web3-unity.web3auth": "file:../../../Packages/io.chainsafe.web3-unity.web3auth", + "io.chainsafe.web3-unity.lootboxes": "file:../../../Packages/io.chainsafe.web3-unity.lootboxes", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/src/UnitySampleProject/Packages/packages-lock.json b/src/UnitySampleProject/Packages/packages-lock.json index 7f5b49967..e27442e2a 100644 --- a/src/UnitySampleProject/Packages/packages-lock.json +++ b/src/UnitySampleProject/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.9", + "version": "7.0.10", "depth": 1, "source": "registry", "dependencies": { @@ -39,12 +39,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.6", + "version": "6.0.7", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.8", - "com.unity.2d.common": "6.0.5", + "com.unity.2d.animation": "7.0.9", + "com.unity.2d.common": "6.0.6", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -56,12 +56,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.6", + "version": "7.0.7", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.4", + "com.unity.2d.common": "6.0.6", "com.unity.2d.path": "5.0.2", "com.unity.modules.physics2d": "1.0.0" }, @@ -74,7 +74,7 @@ "dependencies": {} }, "com.unity.2d.tilemap.extras": { - "version": "2.2.3", + "version": "2.2.5", "depth": 1, "source": "registry", "dependencies": { @@ -113,13 +113,13 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.9", + "com.unity.2d.animation": "7.0.10", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "6.0.6", + "com.unity.2d.psdimporter": "6.0.7", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.6", + "com.unity.2d.spriteshape": "7.0.7", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "2.2.3" + "com.unity.2d.tilemap.extras": "2.2.5" } }, "com.unity.ide.rider": { @@ -210,16 +210,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "2.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.sysroot": "2.0.7", - "com.unity.sysroot.linux-x86_64": "2.0.6" - }, - "url": "https://packages.unity.com" - }, "com.unity.ugui": { "version": "1.0.0", "depth": 0, @@ -247,20 +237,20 @@ "com.unity.nuget.newtonsoft-json": "3.0.2" } }, - "io.chainsafe.web3-unity.lootboxes": { - "version": "file:../../../Packages/io.chainsafe.web3-unity.lootboxes", + "io.chainsafe.web3-unity.web3auth": { + "version": "file:../../../Packages/io.chainsafe.web3-unity.web3auth", "depth": 0, "source": "local", "dependencies": { + "com.unity.nuget.newtonsoft-json": "3.0.2", "io.chainsafe.web3-unity": "2.5.0" } }, - "io.chainsafe.web3-unity.web3auth": { - "version": "file:../../../Packages/io.chainsafe.web3-unity.web3auth", + "io.chainsafe.web3-unity.lootboxes": { + "version": "file:../../../Packages/io.chainsafe.web3-unity.lootboxes", "depth": 0, "source": "local", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", "io.chainsafe.web3-unity": "2.5.0" } }, diff --git a/src/UnitySampleProject/ProjectSettings/ProjectVersion.txt b/src/UnitySampleProject/ProjectSettings/ProjectVersion.txt index eabd63377..f8251a7af 100644 --- a/src/UnitySampleProject/ProjectSettings/ProjectVersion.txt +++ b/src/UnitySampleProject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.15f1 -m_EditorVersionWithRevision: 2021.3.15f1 (e8e88683f834) +m_EditorVersion: 2021.3.22f1 +m_EditorVersionWithRevision: 2021.3.22f1 (b6c551784ba3) From 4929e5b2e609541cc97338372ca4a646db64eb84 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Wed, 8 Nov 2023 06:14:17 +0000 Subject: [PATCH 6/6] Published Solution Dependencies to Package Libraries as DLLs --- .../Libraries/ChainSafe.Gaming.Unity.dll | Bin 15360 -> 15360 bytes .../ChainSafe.Gaming.WalletConnect.dll | Bin 35840 -> 35840 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll index a9af50acd0182a9dd1b45ef47951380acd667a72..d7b5efef372e0c4f47400c19212f479786b898b8 100644 GIT binary patch delta 105 zcmZpuXsDRb!Q#M}ym({J4J84Q$wr%Bo!#!;?X5f8r1I5+%_Yhv{48vVclS+RV-z5; zViHf$`eTkh(}R!r2)^5|JekM1MFA>!CLAgVRBb0y?7eW$m%X?4A8zg4yumnt0|2C? BFaH1l delta 105 zcmZpuXsDRb!BX&D?fk}`8%hGwr&lbW(qG`T{6lEY^w&47HkT-y@UuuQaD6g)jZuKW zblrI&=Wh4=E{M4iv@E~t++-f(76qu_Uzi|Jb;|tv$N#yj_HFh&HD}-E4aNZ+0H(e) ATmS$7 diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll index ca3a86c1a2142c50376bb62e8c0438e504d697c0..31c267fb8dea35023373240f26862275084c0455 100644 GIT binary patch delta 107 zcmZpe!PGE=X+j5!NPz#$jXiq`1vH+83$Shb=hH1~EW9`CPsiqnq7XrriyHsmPu|cR zAkgQ$@tLf3qwBhCZu!F9>zyVGv`kTe3U1AV3W8L>{;$k$J?Yk;8*0(>HXmuRVFv)p CQZUc} delta 107 zcmZpe!PGE=X+j6fj73v_Z0y-nC~#)~j8em^j^6WrI{w@GTxQbdh@ucdmX{2FZcpCO z93YTpE?(Sru-<3hHuuni2^V=M3$#p8fC|oug9-vwNB4>RE2)irx+3*@E5qg^EjH`` D^}{n;