Migrate all paths to bundler v2 (#81)

0xFirekeeper · web-flow · commit 2726e5c70a0c · 2024-10-02T20:54:25.000+03:00
diff --git a/Thirdweb.Console/Program.cs b/Thirdweb.Console/Program.cs
@@ -37,7 +37,13 @@
 
 #region AA 0.6
 
-// var smartWallet06 = await SmartWallet.Create(personalWallet: privateKeyWallet, chainId: 421614, gasless: true, entryPoint: Constants.ENTRYPOINT_ADDRESS_V06);
+// var smartWallet06 = await SmartWallet.Create(
+//     personalWallet: privateKeyWallet,
+//     chainId: 421614,
+//     gasless: true,
+//     factoryAddress: "0xa8deE7854fb1eA8c13b713585C81d91ea86dAD84",
+//     entryPoint: Constants.ENTRYPOINT_ADDRESS_V06
+// );
 
 // var receipt06 = await smartWallet06.ExecuteTransaction(new ThirdwebTransactionInput(chainId: 421614, to: await smartWallet06.GetAddress(), value: 0, data: "0x"));
 
@@ -47,7 +53,13 @@
 
 #region AA 0.7
 
-// var smartWallet07 = await SmartWallet.Create(personalWallet: privateKeyWallet, chainId: 421614, gasless: true, entryPoint: Constants.ENTRYPOINT_ADDRESS_V07);
+// var smartWallet07 = await SmartWallet.Create(
+//     personalWallet: privateKeyWallet,
+//     chainId: 421614,
+//     gasless: true,
+//     factoryAddress: "0x4f4e40E8F66e3Cc0FD7423E2fbd62A769ff551FB",
+//     entryPoint: Constants.ENTRYPOINT_ADDRESS_V07
+// );
 
 // var receipt07 = await smartWallet07.ExecuteTransaction(new ThirdwebTransactionInput(chainId: 421614, to: await smartWallet07.GetAddress(), value: 0, data: "0x"));
 
@@ -273,11 +285,7 @@
 // var erc20SmartWalletAddress = await erc20SmartWallet.GetAddress();
 // Console.WriteLine($"ERC20 Smart Wallet address: {erc20SmartWalletAddress}");
 
-// var selfTransfer = await ThirdwebTransaction.Create(
-//     wallet: erc20SmartWallet,
-//     txInput: new ThirdwebTransactionInput() { To = erc20SmartWalletAddress, },
-//     chainId: 8453
-// );
+// var selfTransfer = await ThirdwebTransaction.Create(wallet: erc20SmartWallet, txInput: new ThirdwebTransactionInput(chainId: 8453, to: erc20SmartWalletAddress, value: 0, data: "0x"));
 
 // var estimateGas = await ThirdwebTransaction.EstimateGasCosts(selfTransfer);
 // Console.WriteLine($"Self transfer gas estimate: {estimateGas.Ether}");
diff --git a/Thirdweb/Thirdweb.Wallets/SmartWallet/SmartWallet.cs b/Thirdweb/Thirdweb.Wallets/SmartWallet/SmartWallet.cs
@@ -66,7 +66,7 @@ private struct TokenPaymasterConfig
                 new TokenPaymasterConfig()
                 {
                     ChainId = 8453,
-                    PaymasterAddress = "0x0c6199eE133EB4ff8a6bbD03370336C5A5d9D536",
+                    PaymasterAddress = "0xff4d12b1f8d276aa4a9e8cc80539e806791bfe28",
                     TokenAddress = "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
                     BalanceStorageSlot = 9
                 }
@@ -125,8 +125,8 @@ public static async Task<SmartWallet> Create(
 
         var entryPointVersion = Utils.GetEntryPointVersion(entryPoint);
 
-        bundlerUrl ??= entryPointVersion == 6 ? $"https://{chainId}.bundler.thirdweb.com" : $"https://{chainId}.bundler.thirdweb.com/v2";
-        paymasterUrl ??= entryPointVersion == 6 ? $"https://{chainId}.bundler.thirdweb.com" : $"https://{chainId}.bundler.thirdweb.com/v2";
+        bundlerUrl ??= $"https://{chainId}.bundler.thirdweb.com/v2";
+        paymasterUrl ??= $"https://{chainId}.bundler.thirdweb.com/v2";
         factoryAddress ??= entryPointVersion == 6 ? Constants.DEFAULT_FACTORY_ADDRESS_V06 : Constants.DEFAULT_FACTORY_ADDRESS_V07;
 
         ThirdwebContract entryPointContract = null;
@@ -160,9 +160,6 @@ public static async Task<SmartWallet> Create(
             {
                 throw new InvalidOperationException("Token paymaster chain ID does not match the smart account chain ID.");
             }
-
-            // TODO: Re-enable token paymasters
-            throw new InvalidOperationException("Token paymasters are currently disabled.");
         }
 
         return new SmartWallet(
@@ -199,9 +196,8 @@ public async Task SwitchNetwork(BigInteger chainId)
 
         this._chainId = chainId;
 
-        var entryPointVersion = Utils.GetEntryPointVersion(this._entryPointContract?.Address);
-        this._bundlerUrl = entryPointVersion == 6 ? $"https://{chainId}.bundler.thirdweb.com" : $"https://{chainId}.bundler.thirdweb.com/v2";
-        this._paymasterUrl = entryPointVersion == 6 ? $"https://{chainId}.bundler.thirdweb.com" : $"https://{chainId}.bundler.thirdweb.com/v2";
+        this._bundlerUrl = this._bundlerUrl.Contains(".thirdweb.com") ? $"https://{chainId}.bundler.thirdweb.com/v2" : this._bundlerUrl;
+        this._paymasterUrl = this._paymasterUrl.Contains(".thirdweb.com") ? $"https://{chainId}.bundler.thirdweb.com/v2" : this._paymasterUrl;
         if (!Utils.IsZkSync(chainId))
         {
             this._entryPointContract = await ThirdwebContract.Create(this.Client, this._entryPointContract.Address, chainId, this._entryPointContract.Abi).ConfigureAwait(false);
@@ -314,6 +310,7 @@ private async Task<object> SignUserOp(ThirdwebTransactionInput transactionInput,
                     _ = await tokenContract.ERC20_Approve(this, this._erc20PaymasterAddress, BigInteger.Pow(2, 96) - 1).ConfigureAwait(false);
                 }
                 this._isApproved = true;
+                await ThirdwebTask.Delay(1000).ConfigureAwait(false);
                 (initCode, factory, factoryData) = await this.GetInitCode().ConfigureAwait(false);
             }
             catch (Exception e)
@@ -370,7 +367,7 @@ private async Task<object> SignUserOp(ThirdwebTransactionInput transactionInput,
                 Nonce = await this.GetNonce().ConfigureAwait(false),
                 InitCode = initCode,
                 CallData = executeInput.Data.HexToBytes(),
-                CallGasLimit = 0,
+                CallGasLimit = transactionInput.Gas == null ? 0 : 21000 + transactionInput.Gas.Value,
                 VerificationGasLimit = 0,
                 PreVerificationGas = 0,
                 MaxFeePerGas = maxFee,
@@ -379,20 +376,24 @@ private async Task<object> SignUserOp(ThirdwebTransactionInput transactionInput,
                 Signature = Constants.DUMMY_SIG.HexToBytes(),
             };
 
-            // Update paymaster data if any
-
-            partialUserOp.PaymasterAndData = (await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false)).PaymasterAndData.HexToBytes();
+            // Update paymaster data and gas
 
-            // Estimate gas
+            var pmSponsorResult = await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false);
+            partialUserOp.PaymasterAndData = pmSponsorResult.PaymasterAndData.HexToBytes();
 
-            var gasEstimates = await BundlerClient.EthEstimateUserOperationGas(this.Client, this._bundlerUrl, requestId, EncodeUserOperation(partialUserOp), this._entryPointContract.Address);
-            partialUserOp.CallGasLimit = Math.Max((long)(50000 + new HexBigInteger(gasEstimates.CallGasLimit).Value), (long?)transactionInput.Gas?.Value ?? 0);
-            partialUserOp.VerificationGasLimit = new HexBigInteger(gasEstimates.VerificationGasLimit).Value;
-            partialUserOp.PreVerificationGas = new HexBigInteger(gasEstimates.PreVerificationGas).Value;
-
-            // Update paymaster data if any
-
-            partialUserOp.PaymasterAndData = (await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false)).PaymasterAndData.HexToBytes();
+            if (pmSponsorResult.VerificationGasLimit == null || pmSponsorResult.PreVerificationGas == null)
+            {
+                var gasEstimates = await BundlerClient.EthEstimateUserOperationGas(this.Client, this._bundlerUrl, requestId, EncodeUserOperation(partialUserOp), this._entryPointContract.Address);
+                partialUserOp.CallGasLimit = new HexBigInteger(gasEstimates.CallGasLimit).Value;
+                partialUserOp.VerificationGasLimit = new HexBigInteger(gasEstimates.VerificationGasLimit).Value;
+                partialUserOp.PreVerificationGas = new HexBigInteger(gasEstimates.PreVerificationGas).Value;
+            }
+            else
+            {
+                partialUserOp.CallGasLimit = new HexBigInteger(pmSponsorResult.CallGasLimit).Value;
+                partialUserOp.VerificationGasLimit = new HexBigInteger(pmSponsorResult.VerificationGasLimit).Value;
+                partialUserOp.PreVerificationGas = new HexBigInteger(pmSponsorResult.PreVerificationGas).Value;
+            }
 
             // Hash, sign and encode the user operation
 
@@ -435,6 +436,12 @@ private async Task<object> SignUserOp(ThirdwebTransactionInput transactionInput,
 
             // Update Paymaster Data / Estimate gas
 
+            var pmSponsorResult = await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false);
+            partialUserOp.Paymaster = pmSponsorResult.Paymaster;
+            partialUserOp.PaymasterData = pmSponsorResult.PaymasterData?.HexToBytes() ?? Array.Empty<byte>();
+
+            Dictionary<string, object> stateDict = null;
+
             if (this.UseERC20Paymaster && !this._isApproving)
             {
                 var abiEncoder = new ABIEncode();
@@ -444,31 +451,28 @@ private async Task<object> SignUserOp(ThirdwebTransactionInput transactionInput,
                 {
                     { new Sha3Keccack().CalculateHash(slotBytes).BytesToHex().ToString(), desiredBalance.ToHexBigInteger().HexValue.HexToBytes32().BytesToHex() }
                 };
-                var stateDict = new Dictionary<string, object> { { this._erc20PaymasterToken, new { stateDiff = storageDict } } };
-                var res = await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false);
-                partialUserOp.Paymaster = res.Paymaster;
-                partialUserOp.PaymasterData = res.PaymasterData.HexToBytes();
+                stateDict = new Dictionary<string, object> { { this._erc20PaymasterToken, new { stateDiff = storageDict } } };
+            }
+            else
+            {
+                partialUserOp.PreVerificationGas = new HexBigInteger(pmSponsorResult.PreVerificationGas ?? "0x0").Value;
+                partialUserOp.VerificationGasLimit = new HexBigInteger(pmSponsorResult.VerificationGasLimit ?? "0x0").Value;
+                partialUserOp.CallGasLimit = new HexBigInteger(pmSponsorResult.CallGasLimit ?? "0x0").Value;
+                partialUserOp.PaymasterVerificationGasLimit = new HexBigInteger(pmSponsorResult.PaymasterVerificationGasLimit ?? "0x0").Value;
+                partialUserOp.PaymasterPostOpGasLimit = new HexBigInteger(pmSponsorResult.PaymasterPostOpGasLimit ?? "0x0").Value;
+            }
 
+            if (partialUserOp.PreVerificationGas == 0 || partialUserOp.VerificationGasLimit == 0)
+            {
                 var gasEstimates = await BundlerClient
                     .EthEstimateUserOperationGas(this.Client, this._bundlerUrl, requestId, EncodeUserOperation(partialUserOp), this._entryPointContract.Address, stateDict)
                     .ConfigureAwait(false);
-                partialUserOp.CallGasLimit = 21000 + new HexBigInteger(gasEstimates.CallGasLimit).Value;
+                partialUserOp.CallGasLimit = new HexBigInteger(gasEstimates.CallGasLimit).Value;
                 partialUserOp.VerificationGasLimit = new HexBigInteger(gasEstimates.VerificationGasLimit).Value;
                 partialUserOp.PreVerificationGas = new HexBigInteger(gasEstimates.PreVerificationGas).Value;
                 partialUserOp.PaymasterVerificationGasLimit = new HexBigInteger(gasEstimates.PaymasterVerificationGasLimit).Value;
                 partialUserOp.PaymasterPostOpGasLimit = new HexBigInteger(gasEstimates.PaymasterPostOpGasLimit).Value;
             }
-            else
-            {
-                var res = await this.GetPaymasterAndData(requestId, EncodeUserOperation(partialUserOp), simulation).ConfigureAwait(false);
-                partialUserOp.Paymaster = res.Paymaster;
-                partialUserOp.PaymasterData = res.PaymasterData?.HexToBytes() ?? Array.Empty<byte>();
-                partialUserOp.PreVerificationGas = new HexBigInteger(res.PreVerificationGas ?? "0x0").Value;
-                partialUserOp.VerificationGasLimit = new HexBigInteger(res.VerificationGasLimit ?? "0x0").Value;
-                partialUserOp.CallGasLimit = new HexBigInteger(res.CallGasLimit ?? "0x0").Value;
-                partialUserOp.PaymasterVerificationGasLimit = new HexBigInteger(res.PaymasterVerificationGasLimit ?? "0x0").Value;
-                partialUserOp.PaymasterPostOpGasLimit = new HexBigInteger(res.PaymasterPostOpGasLimit ?? "0x0").Value;
-            }
 
             // Hash, sign and encode the user operation
 
diff --git a/Thirdweb/Thirdweb.Wallets/SmartWallet/Thirdweb.AccountAbstraction/BundlerClient.cs b/Thirdweb/Thirdweb.Wallets/SmartWallet/Thirdweb.AccountAbstraction/BundlerClient.cs
@@ -42,23 +42,8 @@ public static async Task<ThirdwebGetUserOperationGasPriceResponse> ThirdwebGetUs
 
     public static async Task<PMSponsorOperationResponse> PMSponsorUserOperation(ThirdwebClient client, string paymasterUrl, object requestId, object userOp, string entryPoint)
     {
-        var response = await BundlerRequest(
-                client,
-                paymasterUrl,
-                requestId,
-                "pm_sponsorUserOperation",
-                userOp,
-                entryPoint == Constants.ENTRYPOINT_ADDRESS_V06 ? new EntryPointWrapper() { EntryPoint = entryPoint } : entryPoint
-            )
-            .ConfigureAwait(false);
-        try
-        {
-            return JsonConvert.DeserializeObject<PMSponsorOperationResponse>(response.Result.ToString());
-        }
-        catch
-        {
-            return new PMSponsorOperationResponse() { PaymasterAndData = response.Result.ToString() };
-        }
+        var response = await BundlerRequest(client, paymasterUrl, requestId, "pm_sponsorUserOperation", userOp, entryPoint).ConfigureAwait(false);
+        return JsonConvert.DeserializeObject<PMSponsorOperationResponse>(response.Result.ToString());
     }
 
     public static async Task<ZkPaymasterDataResponse> ZkPaymasterData(ThirdwebClient client, string paymasterUrl, object requestId, ThirdwebTransactionInput txInput)
