Ecosystem Wallets (#59)

Author: 0xFirekeeper

.editorconfig

@@ -47,6 +47,9 @@ dotnet_style_prefer_auto_properties = true:warning
 dotnet_style_prefer_conditional_expression_over_assignment = true:warning
 dotnet_style_prefer_conditional_expression_over_return = true:warning
 
+# Code Quality
+dotnet_code_quality_unused_parameters = all:warning
+
 # Namespace preferences
 csharp_style_namespace_declarations = file_scoped:warning
 

Thirdweb.Console/Program.cs

@@ -1,14 +1,14 @@
 #pragma warning disable IDE0005
 #pragma warning disable IDE0059
 
-using Thirdweb;
-using dotenv.net;
 using System.Diagnostics;
-using Thirdweb.Pay;
-using Newtonsoft.Json;
-using Nethereum.Hex.HexTypes;
 using System.Numerics;
+using dotenv.net;
+using Nethereum.Hex.HexTypes;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Thirdweb;
+using Thirdweb.Pay;
 
 DotEnv.Load();
 
@@ -72,6 +72,40 @@
 
 #endregion
 
+#region Ecosystem Wallet
+
+var ecosystemWallet = await EcosystemWallet.Create(client: client, ecosystemId: "ecosystem.the-bonfire", email: "[email protected]");
+
+if (!await ecosystemWallet.IsConnected())
+{
+    _ = await ecosystemWallet.SendOTP();
+    Console.WriteLine("Enter OTP:");
+    var otp = Console.ReadLine();
+    _ = await ecosystemWallet.LoginWithOtp(otp);
+}
+var ecosystemWalletAddress = await ecosystemWallet.GetAddress();
+Console.WriteLine($"Ecosystem Wallet address: {ecosystemWalletAddress}");
+
+var ecosystemPersonalSignature = await ecosystemWallet.PersonalSign("Hello, Thirdweb!");
+Console.WriteLine($"Ecosystem Wallet personal sign: {ecosystemPersonalSignature}");
+var isValidPersonal = (await ecosystemWallet.RecoverAddressFromPersonalSign("Hello, Thirdweb!", ecosystemPersonalSignature)) == ecosystemWalletAddress;
+Console.WriteLine($"Ecosystem Wallet personal sign valid: {isValidPersonal}");
+
+var ecosystemTypedSignature = await ecosystemWallet.SignTypedDataV4(
+    /*lang=json,strict*/
+    "{\"types\": {\"EIP712Domain\": [{\"name\": \"name\",\"type\": \"string\"},{\"name\": \"version\",\"type\": \"string\"},{\"name\": \"chainId\",\"type\": \"uint256\"},{\"name\": \"verifyingContract\",\"type\": \"address\"}],\"Person\": [{\"name\": \"name\",\"type\": \"string\"},{\"name\": \"wallet\",\"type\": \"address\"}],\"Mail\": [{\"name\": \"from\",\"type\": \"Person\"},{\"name\": \"to\",\"type\": \"Person\"},{\"name\": \"contents\",\"type\": \"string\"}]},\"primaryType\": \"Mail\",\"domain\": {\"name\": \"Ether Mail\",\"version\": \"1\",\"chainId\": 1,\"verifyingContract\": \"0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC\"},\"message\": {\"from\": {\"name\": \"Cow\",\"wallet\": \"0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826\"},\"to\": {\"name\": \"Bob\",\"wallet\": \"0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB\"},\"contents\": \"Hello, Bob!\"}}"
+);
+Console.WriteLine($"Ecosystem Wallet typed sign: {ecosystemTypedSignature}");
+
+// var ecosystemSmartWallet = await SmartWallet.Create(ecosystemWallet, 421614);
+
+// var ecosystemTx = await ThirdwebTransaction.Create(wallet: ecosystemSmartWallet, txInput: new ThirdwebTransactionInput(chainId: 421614, to: await ecosystemWallet.GetAddress()));
+
+// var ecosystemTxHash = await ThirdwebTransaction.Send(ecosystemTx);
+// Console.WriteLine($"Ecosystem Wallet transaction hash: {ecosystemTxHash}");
+
+#endregion
+
 #region Maximum low level zksync tx
 
 // var chainId = 300;

Thirdweb.Tests/Thirdweb.RPC/Thirdweb.RPC.Tests.cs

@@ -1,5 +1,4 @@
 using System.Numerics;
-using System.Reflection;
 
 namespace Thirdweb.Tests.RPC;
 
@@ -34,24 +33,6 @@ public async Task TestTimeout()
         _ = await Assert.ThrowsAsync<TimeoutException>(async () => await rpc.SendRequestAsync<string>("eth_chainId"));
     }
 
