这是indexloc提供的服务，不要输入任何密码
Skip to content

unity RPC Client issue fix #996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 3, 2024
Merged

unity RPC Client issue fix #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
765a7ac
fix for main thread issue
rob1997 Jun 3, 2024
d61d5ca
circular dependency fix by moving IMainThreadRunner to ChainSafe.Gaming
rob1997 Jun 3, 2024
8329a71
referenced IMainThreadRunner in Web3AuthWallet
rob1997 Jun 3, 2024
4573ee4
client now initialized
rob1997 Jun 3, 2024
f961b28
Reverting back to rpcclient
kantagara Jun 3, 2024
38f9947
Merge branch 'dev' into rob/unity-rpc-client-fix
kantagara Jun 3, 2024
b92110f
Merge branch 'dev' into rob/unity-rpc-client-fix
kantagara Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Packages/io.chainsafe.web3-unity.web3auth/Runtime/Web3AuthWallet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using ChainSafe.Gaming.Web3.Analytics;
using ChainSafe.Gaming.Web3.Core;
using ChainSafe.Gaming.Web3.Core.Evm;
using ChainSafe.Gaming.Web3.Environment;
using Nethereum.Signer;
using UnityEngine;
using TWeb3Auth = Web3Auth;
Expand All @@ -25,6 +26,7 @@ public class Web3AuthWallet : ISigner, ITransactionExecutor, ILifecycleParticipa
private TWeb3Auth coreInstance;
private InProcessSigner signer;
private InProcessTransactionExecutor transactionExecutor;
private IMainThreadRunner mainThreadRunner;
private readonly IAnalyticsClient analyticsClient;

/// <summary>
Expand All @@ -33,10 +35,11 @@ public class Web3AuthWallet : ISigner, ITransactionExecutor, ILifecycleParticipa
/// <param name="config">The configuration for the Web3Auth wallet.</param>
/// <param name="chainConfig">The configuration for the target blockchain.</param>
/// <param name="rpcProvider">The RPC provider for blockchain interaction.</param>
public Web3AuthWallet(Web3AuthWalletConfig config, IRpcProvider rpcProvider, IAnalyticsClient analyticsClient)
public Web3AuthWallet(Web3AuthWalletConfig config, IRpcProvider rpcProvider, IMainThreadRunner mainThreadRunner, IAnalyticsClient analyticsClient)
{
this.config = config;
this.rpcProvider = rpcProvider;
this.mainThreadRunner = mainThreadRunner;
this.analyticsClient = analyticsClient;
}

Expand Down Expand Up @@ -69,7 +72,7 @@ public async ValueTask WillStartAsync()
var signerConfig = new InProcessSignerConfig { PrivateKey = privateKey };
signer = new InProcessSigner(signerConfig);

transactionExecutor = new InProcessTransactionExecutor(signer, analyticsClient.ChainConfig, rpcProvider, new RpcClientWrapper(analyticsClient.ChainConfig));
transactionExecutor = new InProcessTransactionExecutor(signer, analyticsClient.ChainConfig, rpcProvider, mainThreadRunner, new RpcClientWrapper(analyticsClient.ChainConfig));

