feat: estimate_user_operation_gas

jackpooleyml · jackpooleyml · commit 7683a7d2fb12 · 2025-10-02T12:37:08.000+02:00
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/account/modular_smart_account/send.rs
@@ -1,18 +1,20 @@
-use crate::erc4337::account::modular_smart_account::signature::stub_signature;
-use crate::erc4337::user_operation::UserOperationV08;
 use crate::erc4337::{
-    account::erc7579::{account::Execution, calls::encode_calls},
+    account::{
+        erc7579::{account::Execution, calls::encode_calls},
+        modular_smart_account::signature::stub_signature,
+    },
     bundler::pimlico::client::BundlerClient,
+    entry_point::EntryPoint,
+    user_operation::hash::v08::get_user_operation_hash_entry_point,
 };
-use alloy::providers::ProviderBuilder;
-use alloy::rpc::types::erc4337::PackedUserOperation as AlloyPackedUserOperation;
-use alloy::{primitives::Address, providers::Provider};
 use alloy::{
-    primitives::Bytes, rpc::types::erc4337::SendUserOperation,
-    signers::local::PrivateKeySigner,
+    primitives::{Address, Bytes},
+    providers::Provider,
+    rpc::types::erc4337::{
+        PackedUserOperation as AlloyPackedUserOperation, SendUserOperation,
+    },
 };
 use alloy_provider::ext::Erc4337Api;
