Skip to content
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.

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

feat: 7702 safe #18

Merged
merged 6 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
[submodule "crates/yttrium/safe7579"]
path = crates/yttrium/safe7579
url = https://github.com/rhinestonewtf/safe7579
[submodule "test/scripts/forked_state/mock-aa-environment"]
path = test/scripts/forked_state/mock-aa-environment
url = https://github.com/WalletConnect/mock-aa-environment.git
2 changes: 1 addition & 1 deletion crates/yttrium/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use {
};

fn main() {
build_contracts();
// build_contracts();
}

const CONTRACTS_DIR: &str = "crates/yttrium/safe-smart-account/contracts";
Expand Down
1 change: 1 addition & 0 deletions crates/yttrium/src/bundler/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ mod tests {
max_priority_fee_per_gas: max_priority_fee_per_gas.into(),
paymaster: paymaster,
paymaster_data: paymaster_data,
// authorization_list: None,
jackpooleywc marked this conversation as resolved.
Show resolved Hide resolved
signature: signature,
}
};
Expand Down
5 changes: 4 additions & 1 deletion crates/yttrium/src/bundler/pimlico/paymaster/models.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::user_operation::UserOperationV07;
use crate::user_operation::{Authorization, UserOperationV07};
use alloy::primitives::{Address, Bytes, U256};
use serde::{Deserialize, Serialize};

Expand Down Expand Up @@ -31,6 +31,8 @@ pub struct UserOperationPreSponsorshipV07 {
pub paymaster_verification_gas_limit: Option<U256>,
pub paymaster_post_op_gas_limit: Option<U256>,
pub paymaster_data: Option<Bytes>,
// #[serde(skip_serializing_if = "Option::is_none")]
// pub authorization_list: Option<Vec<Authorization>>,
pub signature: Bytes,
}

Expand All @@ -52,6 +54,7 @@ impl From<UserOperationV07> for UserOperationPreSponsorshipV07 {
.paymaster_verification_gas_limit,
paymaster_post_op_gas_limit: user_op.paymaster_post_op_gas_limit,
paymaster_data: user_op.paymaster_data,
// authorization_list: user_op.authorization_list,
signature: user_op.signature,
}
}
Expand Down
1 change: 1 addition & 0 deletions crates/yttrium/src/transaction/send.rs
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ mod tests {
paymaster_verification_gas_limit: None,
paymaster_post_op_gas_limit: None,
paymaster_data: None,
// authorization_list: None,
signature: Bytes::from_str(
crate::smart_accounts::simple_account::DUMMY_SIGNATURE_HEX
.strip_prefix("0x")
Expand Down
Loading