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

MetaMask error pop up. #1023

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 5 commits into from
Jun 19, 2024
Merged

MetaMask error pop up. #1023

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
955a0b4
metamask logout fix
sneakzttv Jun 18, 2024
130d27d
fixed
sneakzttv Jun 19, 2024
daa8df3
fixes
sneakzttv Jun 19, 2024
8b92e3f
small fixes
rob1997 Jun 19, 2024
3f9d0dc
reverted MetaMaskLoginProvider
rob1997 Jun 19, 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
28 changes: 22 additions & 6 deletions src/ChainSafe.Gaming.MetaMask.Unity/MetaMaskController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ public class MetaMaskController : MonoBehaviour
{
private bool isInitialized;

private TaskCompletionSource<string> connectionTcs;

/// Use this instead of <see cref="Debug"/>.
private ILogWriter logger;

Expand Down Expand Up @@ -56,7 +58,14 @@ public void Initialize(ILogWriter logWriter)
/// <returns>Connected account address.</returns>
public Task<string> Connect()
{
var taskCompletionSource = new TaskCompletionSource<string>();
if (connectionTcs != null && !connectionTcs.Task.IsCompleted)
{
connectionTcs.SetException(new Web3Exception("Metamask connection not completed."));

return connectionTcs.Task;
}

connectionTcs = new TaskCompletionSource<string>();

// Unsubscribe in case we're already subscribed from a previous login.
OnAccountConnected -= Connected;
Expand All @@ -68,9 +77,9 @@ void Connected(string address)
{
ConnectedAddress = address;

if (!taskCompletionSource.TrySetResult(ConnectedAddress))
if (!connectionTcs.TrySetResult(ConnectedAddress))
{
taskCompletionSource.SetException(new Web3Exception("Error setting connected account address."));
connectionTcs.SetException(new Web3Exception("Error setting connected account address."));
}
else
{
Expand All @@ -85,15 +94,15 @@ void Connected(string address)
}
else
{
logger.LogError("Metamask is not available, please install it first.");
connectionTcs.SetException(new Web3Exception("Metamask is not available, please install it first."));

// Unsubscribe to event.
OnAccountConnected -= Connected;

return null;
}

return taskCompletionSource.Task;
return connectionTcs.Task;
}

/// <summary>
Expand Down Expand Up @@ -194,7 +203,14 @@ public void ChainSelected(string chainId)
// Callback for displaying an error if operation fails.
private void DisplayError(string message)
{
logger.LogError(message);
if (connectionTcs != null && !connectionTcs.Task.IsCompleted)
{
connectionTcs.SetException(new Web3Exception(message));
}
else
{
logger.LogError(message);
}
}
}
}