Skip to content

Define custom validator for user operations #322

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

Open
7-falseparfait wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Define custom validator for user operations #322

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
37 changes: 19 additions & 18 deletions crates/mempool/src/validate/validator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,31 +244,27 @@ where
) -> Result<UserOperationValidationOutcome, InvalidMempoolUserOperationError> {
let mut out: UserOperationValidationOutcome = Default::default();

if let Some(val_config) = val_config.clone() {
out.val_config = val_config;
} else {
out.val_config = ValidationConfig {
min_stake: Some(reputation.min_stake()),
min_unstake_delay: Some(reputation.min_unstake_delay()),
topic: None,
ignore_prev: false,
};
}
out.val_config = val_config.clone().unwrap_or_else(|| ValidationConfig {
min_stake: Some(reputation.min_stake()),
min_unstake_delay: Some(reputation.min_unstake_delay()),
topic: None,
ignore_prev: false,
});

if mode.contains(UserOperationValidatorMode::Sanity) {
let sanity_helper = SanityHelper {
entry_point: &self.entry_point,
chain: self.chain,
val_config: val_config.clone().unwrap_or_default(),
val_config: out.val_config.clone(),
};

self.sanity_checks
.check_user_operation(uo, mempool, reputation, &sanity_helper)
.await?;
}

if let Some(uo) = mempool.get_prev_by_sender(uo) {
out.prev_hash = Some(uo.hash);
if let Some(prev_uo) = mempool.get_prev_by_sender(uo) {
out.prev_hash = Some(prev_uo.hash);
}

debug!("Simulate user operation from {:?}", uo.sender);
Expand All @@ -277,12 +273,11 @@ where
if mode.contains(UserOperationValidatorMode::Simulation) {
let mut sim_helper = SimulationHelper {
simulate_validation_result: &sim_res,
val_config: val_config.clone().unwrap_or_default(),
val_config: out.val_config.clone(),
valid_after: None,
};

self.simulation_checks.check_user_operation(uo, &mut sim_helper)?;

out.valid_after = sim_helper.valid_after;
}

Expand All @@ -295,8 +290,14 @@ where
.get_block(BlockNumber::Latest)
.await
.map_err(|e| SanityError::Provider { inner: e.to_string() })?
.expect("block should exist");
out.verified_block = U256::from(block_number.hash.expect("block hash should exist").0);
.ok_or(SanityError::Provider { inner: "Block not found".to_string() })?;

out.verified_block = U256::from(
block_number
.hash
.ok_or(SanityError::Provider { inner: "Block hash missing".to_string() })?
.0,
);

if mode.contains(UserOperationValidatorMode::SimulationTrace) {
debug!("Simulate user operation with trace from {:?}", uo.sender);
Expand All @@ -309,7 +310,7 @@ where
chain: self.chain,
simulate_validation_result: &sim_res,
js_trace: &js_trace,
val_config: val_config.unwrap_or_default(),
val_config: out.val_config.clone(),
stake_info: None,
code_hashes: None,
};
Expand Down