void Web3Auth_OnLogin(Web3AuthResponse response)
{
Expand Down
3 changes: 1 addition & 2 deletions ...ocessTransactionExecutor.Unity/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@
<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" />
<ProjectReference Include="../ChainSafe.Gaming.InProcessTransactionExecutor/ChainSafe.Gaming.InProcessTransactionExecutor.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions src/ChainSafe.Gaming.InProcessTransactionExecutor.Unity/RpcClientWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
using System;
using System.Net.Http;
using ChainSafe.Gaming.Web3;
using ChainSafe.Gaming.Web3.Environment;
using Nethereum.JsonRpc.Client;
using Nethereum.Unity.Rpc;

namespace ChainSafe.Gaming.InProcessTransactionExecutor.Unity
{
public class RpcClientWrapper : IRpcClientWrapper
{
private readonly IChainConfig chainConfig;

public RpcClientWrapper(IChainConfig chainConfig)
{
Client = new UnityWebRequestRpcTaskClient(new Uri(chainConfig.Rpc));
this.chainConfig = chainConfig;
}

public IClient Client { get; private set; }
public IClient Client => new RpcClient(new Uri(chainConfig.Rpc));
}
}
1 change: 0 additions & 1 deletion ....Gaming.InProcessTransactionExecutor/ChainSafe.Gaming.InProcessTransactionExecutor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<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</RootNamespace>
Expand Down
36 changes: 22 additions & 14 deletions src/ChainSafe.Gaming.InProcessTransactionExecutor/InProcessTransactionExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using ChainSafe.Gaming.Evm.Transactions;
using ChainSafe.Gaming.Web3;
using ChainSafe.Gaming.Web3.Core.Evm;
using ChainSafe.Gaming.Web3.Environment;
using Nethereum.Hex.HexTypes;
using Nethereum.RPC.Eth.DTOs;
using Nethereum.Web3.Accounts;
Expand All @@ -18,19 +19,21 @@ namespace ChainSafe.Gaming.InProcessTransactionExecutor
/// </summary>
public class InProcessTransactionExecutor : ITransactionExecutor
{
private readonly NWeb3 web3;
private readonly IRpcProvider rpcProvider;
private readonly string accountAddress;

private NWeb3 web3;

/// <summary>
/// Initializes a new instance of the <see cref="InProcessTransactionExecutor"/> class.
/// </summary>
/// <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="mainThreadRunner">Injected <see cref="IMainThreadRunner"/>.</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, IRpcClientWrapper rpcClientWrapper)
public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IRpcProvider rpcProvider, IMainThreadRunner mainThreadRunner, 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
Expand All @@ -39,19 +42,24 @@ public InProcessTransactionExecutor(ISigner signer, IChainConfig chainConfig, IR
throw new Web3Exception($"{nameof(InProcessTransactionExecutor)} only supports {nameof(InProcessSigner.InProcessSigner)}");
accountAddress = privateKey.GetPublicAddress();
var account = new Account(privateKey);
if (chainConfig.Rpc is not null && !string.Empty.Equals(chainConfig.Rpc))
{
web3 = new NWeb3(account, rpcClientWrapper.Client);
}
else if (chainConfig.Ipc is not null && !string.Empty.Equals(chainConfig.Ipc))
{
var client = new NIpcClient(chainConfig.Rpc);
web3 = new NWeb3(client);
}
else

// Initialize Web3 on the main thread.
mainThreadRunner.Enqueue(() =>
{
throw new Web3Exception($"{nameof(IChainConfig)} should have at least one communication method set.");
}
if (chainConfig.Rpc is not null && !string.Empty.Equals(chainConfig.Rpc))
{
web3 = new NWeb3(account, rpcClientWrapper.Client);
}
else if (chainConfig.Ipc is not null && !string.Empty.Equals(chainConfig.Ipc))
{
var client = new NIpcClient(chainConfig.Rpc);
web3 = new NWeb3(client);
}
else
{
throw new Web3Exception($"{nameof(IChainConfig)} should have at least one communication method set.");
}
});

this.rpcProvider = rpcProvider;
}
Expand Down
1 change: 1 addition & 0 deletions src/ChainSafe.Gaming.Unity/UnityDispatcherAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Threading.Tasks;
using ChainSafe.Gaming.Evm.Unity;
using ChainSafe.Gaming.Web3.Environment;

namespace ChainSafe.Gaming.Unity
{
Expand Down
2 changes: 1 addition & 1 deletion ...ainSafe.Gaming.Unity/IMainThreadRunner.cs → ...eb3/Core/Environment/IMainThreadRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;

namespace ChainSafe.Gaming.Unity
namespace ChainSafe.Gaming.Web3.Environment
{
public interface IMainThreadRunner
{
Expand Down