Account Abstraction

thirdweb-dev · Apr 3, 2024 · 5642841 · 5642841
1 parent 1afe66d
commit 5642841
Show file tree

Hide file tree

Showing 40 changed files with 1,149 additions and 580 deletions.
diff --git a/Thirdweb.Console/Program.cs b/Thirdweb.Console/Program.cs
diff --git a/Thirdweb.Tests/ClientTests.cs b/Thirdweb.Tests/ClientTests.cs
@@ -94,7 +94,7 @@ public void NoTimeoutOptions()
     {
         var client = new ThirdwebClient(new ThirdwebClientOptions(secretKey: _secretKey));
         Assert.NotNull(client.FetchTimeoutOptions);
-        Assert.Equal(Constants.DefaultFetchTimeout, client.FetchTimeoutOptions.GetTimeout(TimeoutType.Storage));
-        Assert.Equal(Constants.DefaultFetchTimeout, client.FetchTimeoutOptions.GetTimeout(TimeoutType.Rpc));
+        Assert.Equal(Constants.DEFAULT_FETCH_TIMEOUT, client.FetchTimeoutOptions.GetTimeout(TimeoutType.Storage));
+        Assert.Equal(Constants.DEFAULT_FETCH_TIMEOUT, client.FetchTimeoutOptions.GetTimeout(TimeoutType.Rpc));
     }
 }
diff --git a/Thirdweb/Thirdweb.Client/ITimeoutOptions.cs b/Thirdweb/Thirdweb.Client/ITimeoutOptions.cs
@@ -2,6 +2,6 @@
 {
     public interface ITimeoutOptions
     {
-        int GetTimeout(TimeoutType type, int fallback = Constants.DefaultFetchTimeout);
+        int GetTimeout(TimeoutType type, int fallback = Constants.DEFAULT_FETCH_TIMEOUT);
     }
 }
diff --git a/Thirdweb/Thirdweb.Client/TimeoutOptions.cs b/Thirdweb/Thirdweb.Client/TimeoutOptions.cs
@@ -13,7 +13,7 @@ public TimeoutOptions(int? storage = null, int? rpc = null, int? other = null)
             Other = other;
         }
 