-    [Fact(Timeout = 120000)]
-    public async Task TestBatch()
-    {
-        var client = ThirdwebClient.Create(secretKey: this.SecretKey);
-        var rpc = ThirdwebRPC.GetRpcInstance(client, 1);
-        var req = rpc.SendRequestAsync<string>("eth_blockNumber");
-        _ = await rpc.SendRequestAsync<string>("eth_chainId");
-        var blockNumberTasks = new List<Task<string>>();
-        for (var i = 0; i < 100; i++)
-        {
-            blockNumberTasks.Add(rpc.SendRequestAsync<string>("eth_blockNumber"));
-        }
-        var results = await Task.WhenAll(blockNumberTasks);
-        Assert.Equal(100, results.Length);
-        Assert.All(results, result => Assert.StartsWith("0x", result));
-        Assert.All(results, result => Assert.Equal(results[0], result));
-    }
-
     [Fact(Timeout = 120000)]
     public async Task TestDeserialization()
     {
@@ -95,65 +76,8 @@ public async Task TestCache()
         var client = ThirdwebClient.Create(secretKey: this.SecretKey);
         var rpc = ThirdwebRPC.GetRpcInstance(client, 1);
         var blockNumber1 = await rpc.SendRequestAsync<string>("eth_blockNumber");
-        await Task.Delay(100);
+        await ThirdwebTask.Delay(100);
         var blockNumber2 = await rpc.SendRequestAsync<string>("eth_blockNumber");
         Assert.Equal(blockNumber1, blockNumber2);
     }
-
-    [Fact(Timeout = 120000)]
-    public async Task TestBatchSizeLimit()
-    {
-        var client = ThirdwebClient.Create(secretKey: this.SecretKey);
-        var rpc = ThirdwebRPC.GetRpcInstance(client, 1);
-        var blockNumberTasks = new List<Task<string>>();
-        for (var i = 0; i < 101; i++)
-        {
-            blockNumberTasks.Add(rpc.SendRequestAsync<string>("eth_blockNumber"));
-        }
-        var results = await Task.WhenAll(blockNumberTasks);
-        Assert.Equal(101, results.Length);
-        Assert.All(results, result => Assert.StartsWith("0x", result));
-    }
-
-    [Fact(Timeout = 120000)]
-    public void Timer_StartsAndStops()
-    {
-        var timer = new ThirdwebRPCTimer(TimeSpan.FromMilliseconds(100));
-        timer.Start();
-        Assert.True(IsTimerRunning(timer));
-
-        timer.Stop();
-        Assert.False(IsTimerRunning(timer));
-    }
-
-    [Fact(Timeout = 120000)]
-    public async Task Timer_ElapsedEventFires()
-    {
-        var timer = new ThirdwebRPCTimer(TimeSpan.FromMilliseconds(100));
-        var eventFired = false;
-
-        timer.Elapsed += () => eventFired = true;
-        timer.Start();
-
-        await Task.Delay(200); // Wait for the timer to elapse at least once
-        Assert.True(eventFired);
-
-        timer.Stop();
-    }
-
-    [Fact(Timeout = 120000)]
-    public void Timer_DisposeStopsTimer()
-    {
-        var timer = new ThirdwebRPCTimer(TimeSpan.FromMilliseconds(100));
-        timer.Start();
-        timer.Dispose();
-        Assert.False(IsTimerRunning(timer));
-    }
-
-    private static bool IsTimerRunning(ThirdwebRPCTimer timer)
-    {
-        var fieldInfo = typeof(ThirdwebRPCTimer).GetField("_isRunning", BindingFlags.NonPublic | BindingFlags.Instance) ?? throw new InvalidOperationException("The field '_isRunning' was not found.");
-        var value = fieldInfo.GetValue(timer);
-        return value == null ? throw new InvalidOperationException("The field '_isRunning' value is null.") : (bool)value;
-    }
 }

Thirdweb.Tests/Thirdweb.Transactions/Thirdweb.Transactions.Tests.cs

@@ -441,18 +441,6 @@ public async Task WaitForTransactionReceipt_CancellationToken()
         var aaFailedReceipt = await Assert.ThrowsAsync<Exception>(async () => await ThirdwebTransaction.WaitForTransactionReceipt(client, chainId, aaSilentRevertTxHash, cts.Token));
         Assert.StartsWith($"Transaction {aaSilentRevertTxHash} execution silently reverted", aaFailedReceipt.Message);
 
-        var infiniteTxHash = "0x55181384a4b908ddf6311cf0eb55ea0aa2b1ef4d9e0cc047eab9051fec284958";
-        cts = new CancellationTokenSource();
-        cts.CancelAfter(1);
-        var infiniteReceipt = await Assert.ThrowsAsync<Exception>(async () => await ThirdwebTransaction.WaitForTransactionReceipt(client, chainId, infiniteTxHash, cts.Token));
-        Assert.Equal($"Transaction receipt polling for hash {infiniteTxHash} was cancelled.", infiniteReceipt.Message);
-
-        cts = new CancellationTokenSource();
-        var infiniteReceipt2 = Assert.ThrowsAsync<Exception>(() => ThirdwebTransaction.WaitForTransactionReceipt(client, chainId, infiniteTxHash, cts.Token));
-        await Task.Delay(2000);
-        cts.Cancel();
-        Assert.Equal($"Transaction receipt polling for hash {infiniteTxHash} was cancelled.", (await infiniteReceipt2).Message);
-
         var aaReceipt2 = await ThirdwebTransaction.WaitForTransactionReceipt(client, chainId, aaTxHash, CancellationToken.None);
         Assert.NotNull(aaReceipt2);
     }

