Skip to content

[ETH]: Makes factory and paymaster optional while serialising UserOpV07 #4345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged

[ETH]: Makes factory and paymaster optional while serialising UserOpV07 #4345

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions rust/tw_evm/src/transaction/user_operation_v0_7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,23 +188,15 @@ impl SignedTransaction for SignedUserOperationV0_7 {
let tx = SignedUserOperationV0_7Serde {
sender: self.unsigned.sender.to_string(),
nonce: self.unsigned.nonce.to_string(),
factory: self
.unsigned
.factory
.map(|addr| addr.to_string())
.unwrap_or_default(),
factory: self.unsigned.factory.map(|addr| addr.to_string()),
factory_data: hex::encode(&self.unsigned.factory_data, prefix),
call_data: hex::encode(&self.unsigned.call_data, prefix),
call_data_gas_limit: self.unsigned.call_data_gas_limit.to_string(),
verification_gas_limit: self.unsigned.verification_gas_limit.to_string(),
pre_verification_gas: self.unsigned.pre_verification_gas.to_string(),
max_fee_per_gas: self.unsigned.max_fee_per_gas.to_string(),
max_priority_fee_per_gas: self.unsigned.max_priority_fee_per_gas.to_string(),
paymaster: self
.unsigned
.paymaster
.map(|addr| addr.to_string())
.unwrap_or_default(),
paymaster: self.unsigned.paymaster.map(|addr| addr.to_string()),
paymaster_verification_gas_limit: self
.unsigned
.paymaster_verification_gas_limit
Expand All @@ -229,15 +221,15 @@ impl SignedTransaction for SignedUserOperationV0_7 {
struct SignedUserOperationV0_7Serde {
sender: String,
nonce: String,
factory: String,
factory: Option<String>,
factory_data: String,
Copy link
Contributor

@10gic 10gic Apr 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intuitively, if the factory is optional, then the factory_data should also be optional. 😃

call_data: String,
call_data_gas_limit: String,
verification_gas_limit: String,
pre_verification_gas: String,
max_fee_per_gas: String,
max_priority_fee_per_gas: String,
paymaster: String,
paymaster: Option<String>,
paymaster_verification_gas_limit: String,
paymaster_post_op_gas_limit: String,
paymaster_data: String,
Expand Down
Loading