eth-prototype 1.5.1__tar.gz → 1.5.2__tar.gz

{eth_prototype-1.5.1 → eth_prototype-1.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.5.1
+Version: 1.5.2
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja

{eth_prototype-1.5.1 → eth_prototype-1.5.2}/src/eth_prototype.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.5.1
+Version: 1.5.2
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja

{eth_prototype-1.5.1 → eth_prototype-1.5.2}/src/ethproto/aa_bundler.py

@@ -3,7 +3,6 @@ from collections import defaultdict
 from dataclasses import dataclass, replace
 from enum import Enum
 from threading import local
-from warnings import warn
 
 from environs import Env
 from eth_abi import encode
@@ -48,7 +47,6 @@ NonceMode = Enum(
 
 AA_BUNDLER_NONCE_MODE = env.enum("AA_BUNDLER_NONCE_MODE", default="FIXED_KEY_LOCAL_NONCE", enum=NonceMode)
 AA_BUNDLER_NONCE_KEY = env.int("AA_BUNDLER_NONCE_KEY", 0)
-AA_BUNDLER_MAX_GETNONCE_RETRIES = env.int("AA_BUNDLER_MAX_GETNONCE_RETRIES", 3)
 AA_BUNDLER_ALCHEMY_GAS_POLICY_ID = env.str("AA_BUNDLER_ALCHEMY_GAS_POLICY_ID", None)
 AA_BUNDLER_USE_EXECUTE_USER_OP = env.bool("AA_BUNDLER_USE_EXECUTE_USER_OP", False)
 
@@ -88,6 +86,12 @@ class BundlerError(Exception):
     pass
 
 
+class NonceError(BundlerRevertError):
+    """Raised when the bundler returns an AA25 invalid account nonce error."""
+
+    pass
+
+
 @dataclass(frozen=True)
 class UserOpEstimation:
     """eth_estimateUserOperationGas response"""
@@ -364,18 +368,9 @@ def consume_nonce(nonce_key, nonce):
     NONCE_CACHE[nonce_key] = max(NONCE_CACHE[nonce_key], nonce + 1)
 
 
-def check_nonce_error(resp, retry_nonce):
-    """Returns the next nonce if resp contains a nonce error and retries weren't exhausted
-    Raises RevertError otherwise
-    """
-    if "AA25" in resp["error"]["message"] and AA_BUNDLER_MAX_GETNONCE_RETRIES > 0:
-        # Retry fetching the nonce
-        if retry_nonce == AA_BUNDLER_MAX_GETNONCE_RETRIES:
-            raise BundlerRevertError(resp["error"]["message"], response=resp)
-        warn(f'{resp["error"]["message"]} error, I will retry fetching the nonce')
-        return (retry_nonce or 0) + 1
-    else:
-        raise BundlerRevertError(resp["error"]["message"], response=resp)
+def is_nonce_error(resp):
+    """Check if a bundler response contains an AA25 nonce error."""
+    return "error" in resp and "AA25" in resp["error"]["message"]
 
 
 def get_sender(tx):
@@ -579,19 +574,18 @@ class Bundler:
         total_fee = int(resp["result"]["standard"]["maxFeePerGas"], 16)
         base_fee = total_fee - 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)
+        max_fee_per_gas = max_priority_fee_per_gas + base_fee
         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)
+        max_fee_per_gas = max_priority_fee_per_gas + base_fee
         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
+    def build_user_operation(self, tx: Tx, enable_cap=True) -> UserOperation:
+        nonce_key, nonce = self.get_nonce_and_key(tx)
         consume_nonce(nonce_key, nonce)
 
         user_operation = UserOperation.from_tx(
@@ -613,7 +607,11 @@ class Bundler:
             user_operation = user_operation.add_estimation(estimation)
 
             gas_price = self.pimlico_gas_price()
-
+            if enable_cap:
+                gas_price = GasPrice(
+                    max_priority_fee_per_gas=gas_price.max_priority_fee_per_gas,
+                    max_fee_per_gas=min(gas_price.max_fee_per_gas, self.max_fee_per_gas),
+                )
             user_operation = user_operation.add_gas_price(gas_price)
 
         elif self.bundler_type == "generic":
@@ -622,7 +620,11 @@ class Bundler:
             user_operation = user_operation.add_estimation(estimation)
 
             gas_price = self.generic_gas_price()
-
+            if enable_cap:
+                gas_price = GasPrice(
+                    max_priority_fee_per_gas=gas_price.max_priority_fee_per_gas,
+                    max_fee_per_gas=min(gas_price.max_fee_per_gas, self.max_fee_per_gas),
+                )
             user_operation = user_operation.add_gas_price(gas_price)
 
         else:
@@ -630,25 +632,18 @@ class Bundler:
 
         return user_operation
 
-    def send_transaction(self, tx: Tx, retry_nonce=None):
-        user_operation = self.build_user_operation(tx, retry_nonce).sign(
-            self.account.key, tx.chain_id, self.entrypoint
-        )
+    def send_transaction(self, tx: Tx):
+        user_operation = self.build_user_operation(tx).sign(self.account.key, tx.chain_id, self.entrypoint)
+        return self.send_user_operation(user_operation)
 
+    def send_user_operation(self, user_operation: UserOperation):
         resp = self.bundler.provider.make_request(
             "eth_sendUserOperation", [user_operation.as_dict(), self.entrypoint]
         )
         if "error" in resp:
-            try:
-                next_nonce = check_nonce_error(resp, retry_nonce)
-            except BundlerRevertError as e:
-                raise BundlerRevertError(
-                    e.message,
-                    userop=user_operation,
-                    response=e.response,
-                )
-            return self.send_transaction(tx, retry_nonce=next_nonce)
-
+            if is_nonce_error(resp):
+                raise NonceError(resp["error"]["message"], userop=user_operation, response=resp)
+            raise BundlerRevertError(resp["error"]["message"], userop=user_operation, response=resp)
         return {"userOpHash": resp["result"]}
 
     def get_user_operation(self, user_op_hash):