Skip to content

Commit

Permalink
update webgl
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhichao Link committed Sep 11, 2024
1 parent 72b39c4 commit 7ca1a48
Show file tree
Hide file tree
Showing 18 changed files with 211 additions and 247 deletions.
2 changes: 1 addition & 1 deletion Assembly-CSharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@
<Compile Include="Assets/ParticleNetwork/Share/Utils/HexTool.cs" />
<Compile Include="Assets/TextMesh Pro/Examples &amp; Extras/Scripts/VertexShakeB.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Modules/AA/ParticleAAInteraction.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Demo/Connect/Items/WalletTypeItem.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Modules/Core/Model/LoginListSupportType.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Demo/Connect/Items/WalletTypeItem.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Modules/AuthCore/ParticleAuthCoreInteraction.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Model/TestConfig.cs" />
<Compile Include="Assets/ParticleNetwork/Mobile/Demo/UnityRPCDemo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions Assets/ParticleNetwork/Mobile/Demo/ParticleNetworkSDKDemo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Network.Particle.Scripts.Core;
using Network.Particle.Scripts.Model;
using Network.Particle.Scripts.Test;
using Newtonsoft.Json.Linq;
using UnityEngine;

public class ParticleNetworkSDKDemo : MonoBehaviour
Expand All @@ -29,5 +30,4 @@ private void Init()
// control how to show set master password and payment password.
// ParticleNetwork.SetSecurityAccountConfig(new SecurityAccountConfig(0, 0));
}

}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -152,4 +152,19 @@ public LoginConfig(string preferredAuthType, string account, bool? hideLoading,
this.socialLoginPrompt = socialLoginPrompt;
this.authorization = authorization;
}
}

public class ErrorException : Exception
{
public int Code { get; }

public ErrorException(int code, string message) : base(message)
{
Code = code;
}

public ErrorException(int code, string message, Exception innerException) : base(message, innerException)
{
Code = code;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Network.Particle.Scripts.Model;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Plugins.WebGL.ParticleAuthWebGL.Share;


public class ParticleAuth : MonoBehaviour
Expand Down Expand Up @@ -81,13 +80,13 @@ public class ParticleAuth : MonoBehaviour
private static extern void ParticleSolanaSignAndSendTransaction(string transaction);

[DllImport("__Internal")]
private static extern void ParticleSolanasSignMessage(string message);
private static extern void ParticleSolanaSignMessage(string message);

[DllImport("__Internal")]
private static extern void ParticleSolanasSignTransaction(string transaction);
private static extern void ParticleSolanaSignTransaction(string transaction);

[DllImport("__Internal")]
private static extern void ParticleSolanasSignAllTransactions(string[] transaction);
private static extern void ParticleSolanaSignAllTransactions(string json);


public static ParticleAuth Instance;
Expand All @@ -102,9 +101,9 @@ public class ParticleAuth : MonoBehaviour
private TaskCompletionSource<string> evmSignTypedDataTask;
private TaskCompletionSource<string> evmSignTypedDataUniqTask;
private TaskCompletionSource<string> solanaSignAndSendTransactionTask;
private TaskCompletionSource<string> solanasSignMessageTask;
private TaskCompletionSource<string> solanasSignTransactionTask;
private TaskCompletionSource<List<string>> solanasSignAllTransactionsTask;
private TaskCompletionSource<string> solanaSignMessageTask;
private TaskCompletionSource<string> solanaSignTransactionTask;
private TaskCompletionSource<List<string>> solanaSignAllTransactionsTask;


void Awake()
Expand Down Expand Up @@ -137,9 +136,9 @@ public void InitWithJsonString(string json)
var chainName = (string)JObject.Parse(json)["chainName"];
var chainId = (long)JObject.Parse(json)["chainId"];
var chainInfo = ChainInfo.GetChain(chainId, chainName);
var projectId = (string)JObject.Parse(json)["projectId"];
var clientKey = (string)JObject.Parse(json)["clientKey"];
var appId = (string)JObject.Parse(json)["appId"];
var projectId = (string)JObject.Parse(json)["projectId"];
var clientKey = (string)JObject.Parse(json)["clientKey"];
var appId = (string)JObject.Parse(json)["appId"];
SetInnerConfig(projectId, clientKey, appId, chainInfo);
InitParticleAuth(json);
}
Expand All @@ -150,6 +149,7 @@ private void SetInnerConfig(string projectId, string clientKey, string appId, Ch
{
throw new ErrorException(0, "Init config is wrong");
}

ParticleUnityRpc.projectId = projectId;
ParticleUnityRpc.appId = appId;
ParticleUnityRpc.clientKey = clientKey;
Expand Down Expand Up @@ -406,40 +406,41 @@ public void OnSolanaSignAndSendTransaction(string json)
HandleSignResult(json, solanaSignAndSendTransactionTask);
}

public Task<string> SolanasSignMessage(string transaction)
public Task<string> SolanaSignMessage(string transaction)
{
solanasSignMessageTask = new TaskCompletionSource<string>();
ParticleSolanasSignMessage(transaction);
return solanasSignMessageTask.Task;
solanaSignMessageTask = new TaskCompletionSource<string>();
ParticleSolanaSignMessage(transaction);
return solanaSignMessageTask.Task;
}

public void OnSolanasSignMessage(string json)
public void OnSolanaSignMessage(string json)
{
HandleSignResult(json, solanasSignMessageTask);
HandleSignResult(json, solanaSignMessageTask);
}

public Task<string> SolanasSignTransaction(string transaction)
public Task<string> SolanaSignTransaction(string transaction)
{
solanasSignTransactionTask = new TaskCompletionSource<string>();
ParticleSolanasSignTransaction(transaction);
return solanasSignTransactionTask.Task;
solanaSignTransactionTask = new TaskCompletionSource<string>();
ParticleSolanaSignTransaction(transaction);
return solanaSignTransactionTask.Task;
}

public void OnSolanasSignTransaction(string json)
public void OnSolanaSignTransaction(string json)
{
HandleSignResult(json, solanasSignTransactionTask);
HandleSignResult(json, solanaSignTransactionTask);
}

public Task<List<string>> SolanasSignAllTransactions(string[] transactions)
public Task<List<string>> SolanaSignAllTransactions(string[] transactions)
{
solanasSignAllTransactionsTask = new TaskCompletionSource<List<string>>();
ParticleSolanasSignAllTransactions(transactions);
return solanasSignAllTransactionsTask.Task;
solanaSignAllTransactionsTask = new TaskCompletionSource<List<string>>();
var json = JsonConvert.SerializeObject(transactions);
ParticleSolanaSignAllTransactions(json);
return solanaSignAllTransactionsTask.Task;
}

public void OnSolanasSignAllTransactions(string json)
public void OnSolanaSignAllTransactions(string json)
{
HandleSignResult(json, solanasSignAllTransactionsTask);
HandleSignResult(json, solanaSignAllTransactionsTask);
}

private void HandleSignResult<T>(string json, TaskCompletionSource<T> task)
Expand Down
Loading

0 comments on commit 7ca1a48

Please sign in to comment.