ChainSafe · robGG1997 · Dec 11, 2023 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
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/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs b/Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs
@@ -4,6 +4,7 @@
 using ChainSafe.Gaming.Evm.Transactions;
 using ChainSafe.Gaming.InProcessSigner;
 using ChainSafe.Gaming.InProcessTransactionExecutor;
+using ChainSafe.Gaming.InProcessTransactionExecutor.Unity;
 using ChainSafe.Gaming.Web3;
 using ChainSafe.Gaming.Web3.Core;
 using ChainSafe.Gaming.Web3.Core.Evm;
@@ -57,7 +58,7 @@ public async ValueTask WillStartAsync()
             var signerConfig = new InProcessSignerConfig { PrivateKey = privateKey };
             signer = new InProcessSigner(signerConfig);
 
-            transactionExecutor = new InProcessTransactionExecutor(signer, chainConfig, rpcProvider);
+            transactionExecutor = new InProcessTransactionExecutor(signer, chainConfig, rpcProvider, new RpcClientWrapper(chainConfig));
 
             void Web3Auth_OnLogin(Web3AuthResponse response)
             {

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/...web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll.meta b/...web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll.meta
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/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.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/...ocessTransactionExecutor.Unity/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.csproj b/...ocessTransactionExecutor.Unity/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <LangVersion>9.0</LangVersion>
+        <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+        <EnableNETAnalyzers>True</EnableNETAnalyzers>
+        <CodeAnalysisRuleSet>../../global.ruleset</CodeAnalysisRuleSet>
+        <Nullable>enable</Nullable>
+        <Configurations>Debug;Release;Test</Configurations>
+        <Platforms>AnyCPU</Platforms>
+        <RootNamespace>ChainSafe.Gaming.InProcessTransactionExecutor.Unity</RootNamespace>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\ChainSafe.Gaming.InProcessTransactionExecutor\ChainSafe.Gaming.InProcessTransactionExecutor.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Reference Include="../../libs/Nethereum-UnityAOT/Nethereum.Unity.dll" />
+    </ItemGroup>
+
+</Project>
diff --git a/...InProcessTransactionExecutorExtensions.cs → ...InProcessTransactionExecutorExtensions.cs b/...InProcessTransactionExecutorExtensions.cs → ...InProcessTransactionExecutorExtensions.cs
@@ -1,8 +1,8 @@
-using ChainSafe.Gaming.Web3.Build;
+using ChainSafe.Gaming.Web3.Build;
 using ChainSafe.Gaming.Web3.Core.Evm;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace ChainSafe.Gaming.InProcessTransactionExecutor
+namespace ChainSafe.Gaming.InProcessTransactionExecutor.Unity
 {
     /// <summary>
     /// Extension methods for <see cref="InProcessTransactionExecutor"/>.
@@ -14,11 +14,14 @@ public static class InProcessTransactionExecutorExtensions
         /// </summary>
         /// <param name="collection">Service collection to bind implementations to.</param>
         /// <returns>The same service collection that was passed in. This enables fluent style.</returns>
-        public static IWeb3ServiceCollection UseInProcessSigner(this IWeb3ServiceCollection collection)
+        public static IWeb3ServiceCollection UseInProcessTransactionExecutor(this IWeb3ServiceCollection collection)
         {
             collection.AssertServiceNotBound<ITransactionExecutor>();
             collection.AddSingleton<ITransactionExecutor, InProcessTransactionExecutor>();
+
+            collection.AssertServiceNotBound<IRpcClientWrapper>();
+            collection.AddSingleton<IRpcClientWrapper, RpcClientWrapper>();
             return collection;
         }
     }
-}
+}
diff --git a/src/ChainSafe.Gaming.InProcessTransactionExecutor.Unity/RpcClientWrapper.cs b/src/ChainSafe.Gaming.InProcessTransactionExecutor.Unity/RpcClientWrapper.cs
@@ -0,0 +1,17 @@
+using System;
+using ChainSafe.Gaming.Web3;
+using Nethereum.JsonRpc.Client;
+using Nethereum.Unity.Rpc;
+
+namespace ChainSafe.Gaming.InProcessTransactionExecutor.Unity
+{
+    public class RpcClientWrapper : IRpcClientWrapper
+    {
+        public RpcClientWrapper(IChainConfig chainConfig)
+        {
+            Client = new UnityWebRequestRpcTaskClient(new Uri(chainConfig.Rpc));
+        }
+
+        public IClient Client { get; private set; }
+    }
+}
diff --git a/src/ChainSafe.Gaming.InProcessTransactionExecutor/IRpcClientWrapper.cs b/src/ChainSafe.Gaming.InProcessTransactionExecutor/IRpcClientWrapper.cs
@@ -0,0 +1,9 @@
+using Nethereum.JsonRpc.Client;
+
+namespace ChainSafe.Gaming.InProcessTransactionExecutor
+{
+    public interface IRpcClientWrapper
+    {
+        public IClient Client { get; }
+    }
+}
diff --git a/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs b/src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs
@@ -28,8 +28,9 @@ public class InProcessTransactionExecutor : ITransactionExecutor
         /// <param name="signer">Injected <see cref="ISigner"/>.</param>
         /// <param name="chainConfig">Injected <see cref="IChainConfig"/>.</param>
         /// <param name="rpcProvider">Injected <see cref="IRpcProvider"/>.</param>
+        /// <param name="rpcClientWrapper">Injected <see cref="IRpcClientWrapper"/>.</param>
         /// <exception cref="Web3Exception">Throws exception if initializing instance fails.</exception>
-        public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IRpcProvider rpcProvider)
+        public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IRpcProvider rpcProvider, IRpcClientWrapper rpcClientWrapper)
         {
             // It should be possible to set up other signers to work with this as well.
             // However, does it make sense to let a remote wallet sign a transaction, but
@@ -40,7 +41,7 @@ public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IR
             var account = new Account(privateKey);
             if (chainConfig.Rpc is not null && !string.Empty.Equals(chainConfig.Rpc))
             {
-                web3 = new NWeb3(account, chainConfig.Rpc);
+                web3 = new NWeb3(account, rpcClientWrapper.Client);
             }
             else if (chainConfig.Ipc is not null && !string.Empty.Equals(chainConfig.Ipc))
             {

diff --git a/src/ChainSafe.Gaming.Unity/ChainSafe.Gaming.Unity.csproj b/src/ChainSafe.Gaming.Unity/ChainSafe.Gaming.Unity.csproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\ChainSafe.Gaming.Debugging\ChainSafe.Gaming.Debugging.csproj" />
     <ProjectReference Include="..\ChainSafe.Gaming\ChainSafe.Gaming.csproj" />
     <ProjectReference Include="..\ChainSafe.Gaming.InProcessSigner\ChainSafe.Gaming.InProcessSigner.csproj" />
-    <ProjectReference Include="..\ChainSafe.Gaming.InProcessTransactionExecutor\ChainSafe.Gaming.InProcessTransactionExecutor.csproj" />
+    <ProjectReference Include="..\ChainSafe.Gaming.InProcessTransactionExecutor.Unity\ChainSafe.Gaming.InProcessTransactionExecutor.Unity.csproj" />
     <ProjectReference Include="..\ChainSafe.Gaming.WalletConnect\ChainSafe.Gaming.WalletConnect.csproj" />
     <ProjectReference Include="..\ChainSafe.Gaming.MetaMask.Unity\ChainSafe.Gaming.MetaMask.Unity.csproj" />
     <ProjectReference Include="..\ChainSafe.Gaming.Unity.ThirdParty\ChainSafe.Gaming.Unity.ThirdParty.csproj" />