Thirdweb/Thirdweb.Http/ThirdwebHttpContent.cs

@@ -7,7 +7,7 @@ namespace Thirdweb;
 /// </summary>
 public class ThirdwebHttpContent
 {
-    private readonly byte[] content;
+    private readonly byte[] _content;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ThirdwebHttpContent"/> class from a string.
@@ -21,7 +21,7 @@ public ThirdwebHttpContent(string content)
             throw new ArgumentNullException(nameof(content));
         }
 
-        this.content = Encoding.UTF8.GetBytes(content);
+        this._content = Encoding.UTF8.GetBytes(content);
     }
 
     /// <summary>
@@ -31,7 +31,7 @@ public ThirdwebHttpContent(string content)
     /// <exception cref="ArgumentNullException">Thrown if the content is null.</exception>
     public ThirdwebHttpContent(byte[] content)
     {
-        this.content = content ?? throw new ArgumentNullException(nameof(content));
+        this._content = content ?? throw new ArgumentNullException(nameof(content));
     }
 
     /// <summary>
@@ -48,7 +48,7 @@ public ThirdwebHttpContent(Stream content)
 
         using var memoryStream = new MemoryStream();
         content.CopyTo(memoryStream);
-        this.content = memoryStream.ToArray();
+        this._content = memoryStream.ToArray();
     }
 
     /// <summary>
@@ -57,7 +57,7 @@ public ThirdwebHttpContent(Stream content)
     /// <returns>A task that represents the asynchronous operation. The task result contains the content string.</returns>
     public Task<string> ReadAsStringAsync()
     {
-        return Task.FromResult(Encoding.UTF8.GetString(this.content));
+        return Task.FromResult(Encoding.UTF8.GetString(this._content));
     }
 
     /// <summary>
@@ -66,7 +66,7 @@ public Task<string> ReadAsStringAsync()
     /// <returns>A task that represents the asynchronous operation. The task result contains the content byte array.</returns>
     public Task<byte[]> ReadAsByteArrayAsync()
     {
-        return Task.FromResult(this.content);
+        return Task.FromResult(this._content);
     }
 
     /// <summary>
@@ -75,7 +75,7 @@ public Task<byte[]> ReadAsByteArrayAsync()
     /// <returns>A task that represents the asynchronous operation. The task result contains the content stream.</returns>
     public Task<Stream> ReadAsStreamAsync()
     {
-        var stream = new MemoryStream(this.content);
+        var stream = new MemoryStream(this._content);
         return Task.FromResult<Stream>(stream);
     }
 }

Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs

@@ -10,7 +10,7 @@ namespace Thirdweb;
 public class ThirdwebRPC : IDisposable
 {
     private const int BatchSizeLimit = 100;
-    private readonly TimeSpan _batchInterval = TimeSpan.FromMilliseconds(100);
+    private readonly TimeSpan _batchInterval = TimeSpan.FromMilliseconds(50);
 
     private readonly Uri _rpcUrl;
     private readonly TimeSpan _rpcTimeout;
@@ -21,7 +21,7 @@ public class ThirdwebRPC : IDisposable
     private readonly object _batchLock = new();
     private readonly object _responseLock = new();
     private readonly object _cacheLock = new();
-    private readonly ThirdwebRPCTimer _batchTimer;
+    private readonly CancellationTokenSource _cancellationTokenSource = new();
 
     private int _requestIdCounter = 1;
 
@@ -159,9 +159,7 @@ private ThirdwebRPC(ThirdwebClient client, BigInteger chainId)
         this._httpClient = client.HttpClient;
         this._rpcUrl = new Uri($"https://{chainId}.rpc.thirdweb.com/");
         this._rpcTimeout = TimeSpan.FromMilliseconds(client.FetchTimeoutOptions.GetTimeout(TimeoutType.Rpc));
-        this._batchTimer = new ThirdwebRPCTimer(this._batchInterval);
-        this._batchTimer.Elapsed += this.SendBatchNow;
-        this._batchTimer.Start();
+        _ = this.StartBackgroundFlushAsync();
     }
 
     private void SendBatchNow()
@@ -278,8 +276,18 @@ private static string GetCacheKey(string method, params object[] parameters)
         return keyBuilder.ToString();
     }
 
+    private async Task StartBackgroundFlushAsync()
+    {
+        while (!this._cancellationTokenSource.Token.IsCancellationRequested)
+        {
+            await ThirdwebTask.Delay(this._batchInterval.Milliseconds, this._cancellationTokenSource.Token).ConfigureAwait(false);
+            this.SendBatchNow();
+        }
+    }
+
     public void Dispose()
     {
-        throw new NotImplementedException();
+        this._cancellationTokenSource.Cancel();
+        this._cancellationTokenSource.Dispose();
     }
 }