-use std::str::FromStr;
 
 pub async fn send_transaction<P: Provider + Send + Sync + Clone>(
     account: Address,
@@ -33,7 +35,7 @@ pub async fn send_transaction<P: Provider + Send + Sync + Clone>(
     //     }
     // };
 
-    let estimated_gas = {
+    let (estimated_gas, mut user_op) = {
         let alloy_user_op = {
             let stub_sig = stub_signature(eoa_validator)?;
             AlloyPackedUserOperation {
@@ -54,26 +56,26 @@ pub async fn send_transaction<P: Provider + Send + Sync + Clone>(
                 signature: stub_sig,
             }
         };
-        let send_user_op = SendUserOperation::EntryPointV07(alloy_user_op);
-        let bundler_provider = {
-            let rpc_url = "http://localhost:4337".parse().unwrap();
-
-            let signer_private_key = "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d";
-            let signer = PrivateKeySigner::from_str(&signer_private_key)?;
-            let alloy_signer = signer.clone();
-            let ethereum_wallet =
-                alloy::network::EthereumWallet::new(alloy_signer.clone());
-
-            let provider = ProviderBuilder::new()
-                .wallet(ethereum_wallet.clone())
-                .connect_http(rpc_url);
-
-            provider
-        };
-
-        bundler_provider
-            .estimate_user_operation_gas(send_user_op, entry_point)
-            .await?
+        let send_user_op =
+            SendUserOperation::EntryPointV07(alloy_user_op.clone());
+        // let bundler_provider = {
+        //     let rpc_url = "http://localhost:4337".parse().unwrap();
+
+        //     let signer_private_key = "0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d";
+        //     let signer = PrivateKeySigner::from_str(&signer_private_key)?;
+        //     let alloy_signer = signer.clone();
+        //     let ethereum_wallet =
+        //         alloy::network::EthereumWallet::new(alloy_signer.clone());
+
+        //     let provider = ProviderBuilder::new()
+        //         .wallet(ethereum_wallet.clone())
+        //         .connect_http(rpc_url);
+
+        //     provider
+        // };
+        // bundler_provider
+        //     .estimate_user_operation_gas(send_user_op, entry_point)
+        //     .await?
         // Error: deserialization error: missing field `verificationGas` at line 1 column 158
         // {
         //     "preVerificationGas":"0xbf1a",
@@ -82,14 +84,39 @@ pub async fn send_transaction<P: Provider + Send + Sync + Clone>(
         //     "paymasterVerificationGasLimit":"0x0",
         //     "paymasterPostOpGasLimit":"0x0"
         // }
-
         // Caused by:
         //     missing field `verificationGas` at line 1 column 158
+
+        let estimated_gas = bundler_client
+            .estimate_user_operation_gas(&alloy_user_op, &entry_point)
+            .await?;
+
+        (estimated_gas, alloy_user_op)
     };
 
-    dbg!(estimated_gas);
+    user_op.call_gas_limit = estimated_gas.callGasLimit;
+    user_op.verification_gas_limit = estimated_gas.verificationGasLimit;
+    user_op.pre_verification_gas = estimated_gas.preVerificationGas;
+
+    // let packed_user_op = EntryPoint::PackedUserOperation {
+    //     sender: user_op.sender,
+    //     nonce: user_op.nonce,
+    //     initCode: user_op.initCode,
+    //     callData: user_op.callData,
+    //     callGasLimit: user_op.callGasLimit,
+    //     verificationGasLimit: user_op.verificationGasLimit,
+    //     preVerificationGas: user_op.preVerificationGas,
+    //     maxFeePerGas: user_op.maxFeePerGas,
+    //     maxPriorityFeePerGas: user_op.maxPriorityFeePerGas,
+    //     paymasterAndData: user_op.paymasterAndData,
+    //     signature: user_op.signature,
+    // };
+
+    // let hash =
+    //     get_user_operation_hash_entry_point(&user_op, &entry_point, provider)
+    //         .await?;
 
-    // bundler_client.estimate_user_operation_gas_price()
+    // dbg!(estimated_gas);
 
     // let tx = provider.send_transaction(account, encoded_calls).await?;
 
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico.rs
@@ -1,2 +1,3 @@
 pub mod client;
+pub mod estimate;
 pub mod gas_price;
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico/client.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico/client.rs
@@ -1,6 +1,14 @@
 use super::gas_price::GasPrice;
-use crate::erc4337::bundler::config::BundlerConfig;
+use crate::{
+    erc4337::bundler::{config::BundlerConfig, pimlico::estimate::Estimate},
+    jsonrpc::{JSONRPCResponse, Request, Response},
+};
+use alloy::{
+    primitives::Address,
+    rpc::types::erc4337::PackedUserOperation as AlloyPackedUserOperation,
+};
 use eyre::Ok;
+use serde_json;
 
 pub struct BundlerClient {
     client: reqwest::Client,
@@ -19,9 +27,6 @@ impl BundlerClient {
 
         let bundler_url = self.config.url().clone();
 
-        use crate::jsonrpc::{JSONRPCResponse, Request, Response};
-        use serde_json;
-
         let req_body = Request {
             jsonrpc: "2.0".into(),
             id: 1,
@@ -50,22 +55,26 @@ impl BundlerClient {
 
         Ok(response_estimate)
     }
-    
-    pub async fn todo(
+
+    pub async fn estimate_user_operation_gas(
         &self,
-    ) -> eyre::Result<GasPrice> {
-        println!("estimate_user_operation_gas_price");
+        user_operation: &AlloyPackedUserOperation,
+        entry_point: &Address,
+    ) -> eyre::Result<Estimate> {
+        println!("eth_estimateUserOperationGas");
 
         let bundler_url = self.config.url().clone();
 
-        use crate::jsonrpc::{JSONRPCResponse, Request, Response};
-        use serde_json;
+        let params = vec![
+            serde_json::to_value(user_operation)?,
+            entry_point.to_string().into(),
+        ];
 
         let req_body = Request {
             jsonrpc: "2.0".into(),
             id: 1,
-            method: "pimlico_getUserOperationGasPrice".into(),
-            params: [] as [(); 0],
+            method: "eth_estimateUserOperationGas".into(),
+            params,
         };
         println!("req_body: {:?}", serde_json::to_string(&req_body)?);
 
@@ -75,14 +84,14 @@ impl BundlerClient {
             .json(&req_body)
             .send()
             .await?;
-        println!("pimlico_getUserOperationGasPrice post: {:?}", post);
+        println!("eth_estimateUserOperationGas post: {:?}", post);
         let res = post.text().await?;
-        println!("pimlico_getUserOperationGasPrice res: {:?}", res);
-        let v = serde_json::from_str::<JSONRPCResponse<GasPrice>>(&res)?;
+        println!("eth_estimateUserOperationGas res: {:?}", res);
+        let v = serde_json::from_str::<JSONRPCResponse<Estimate>>(&res)?;
 
-        println!("pimlico_getUserOperationGasPrice json: {:?}", v);
+        println!("eth_estimateUserOperationGas json: {:?}", v);
 
-        let response: Response<GasPrice> = v.into();
+        let response: Response<Estimate> = v.into();
 
         let response_estimate = response?;
         let response_estimate = response_estimate.unwrap();
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico/estimate.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/bundler/pimlico/estimate.rs
@@ -0,0 +1,24 @@
+// {
+//   "jsonrpc": "2.0",
+//   "id": 1,
+//   "result": {
+//     "preVerificationGas": "0xd3e3",
+//     "verificationGasLimit": "0x60b01",
+//     "callGasLimit": "0x13880",
+//     "paymasterVerificationGasLimit": "0x0",
+//     "paymasterPostOpGasLimit": "0x0"
+//   }
+// }
+
+use alloy::primitives::U256;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Estimate {
+    pub preVerificationGas: U256,
+    pub verificationGasLimit: U256,
+    pub callGasLimit: U256,
+    pub paymasterVerificationGasLimit: U256,
+    pub paymasterPostOpGasLimit: U256,
+}
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/user_operation.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/user_operation.rs
@@ -1,6 +1,5 @@
 use crate::erc4337::entry_point::PackedUserOperation;
 use alloy::primitives::{Address, Bytes, FixedBytes, U256};
-use alloy::rpc::types::erc4337::PackedUserOperation as AlloyPackedUserOperation;
 use serde::{Deserialize, Serialize};
 
 pub mod alloy_helpers;
diff --git a/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/user_operation/hash/v08.rs b/packages/sdk-platforms/rust/zksync-sso-erc4337/crates/zksync-sso-erc4337-core/src/erc4337/user_operation/hash/v08.rs
@@ -1,4 +1,5 @@
 use crate::erc4337::{
+    entry_point::EntryPoint,
     entry_point::PackedUserOperation,
     user_operation::hash::{
         user_operation_hash::UserOperationHash, v08::pack::CodeReader,
@@ -55,6 +56,16 @@ impl PackedUserOperationWrapper {
     }
 }
 
+pub async fn get_user_operation_hash_entry_point<P: Provider + Clone>(
+    user_operation: &PackedUserOperation,
+    entry_point: &Address,
+    provider: P,
+) -> eyre::Result<UserOperationHash> {
+    let entry_point = EntryPoint::new(entry_point.clone(), provider.clone());
+    let hash = entry_point.getUserOpHash(user_operation.clone()).call().await?;
+    Ok(hash.into())
+}
+
 struct NoCodeReader;
 
 impl CodeReader for NoCodeReader {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`pub mod client;`
	`2`	`+pub mod estimate;`
`2`	`3`	`pub mod gas_price;`