Move all functionality to IAW level

0xFirekeeper · 0xFirekeeper · commit 3431c6649272 · 2025-05-08T06:13:09.000+07:00
diff --git a/Thirdweb.Console/Program.cs b/Thirdweb.Console/Program.cs
@@ -327,48 +327,48 @@
 
 #region EIP-7702
 
-var chain = 11155111; // sepolia
-
-// Connect to EOA
-var userWallet = await InAppWallet.Create(client, email: "firekeeper+7702testing07@thirdweb.com");
-if (!await userWallet.IsConnected())
-{
-    await userWallet.SendOTP();
-    Console.WriteLine("Enter OTP:");
-    var otp = Console.ReadLine();
-    _ = await userWallet.LoginWithOtp(otp: otp);
-}
-Console.WriteLine($"User Wallet address: {await userWallet.GetAddress()}");
-
-// Console.WriteLine("Send it some gas if testing with ExecutionMode.EOA");
-// Console.ReadLine();
+// var chain = 11155111; // sepolia
 
-// Upgrade EOA - This wallet explicitly uses EIP-7702 delegation to the thirdweb MinimalAccount (will delegate upon first tx)
-var smarterWallet = await SmarterWallet.Create(client: client, chainId: chain, userWallet: userWallet, sponsorGas: true);
-var smarterWalletAddress = await smarterWallet.GetAddress();
-Console.WriteLine($"Thirdweb Wallet address: {smarterWalletAddress}"); // same as userWallet address, unlike when using EIP-4337
-
-// Transact, will upgrade EOA
-var receipt = await smarterWallet.Transfer(chainId: chain, toAddress: await Utils.GetAddressFromENS(client, "vitalik.eth"), weiAmount: 0);
-Console.WriteLine($"Transfer Receipt: {receipt.TransactionHash}");
-
-// Double check that it was upgraded
-var isDelegated = await Utils.IsDelegatedAccount(client, chain, smarterWalletAddress);
-Console.WriteLine($"Is delegated: {isDelegated}");
-
-// Create a session key
-var sessionKeyReceipt = await smarterWallet.CreateSessionKey(
-    new SessionSpec()
-    {
-        Signer = await Utils.GetAddressFromENS(client, "0xfirekeeper.eth"),
-        IsWildcard = true,
-        ExpiresAt = Utils.GetUnixTimeStampNow() + 86400, // 1 day
-        CallPolicies = new List<CallSpec>(),
-        TransferPolicies = new List<TransferSpec>(),
-        Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes()
-    }
-);
-Console.WriteLine($"Session key receipt: {sessionKeyReceipt.TransactionHash}");
+// // Connect to EOA
+// var smartEoa = await InAppWallet.Create(client, authProvider: AuthProvider.Google, executionMode: ExecutionMode.EOA);
+// if (!await smartEoa.IsConnected())
+// {
+//     _ = await smartEoa.LoginWithOauth(
+//         isMobile: false,
+//         (url) =>
+//         {
+//             var psi = new ProcessStartInfo { FileName = url, UseShellExecute = true };
+//             _ = Process.Start(psi);
+//         }
+//     );
+// }
+// var smartEoaAddress = await smartEoa.GetAddress();
+// Console.WriteLine($"User Wallet address: {await smartEoa.GetAddress()}");
+
+// // Upgrade EOA - This wallet explicitly uses EIP-7702 delegation to the thirdweb MinimalAccount (will delegate upon first tx)
+
+// // Transact, will upgrade EOA
+// var receipt = await smartEoa.Transfer(chainId: chain, toAddress: await Utils.GetAddressFromENS(client, "vitalik.eth"), weiAmount: 0);
+// Console.WriteLine($"Transfer Receipt: {receipt.TransactionHash}");
+
+// // Double check that it was upgraded
+// var isDelegated = await Utils.IsDelegatedAccount(client, chain, smartEoaAddress);
+// Console.WriteLine($"Is delegated: {isDelegated}");
+
+// // Create a session key
+// var sessionKeyReceipt = await smartEoa.CreateSessionKey(
+//     chain,
+//     new SessionSpec()
+//     {
+//         Signer = await Utils.GetAddressFromENS(client, "0xfirekeeper.eth"),
+//         IsWildcard = true,
+//         ExpiresAt = Utils.GetUnixTimeStampNow() + 86400, // 1 day
+//         CallPolicies = new List<CallSpec>(),
+//         TransferPolicies = new List<TransferSpec>(),
+//         Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes()
+//     }
+// );
+// Console.WriteLine($"Session key receipt: {sessionKeyReceipt.TransactionHash}");
 
 #endregion
 
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/EcosystemWallet/EcosystemWallet.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/EcosystemWallet/EcosystemWallet.cs
@@ -4,19 +4,28 @@
 using Nethereum.ABI.EIP712;
 using Nethereum.Signer;
 using Nethereum.Signer.EIP712;
