Skip to content

Add generic userop price estimation. Add setting to cap the max gas price on bundler operations. #17

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
gnpar merged 2 commits into from
Apr 21, 2025
Merged

Add generic userop price estimation. Add setting to cap the max gas price on bundler operations. #17

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb64ade
Add setting to cap the max price allowed for useroperations
gnpar Apr 21, 2025
1088c5d
Add new parameter to rep
gnpar Apr 21, 2025
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
21 changes: 15 additions & 6 deletions src/ethproto/aa_bundler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR = env.float("AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR", 1)
AA_BUNDLER_BASE_GAS_PRICE_FACTOR = env.float("AA_BUNDLER_BASE_GAS_PRICE_FACTOR", 1)
AA_BUNDLER_VERIFICATION_GAS_FACTOR = env.float("AA_BUNDLER_VERIFICATION_GAS_FACTOR", 1)
AA_BUNDLER_MAX_FEE_PER_GAS = env.int("AA_BUNDLER_MAX_FEE_PER_GAS", 200000000000) # 200 gwei

AA_BUNDLER_STATE_OVERRIDES = env.json("AA_BUNDLER_STATE_OVERRIDES", default={})

Expand Down Expand Up @@ -329,6 +330,7 @@ def __init__(
gas_limit_factor: float = AA_BUNDLER_GAS_LIMIT_FACTOR,
priority_gas_price_factor: float = AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR,
base_gas_price_factor: float = AA_BUNDLER_BASE_GAS_PRICE_FACTOR,
max_fee_per_gas: int = AA_BUNDLER_MAX_FEE_PER_GAS,
executor_pk: HexBytes = AA_BUNDLER_EXECUTOR_PK,
overrides: StateOverride = AA_BUNDLER_STATE_OVERRIDES,
):
Expand All @@ -343,6 +345,7 @@ def __init__(
self.priority_gas_price_factor = priority_gas_price_factor
self.base_gas_price_factor = base_gas_price_factor
self.executor_pk = executor_pk
self.max_fee_per_gas = max_fee_per_gas

# stateOverrideSet mapping to use when calling eth_estimateUserOperationGas
# https://docs.alchemy.com/reference/eth-estimateuseroperationgas
Expand All @@ -353,7 +356,7 @@ def __str__(self):
f"Bundler(type={self.bundler_type}, entrypoint={self.entrypoint}, nonce_mode={self.nonce_mode}, "
f"fixed_nonce_key={self.fixed_nonce_key}, verification_gas_factor={self.verification_gas_factor}, "
f"gas_limit_factor={self.gas_limit_factor}, priority_gas_price_factor={self.priority_gas_price_factor}, "
f"base_gas_price_factor={self.base_gas_price_factor})"
f"base_gas_price_factor={self.base_gas_price_factor}, max_fee_per_gas={self.max_fee_per_gas})"
)

def get_nonce_and_key(self, tx: Tx, fetch=False):
Expand Down Expand Up @@ -406,10 +409,17 @@ def alchemy_gas_price(self):
if "error" in resp:
raise BundlerRevertError(resp["error"]["message"], response=resp)
max_priority_fee_per_gas = int(int(resp["result"], 16) * self.priority_gas_price_factor)
max_fee_per_gas = max_priority_fee_per_gas + self.get_base_fee()
max_fee_per_gas = min(max_priority_fee_per_gas + self.get_base_fee(), self.max_fee_per_gas)

return GasPrice(max_priority_fee_per_gas=max_priority_fee_per_gas, max_fee_per_gas=max_fee_per_gas)

def generic_gas_price(self):
base_fee = self.get_base_fee()
priority_fee = self.w3.eth.max_priority_fee
max_priority_fee_per_gas = int(priority_fee * self.priority_gas_price_factor)
max_fee_per_gas = min(max_priority_fee_per_gas + base_fee, self.max_fee_per_gas)
return GasPrice(max_priority_fee_per_gas=max_priority_fee_per_gas, max_fee_per_gas=max_fee_per_gas)

def build_user_operation(self, tx: Tx, retry_nonce=None) -> UserOperation:
nonce_key, nonce = self.get_nonce_and_key(tx, fetch=retry_nonce is not None)
# Consume the nonce, even if the userop may fail later
Expand All @@ -422,16 +432,15 @@ def build_user_operation(self, tx: Tx, retry_nonce=None) -> UserOperation:

if self.bundler_type == "alchemy":
gas_price = self.alchemy_gas_price()
user_operation = user_operation.add_gas_price(gas_price)

elif self.bundler_type == "generic":
# At the moment generic just prices the gas at 0
pass
gas_price = self.generic_gas_price()

else:
warn(f"Unknown bundler_type: {self.bundler_type}")
gas_price = GasPrice(0, 0)

return user_operation
return user_operation.add_gas_price(gas_price)

def send_transaction(self, tx: Tx, retry_nonce=None):
user_operation = self.build_user_operation(tx, retry_nonce).sign(
Expand Down