ChainSafe · sneakzttv · Apr 29, 2024 · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/Modules.md b/Modules.md
@@ -36,7 +36,7 @@ public static IWeb3ServiceCollection UseJsonRpcProvider(this IWeb3ServiceCollect
     serviceCollection.AssertServiceNotBound<IEvmProvider>();
 
     // register Service with IEvmProvider as a Contract Type
-    // and JsonRpcProvider as Implmentation Type
+    // and JsonRpcProvider as Implementation Type
     serviceCollection.AddSingleton<IEvmProvider, JsonRpcProvider>();
     return serviceCollection;
 }

diff --git a/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll
diff --git a/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll
diff --git a/...s/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/SecurePlayerPrefs.cs b/...s/io.chainsafe.web3-unity.web3auth/Runtime/Plugins/Web3AuthSDK/Types/SecurePlayerPrefs.cs
@@ -40,7 +40,7 @@ public class SecurePlayerPrefs
 
 
     /**
-	 * Initializes the encryptor. If its the frist time, it will generate
+	 * Initializes the encryptor. If its the first time, it will generate
 	 * a random 3 digit number and puts it between private key and its appendix.
 	 * If this was initialized on this device before, it will load it and create
 	 * the private key.

diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll
diff --git a/...safe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll b/...safe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll
diff --git a/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll
diff --git a/...ibraries/ChainSafe.Gaming.Marketplace.dll → ...ibraries/ChainSafe.Gaming.Marketplace.dll b/...ibraries/ChainSafe.Gaming.Marketplace.dll → ...ibraries/ChainSafe.Gaming.Marketplace.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll.meta b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll.meta
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll
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
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
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Token/Evm.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Token/Evm.cs
@@ -131,7 +131,7 @@ public static async Task<bool> SignVerify(Web3 web3, string message)
             var msgHash = new Sha3Keccack().CalculateHash(Encoding.UTF8.GetBytes(msg));
             var signature = MessageSigner.ExtractEcdsaSignature(signatureString);
             var key = EthECKey.RecoverFromSignature(signature, msgHash);
-            return key.GetPublicAddress() == playerAccount;
+            return key.GetPublicAddress().ToLower() == playerAccount.ToLower();
         }
 
         public static string EcdsaSignTransaction(string _privateKey, string _transaction, string _chainId)

diff --git a/scripts/data/published_dependencies.txt b/scripts/data/published_dependencies.txt
@@ -1,2 +1,2 @@
-Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;ChainSafe.Gaming.SygmaClient;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity
-Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink;ChainSafe.Gaming.Marketplace
+Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;ChainSafe.Gaming.SygmaClient;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity;ChainSafe.Gaming.Marketplace
+Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink
diff --git a/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs b/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProvider.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.Gaming.Web3.Analytics;
+using ChainSafe.Gaming.Web3.Core.Logout;
 using ChainSafe.Gaming.Web3.Environment;
 using UnityEngine;
 using Object = UnityEngine.Object;
@@ -10,7 +11,7 @@ namespace ChainSafe.Gaming.MetaMask.Unity
     /// <summary>
     /// Concrete implementation of <see cref="IMetaMaskProvider"/>.
     /// </summary>
-    public class MetaMaskProvider : IMetaMaskProvider
+    public class MetaMaskProvider : IMetaMaskProvider, ILogoutHandler
     {
         private readonly ILogWriter logWriter;
 
@@ -86,5 +87,12 @@ public async Task<T> Request<T>(string method, params object[] parameters)
         {
             return await metaMaskController.Request<T>(method, parameters);
         }
+
+        public Task OnLogout()
+        {
+            Object.Destroy(metaMaskController.gameObject);
+
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProviderExtensions.cs b/src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskProviderExtensions.cs
@@ -1,4 +1,5 @@
 using ChainSafe.Gaming.Web3.Build;
+using ChainSafe.Gaming.Web3.Core.Logout;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace ChainSafe.Gaming.MetaMask.Unity
@@ -18,7 +19,7 @@ public static IWeb3ServiceCollection UseMetaMask(this IWeb3ServiceCollection col
             collection.AssertServiceNotBound<IMetaMaskProvider>();
 
             // wallet
-            collection.AddSingleton<IMetaMaskProvider, MetaMaskProvider>();
+            collection.AddSingleton<ILogoutHandler, IMetaMaskProvider, MetaMaskProvider>();
 
             return collection;
         }

diff --git a/src/ChainSafe.Gaming.WalletConnect/WalletConnectTransactionExecutor.cs b/src/ChainSafe.Gaming.WalletConnect/WalletConnectTransactionExecutor.cs
@@ -54,8 +54,6 @@ public async Task<TransactionResponse> SendTransaction(TransactionRequest transa
 
             WCLogger.Log($"Transaction executed successfully. Hash: {hash}.");
 
-            await Task.Delay(TimeSpan.FromSeconds(1)); // hack: rpcProvider.GetTransaction can't find transaction by hash
-
             return await rpcProvider.GetTransaction(hash);
 
             bool ValidateResponseHash(string hash)

diff --git a/src/ChainSafe.Gaming/Web3/Core/DelayUtil.cs b/src/ChainSafe.Gaming/Web3/Core/DelayUtil.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Threading.Tasks;
+
+namespace ChainSafe.Gaming.Web3.Core
+{
+    /// <summary>
+    /// Utility class for delay operations.
+    /// </summary>
+    public static class DelayUtil
+    {
+        /// <summary>
+        /// Replicates Task.Delay behaviour. Works on a single-threaded platforms like Unity WebGL.
+        /// </summary>
+        /// <param name="delay">The time to wait.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        public static async Task SafeDelay(TimeSpan delay) // TODO: use default method if platform supports multithreading
+        {
+            var start = DateTime.UtcNow;
+
+            while (DateTime.UtcNow - start < delay)
+            {
+                await Task.Yield();
+            }
+        }
+    }
+}
diff --git a/src/ChainSafe.Gaming/Web3/Core/Evm/RpcProviderExtensions.cs b/src/ChainSafe.Gaming/Web3/Core/Evm/RpcProviderExtensions.cs
@@ -1,10 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.Numerics;
-using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using ChainSafe.Gaming.Evm.Transactions;
 using ChainSafe.Gaming.Web3;
+using ChainSafe.Gaming.Web3.Core;
 using Nethereum.Hex.HexConvertors.Extensions;
 using Nethereum.Hex.HexTypes;
 using Nethereum.RPC.Eth.DTOs;
@@ -289,38 +288,53 @@ public static async Task<HexBigInteger> EstimateGas(this IRpcProvider provider,
         /// </summary>
         /// <param name="provider">The RPC provider.</param>
         /// <param name="transactionHash">The hash of the transaction to retrieve.</param>
+        /// <param name="timeOut">(Optional) The time after which the method will fail if we can't find the transaction by hash. 15 seconds by default.</param>
         /// <returns>
         /// A <see cref="Task"/> representing the asynchronous operation.
         /// The task result contains the transaction details as a <see cref="TransactionResponse"/>.
         /// </returns>
-        public static async Task<TransactionResponse> GetTransaction(this IRpcProvider provider, string transactionHash)
+        public static async Task<TransactionResponse> GetTransaction(this IRpcProvider provider, string transactionHash, TimeSpan? timeOut = null)
         {
+            timeOut ??= TimeSpan.FromSeconds(15);
+
+            // Poll transaction till it's available on the given node
+            TransactionResponse transaction = null;
             var parameters = new object[] { transactionHash };
+            var pollStartTime = DateTime.UtcNow;
+            while (DateTime.UtcNow - pollStartTime < timeOut)
+            {
+                transaction = await provider.Perform<TransactionResponse>("eth_getTransactionByHash", parameters);
 
-            var result = await provider.Perform<TransactionResponse>("eth_getTransactionByHash", parameters);
+                if (transaction != null)
+                {
+                    break;
+                }
 
-            if (result == null)
+                await DelayUtil.SafeDelay(TimeSpan.FromSeconds(1));
+            }
+
+            if (transaction == null)
             {
-                throw new Web3Exception("transaction not found");
+                throw new Web3Exception("Transaction not found.");
             }
 
-            if (result.BlockNumber == null)
+            if (transaction.BlockNumber == null)
             {
-                result.Confirmations = 0;
+                transaction.Confirmations = 0;
             }
-            else if (result.Confirmations == null)
+            else if (transaction.Confirmations == null)
             {
                 var blockNumber = await provider.GetBlockNumber();
-                var confirmations = (blockNumber.ToUlong() - result.BlockNumber.ToUlong()) + 1;
+                var confirmations = (blockNumber.ToUlong() - transaction.BlockNumber.ToUlong()) + 1;
                 if (confirmations <= 0)
                 {
                     confirmations = 1;
                 }
 
-                result.Confirmations = confirmations;
+                transaction.Confirmations = confirmations;
             }
 
-            return result;
+            return transaction;
         }
 
         /// <summary>