+using Nethereum.Util;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Thirdweb.AccountAbstraction;
 using Thirdweb.EWS;
 
 namespace Thirdweb;
 
+public enum ExecutionMode
+{
+    EOA,
+    EIP7702,
+    EIP7702Sponsored
+}
+
 /// <summary>
 /// Enclave based secure cross ecosystem wallet.
 /// </summary>
 public partial class EcosystemWallet : IThirdwebWallet
 {
     public ThirdwebClient Client { get; }
-    public ThirdwebAccountType AccountType => ThirdwebAccountType.PrivateKeyAccount;
+    public ThirdwebAccountType AccountType { get; }
     public virtual string WalletId => "ecosystem";
 
     internal readonly EmbeddedWallet EmbeddedWallet;
@@ -29,6 +38,7 @@ public partial class EcosystemWallet : IThirdwebWallet
     internal readonly string WalletSecret;
 
     internal string Address;
+    internal ExecutionMode ExecutionMode;
 
     private readonly string _ecosystemId;
     private readonly string _ecosystemPartnerId;
@@ -49,7 +59,8 @@ internal EcosystemWallet(
         string authProvider,
         IThirdwebWallet siweSigner,
         string legacyEncryptionKey,
-        string walletSecret
+        string walletSecret,
+        ExecutionMode executionMode
     )
     {
         this.Client = client;
@@ -63,6 +74,9 @@ string walletSecret
         this.AuthProvider = authProvider;
         this.SiweSigner = siweSigner;
         this.WalletSecret = walletSecret;
+        this.ExecutionMode = executionMode;
+        this.AccountType = executionMode == ExecutionMode.EOA ? ThirdwebAccountType.PrivateKeyAccount : ThirdwebAccountType.ExternalAccount;
+        ;
     }
 
     #region Creation
@@ -81,6 +95,7 @@ string walletSecret
     /// <param name="legacyEncryptionKey">The encryption key that is no longer required but was used in the past. Only pass this if you had used custom auth before this was deprecated.</param>
     /// <param name="walletSecret">The wallet secret for Backend authentication.</param>
     /// <param name="twAuthTokenOverride">The auth token to use for the session. This will automatically connect using a raw thirdweb auth token.</param>
+    /// <param name="executionMode">The execution mode for the wallet. EOA represents traditional direct calls, EIP7702 represents upgraded account self sponsored calls, and EIP7702Sponsored represents upgraded account calls with managed/sponsored execution.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the created in-app wallet.</returns>
     /// <exception cref="ArgumentException">Thrown when required parameters are not provided.</exception>
     public static async Task<EcosystemWallet> Create(
@@ -94,7 +109,8 @@ public static async Task<EcosystemWallet> Create(
         IThirdwebWallet siweSigner = null,
         string legacyEncryptionKey = null,
         string walletSecret = null,
-        string twAuthTokenOverride = null
+        string twAuthTokenOverride = null,
+        ExecutionMode executionMode = ExecutionMode.EOA
     )
     {
         if (client == null)
@@ -164,15 +180,41 @@ public static async Task<EcosystemWallet> Create(
         try
         {
             var userAddress = await ResumeEnclaveSession(enclaveHttpClient, embeddedWallet, email, phoneNumber, authproviderStr).ConfigureAwait(false);
-            return new EcosystemWallet(ecosystemId, ecosystemPartnerId, client, embeddedWallet, enclaveHttpClient, email, phoneNumber, authproviderStr, siweSigner, legacyEncryptionKey, walletSecret)
+            return new EcosystemWallet(
+                ecosystemId,
+                ecosystemPartnerId,
+                client,
+                embeddedWallet,
+                enclaveHttpClient,
+                email,
+                phoneNumber,
+                authproviderStr,
+                siweSigner,
+                legacyEncryptionKey,
+                walletSecret,
+                executionMode
+            )
             {
                 Address = userAddress
             };
         }
         catch
         {
             enclaveHttpClient.RemoveHeader("Authorization");
-            return new EcosystemWallet(ecosystemId, ecosystemPartnerId, client, embeddedWallet, enclaveHttpClient, email, phoneNumber, authproviderStr, siweSigner, legacyEncryptionKey, walletSecret)
+            return new EcosystemWallet(
+                ecosystemId,
+                ecosystemPartnerId,
+                client,
+                embeddedWallet,
+                enclaveHttpClient,
+                email,
+                phoneNumber,
+                authproviderStr,
+                siweSigner,
+                legacyEncryptionKey,
+                walletSecret,
+                executionMode
+            )
             {
                 Address = null
             };
@@ -408,6 +450,21 @@ public string GenerateExternalLoginLink(string redirectUrl)
         return $"{redirectUrl}{queryString}";
     }
 
+    public Task<ThirdwebTransactionReceipt> CreateSessionKey(BigInteger chainId, SessionSpec sessionKeyParams)
+    {
+        throw new NotImplementedException("CreateSessionKey via EIP7702 execution modes is not implemented yet, check back in later versions.");
+        // if (this.ExecutionMode is not ExecutionMode.EIP7702 and not ExecutionMode.EIP7702Sponsored)
+        // {
+        //     throw new InvalidOperationException("CreateSessionKey is only supported for EIP7702 and EIP7702Sponsored execution modes.");
+        // }
+
+        // var userWalletAddress = await this.GetAddress();
+        // var sessionKeySig = await EIP712.GenerateSignature_SmartAccount_7702("MinimalAccount", "1", chainId, userWalletAddress, sessionKeyParams, this);
+        // var userContract = await ThirdwebContract.Create(this.Client, userWalletAddress, chainId, Constants.MINIMAL_ACCOUNT_7702_ABI);
+        // var sessionKeyCallData = userContract.CreateCallData("createSessionWithSig", sessionKeyParams, sessionKeySig.HexToBytes());
+        // return await this.ExecuteTransaction(new ThirdwebTransactionInput(chainId: chainId, to: userWalletAddress, value: 0, data: sessionKeyCallData));
+    }
+
     #endregion
 
     #region Account Linking
@@ -1084,14 +1141,86 @@ public Task<bool> IsConnected()
         return Task.FromResult(this.Address != null);
     }
 
-    public Task<string> SendTransaction(ThirdwebTransactionInput transaction)
+    public async Task<string> SendTransaction(ThirdwebTransactionInput transaction)
     {
-        throw new InvalidOperationException("SendTransaction is not supported for Ecosystem Wallets, please use the unified Contract or ThirdwebTransaction APIs.");
+        var userWalletAddress = await this.GetAddress();
+        var userContract = await ThirdwebContract.Create(this.Client, userWalletAddress, transaction.ChainId, Constants.MINIMAL_ACCOUNT_7702_ABI);
+        var needsDelegation = !await Utils.IsDelegatedAccount(this.Client, transaction.ChainId, userWalletAddress);
+        EIP7702Authorization? authorization = needsDelegation
+            ? await this.SignAuthorization(transaction.ChainId, Constants.MINIMAL_ACCOUNT_7702, willSelfExecute: this.ExecutionMode != ExecutionMode.EIP7702Sponsored)
+            : null;
+
+        var calls = new List<Call>
+        {
+            new()
+            {
+                Target = transaction.To,
+                Value = transaction.Value?.Value ?? BigInteger.Zero,
+                Data = transaction.Data.HexToBytes()
+            }
+        };
+
+        switch (this.ExecutionMode)
+        {
+            case ExecutionMode.EOA:
+                throw new NotImplementedException(
+                    "SendTransaction is not supported for Ecosystem Wallets in EOA execution mode, please use the unified Contract or ThirdwebTransaction APIs or change to EIP7702 execution mode."
+                );
+            case ExecutionMode.EIP7702:
+                BigInteger totalValue = 0;
+                foreach (var call in calls)
+                {
+                    totalValue += call.Value;
+                }
+                var finalTx = await userContract.Prepare(wallet: this, method: "execute", weiValue: totalValue, parameters: new object[] { calls });
+                finalTx.Input.AuthorizationList = authorization != null ? new List<EIP7702Authorization>() { authorization.Value } : null;
+                finalTx = await ThirdwebTransaction.Prepare(finalTx);
+                var signedTx = await this.SignTransaction(finalTx.Input);
+                var rpc = ThirdwebRPC.GetRpcInstance(this.Client, transaction.ChainId);
+                return await rpc.SendRequestAsync<string>("eth_sendRawTransaction", signedTx).ConfigureAwait(false);
+            case ExecutionMode.EIP7702Sponsored:
+                var wrappedCalls = new WrappedCalls() { Calls = calls, Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes() };
+                var signature = await EIP712.GenerateSignature_SmartAccount_7702_WrappedCalls("MinimalAccount", "1", transaction.ChainId, userWalletAddress, wrappedCalls, this);
+                var response = await BundlerClient.TwExecute(
+                    client: this.Client,
+                    url: $"https://{transaction.ChainId}.bundler.thirdweb.com",
+                    requestId: 7702,
+                    eoaAddress: userWalletAddress,
+                    wrappedCalls: wrappedCalls,
+                    signature: signature,
+                    authorization: authorization != null && !await Utils.IsDelegatedAccount(this.Client, transaction.ChainId, userWalletAddress) ? authorization : null
+                );
+                var queueId = response?.QueueId;
+                string txHash = null;
+                var ct = new CancellationTokenSource(this.Client.FetchTimeoutOptions.GetTimeout(TimeoutType.Other));
+                try
+                {
+                    while (txHash == null)
+                    {
+                        ct.Token.ThrowIfCancellationRequested();
+
+                        var hashResponse = await BundlerClient
+                            .TwGetTransactionHash(client: this.Client, url: $"https://{transaction.ChainId}.bundler.thirdweb.com", requestId: 7702, queueId)
+                            .ConfigureAwait(false);
+
+                        txHash = hashResponse?.TransactionHash;
+                        await ThirdwebTask.Delay(100, ct.Token).ConfigureAwait(false);
+                    }
+                    return txHash;
+                }
+                catch (OperationCanceledException)
+                {
+                    throw new Exception($"EIP-7702 sponsored transaction timed out with queue id: {queueId}");
+                }
+            default:
+                throw new ArgumentOutOfRangeException(nameof(this.ExecutionMode), "Invalid execution mode.");
+        }
     }
 
-    public Task<ThirdwebTransactionReceipt> ExecuteTransaction(ThirdwebTransactionInput transactionInput)
+    public async Task<ThirdwebTransactionReceipt> ExecuteTransaction(ThirdwebTransactionInput transactionInput)
     {
-        throw new InvalidOperationException("ExecuteTransaction is not supported for Ecosystem Wallets, please use the unified Contract or ThirdwebTransaction APIs.");
+        var hash = await this.SendTransaction(transactionInput);
+        return await Utils.WaitForTransactionReceipt(this.Client, transactionInput.ChainId, hash);
     }
 
     public async Task Disconnect()
diff --git a/Thirdweb/Thirdweb.Wallets/InAppWallet/InAppWallet.cs b/Thirdweb/Thirdweb.Wallets/InAppWallet/InAppWallet.cs
@@ -19,9 +19,10 @@ internal InAppWallet(
         IThirdwebWallet siweSigner,
         string address,
         string legacyEncryptionKey,
-        string walletSecret
+        string walletSecret,
+        ExecutionMode executionMode
     )
-        : base(null, null, client, embeddedWallet, httpClient, email, phoneNumber, authProvider, siweSigner, legacyEncryptionKey, walletSecret)
+        : base(null, null, client, embeddedWallet, httpClient, email, phoneNumber, authProvider, siweSigner, legacyEncryptionKey, walletSecret, executionMode)
     {
         this.Address = address;
     }
@@ -38,6 +39,7 @@ string walletSecret
     /// <param name="legacyEncryptionKey">The encryption key that is no longer required but was used in the past. Only pass this if you had used custom auth before this was deprecated.</param>
     /// <param name="walletSecret">The wallet secret for backend authentication.</param>
     /// <param name="twAuthTokenOverride">The auth token to use for the session. This will automatically connect using a raw thirdweb auth token.</param>
+    /// <param name="executionMode">The execution mode for the wallet. EOA represents traditional direct calls, EIP7702 represents upgraded account self sponsored calls, and EIP7702Sponsored represents upgraded account calls with managed/sponsored execution.</param>
     /// <returns>A task that represents the asynchronous operation. The task result contains the created in-app wallet.</returns>
     /// <exception cref="ArgumentException">Thrown when required parameters are not provided.</exception>
     public static async Task<InAppWallet> Create(
@@ -49,11 +51,12 @@ public static async Task<InAppWallet> Create(
         IThirdwebWallet siweSigner = null,
         string legacyEncryptionKey = null,
         string walletSecret = null,
-        string twAuthTokenOverride = null
+        string twAuthTokenOverride = null,
+        ExecutionMode executionMode = ExecutionMode.EOA
     )
     {
         storageDirectoryPath ??= Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Thirdweb", "InAppWallet");
-        var ecoWallet = await Create(client, null, null, email, phoneNumber, authProvider, storageDirectoryPath, siweSigner, legacyEncryptionKey, walletSecret, twAuthTokenOverride);
+        var ecoWallet = await Create(client, null, null, email, phoneNumber, authProvider, storageDirectoryPath, siweSigner, legacyEncryptionKey, walletSecret, twAuthTokenOverride, executionMode);
         return new InAppWallet(
             ecoWallet.Client,
             ecoWallet.EmbeddedWallet,
@@ -64,7 +67,8 @@ public static async Task<InAppWallet> Create(
             ecoWallet.SiweSigner,
             ecoWallet.Address,
             ecoWallet.LegacyEncryptionKey,
-            ecoWallet.WalletSecret
+            ecoWallet.WalletSecret,
+            ecoWallet.ExecutionMode
         );
     }
 }
diff --git a/Thirdweb/Thirdweb.Wallets/SmarterWallet.cs b/Thirdweb/Thirdweb.Wallets/SmarterWallet.cs