-        public int GetTimeout(TimeoutType type, int fallback = Constants.DefaultFetchTimeout)
+        public int GetTimeout(TimeoutType type, int fallback = Constants.DEFAULT_FETCH_TIMEOUT)
         {
             return type switch
             {

diff --git a/Thirdweb/Thirdweb.Contracts/ThirdwebContract.cs b/Thirdweb/Thirdweb.Contracts/ThirdwebContract.cs
@@ -11,24 +11,32 @@ public class ThirdwebContract
         internal BigInteger Chain { get; private set; }
         internal string Abi { get; private set; }
 
-        public ThirdwebContract(ThirdwebContractOptions options)
+        public ThirdwebContract(ThirdwebClient client, string address, BigInteger chain, string abi)
         {
-            if (options.Client == null)
+            if (client == null)
+            {
                 throw new ArgumentException("Client must be provided");
+            }
 
-            if (string.IsNullOrEmpty(options.Address))
+            if (string.IsNullOrEmpty(address))
+            {
                 throw new ArgumentException("Address must be provided");
+            }
 
-            if (options.Chain == 0)
+            if (chain == 0)
+            {
                 throw new ArgumentException("Chain must be provided");
+            }
 
-            if (string.IsNullOrEmpty(options.Abi))
+            if (string.IsNullOrEmpty(abi))
+            {
                 throw new ArgumentException("Abi must be provided");
+            }
 
-            Client = options.Client;
-            Address = options.Address;
-            Chain = options.Chain;
-            Abi = options.Abi;
+            Client = client;
+            Address = address;
+            Chain = chain;
+            Abi = abi;
         }
 
         public static async Task<T> ReadContract<T>(ThirdwebContract contract, string method, params object[] parameters)
@@ -43,7 +51,7 @@ public static async Task<T> ReadContract<T>(ThirdwebContract contract, string me
             return function.DecodeTypeOutput<T>(resultData);
         }
 
-        public static async Task<string> WriteContract(ThirdwebAccount account, ThirdwebContract contract, string method, params object[] parameters)
+        public static async Task<string> WriteContract(ThirdwebWallet wallet, ThirdwebContract contract, string method, BigInteger weiValue, params object[] parameters)
         {
             var rpc = ThirdwebRPC.GetRpcInstance(contract.Client, contract.Chain);
 
@@ -53,26 +61,32 @@ public static async Task<string> WriteContract(ThirdwebAccount account, Thirdweb
 
             var transaction = new TransactionInput
             {
-                From = account.GetAddress(),
+                From = await wallet.GetAddress(),
                 To = contract.Address,
                 Data = data,
             };
 
             // TODO: Implement 1559
             transaction.Gas = new HexBigInteger(await rpc.SendRequestAsync<string>("eth_estimateGas", transaction));
             transaction.GasPrice = new HexBigInteger(await rpc.SendRequestAsync<string>("eth_gasPrice"));
-            transaction.Nonce = new HexBigInteger(await rpc.SendRequestAsync<string>("eth_getTransactionCount", account.GetAddress(), "latest"));
+            transaction.Value = new HexBigInteger(weiValue);
 
             string hash;
-            if (account.Options.Type == WalletType.PrivateKey || account.Options.Type == WalletType.Embedded)
+            if (wallet.ActiveAccount.AccountType is ThirdwebAccountType.PrivateKeyAccount)
             {
-                var signedTx = account.SignTransaction(transaction, contract.Chain);
+                transaction.Nonce = new HexBigInteger(await rpc.SendRequestAsync<string>("eth_getTransactionCount", wallet.GetAddress(), "latest"));
+                var signedTx = wallet.SignTransaction(transaction, contract.Chain);
                 Console.WriteLine($"Signed transaction: {signedTx}");
                 hash = await rpc.SendRequestAsync<string>("eth_sendRawTransaction", signedTx);
             }
+            else if (wallet.ActiveAccount.AccountType is ThirdwebAccountType.SmartAccount)
+            {
+                var smartAccount = wallet.ActiveAccount as SmartAccount;
+                hash = await smartAccount.SendTransaction(transaction);
+            }
             else
             {
-                hash = await rpc.SendRequestAsync<string>("eth_sendTransaction", transaction);
+                throw new NotImplementedException("Account type not supported");
             }
             return hash;
         }

diff --git a/Thirdweb/Thirdweb.Contracts/ThirdwebContractOptions.cs b/Thirdweb/Thirdweb.Contracts/ThirdwebContractOptions.cs
diff --git a/Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs b/Thirdweb/Thirdweb.RPC/ThirdwebRPC.cs
@@ -80,7 +80,7 @@ static ThirdwebRPC()
             _httpClient.DefaultRequestHeaders.Add("x-sdk-name", "Thirdweb.NET");
             _httpClient.DefaultRequestHeaders.Add("x-sdk-os", System.Runtime.InteropServices.RuntimeInformation.OSDescription);
             _httpClient.DefaultRequestHeaders.Add("x-sdk-platform", "dotnet");
-            _httpClient.DefaultRequestHeaders.Add("x-sdk-version", Constants.Version);
+            _httpClient.DefaultRequestHeaders.Add("x-sdk-version", Constants.VERSION);
         }
 
         private ThirdwebRPC(ThirdwebClient client, BigInteger chainId)

diff --git a/Thirdweb/Thirdweb.Utils/Constants.cs b/Thirdweb/Thirdweb.Utils/Constants.cs
@@ -2,7 +2,11 @@
 {
     public static class Constants
     {
-        internal const string Version = "0.0.1";
-        internal const int DefaultFetchTimeout = 60000;
+        internal const string VERSION = "0.0.1";
+        internal const int DEFAULT_FETCH_TIMEOUT = 60000;
+        internal const string DEFAULT_ENTRYPOINT_ADDRESS = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"; // v0.6
+        internal const string DUMMY_SIG = "0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c";
+        internal const string DUMMY_PAYMASTER_AND_DATA_HEX =
+            "0x0101010101010101010101010101010101010101000000000000000000000000000000000000000000000000000001010101010100000000000000000000000000000000000000000000000000000000000000000101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101";
     }
 }
diff --git a/Thirdweb/Thirdweb.Utils/Utils.cs b/Thirdweb/Thirdweb.Utils/Utils.cs
@@ -11,5 +11,17 @@ public static string ComputeClientIdFromSecretKey(string secretKey)
             var hash = sha256.ComputeHash(Encoding.UTF8.GetBytes(secretKey));
             return BitConverter.ToString(hash).Replace("-", "").ToLower().Substring(0, 32);
         }
+
+        public static string HexConcat(params string[] hexStrings)
+        {
+            var hex = new StringBuilder("0x");
+
+            foreach (var hexStr in hexStrings)
+            {
+                _ = hex.Append(hexStr[2..]);
+            }
+
+            return hex.ToString();
+        }
     }
 }