eth-prototype 1.4.1__py3-none-any.whl → 1.5.0b2__py3-none-any.whl

{eth_prototype-1.4.1.dist-info → eth_prototype-1.5.0b2.dist-info}/METADATA

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

{eth_prototype-1.4.1.dist-info → eth_prototype-1.5.0b2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-eth_prototype-1.4.1.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.4.1.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.5.0b2.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.5.0b2.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
 ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
-ethproto/aa_bundler.py,sha256=W47fIA_w7orUu7yczfHPaHpUJRFh5op0YZHPgW3Iwik,17420
+ethproto/aa_bundler.py,sha256=mzEB0s5DX58wKsi9xb8dB9En9nK3D3ExrI3OOsqJb7M,22521
 ethproto/build_artifacts.py,sha256=3t-MTSFZU1pQtDwf65zNJkceWleLRlzcEo8CFpu4_6s,10031
 ethproto/contracts.py,sha256=R9lWKPe77jkPBXx798qhnVPWSFF2nhz4AaYowipNIBc,22625
 ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
@@ -12,7 +12,7 @@ ethproto/test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 ethproto/test_utils/factories.py,sha256=G8DnUDG_yThRxMTCkymzcjm9lR_ni0_ZmTsb3sEfIdI,1805
 ethproto/test_utils/hardhat.py,sha256=HzTqIznu6zVd_-doL96ftFJ235ktDCQen1QDQbNuwfM,2361
 ethproto/test_utils/vcr_utils.py,sha256=1FH2sgJlElSjWkJLuO3C7E2J-4HKyFvjAqkCnGRZJyk,797
-eth_prototype-1.4.1.dist-info/METADATA,sha256=5AYCz9-qpNclDeljRLe4nRHZhTap4Ky1FhOHXUKwFyY,2695
-eth_prototype-1.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eth_prototype-1.4.1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.4.1.dist-info/RECORD,,
+eth_prototype-1.5.0b2.dist-info/METADATA,sha256=AYseONs04OnkUFgVa4t_z0669tv-uS5Nrc-dbeAxZkg,2697
+eth_prototype-1.5.0b2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+eth_prototype-1.5.0b2.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.5.0b2.dist-info/RECORD,,

{eth_prototype-1.4.1.dist-info → eth_prototype-1.5.0b2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ethproto/aa_bundler.py

@@ -7,11 +7,13 @@ from warnings import warn
 
 from environs import Env
 from eth_abi import encode
+from eth_abi.packed import encode_packed
 from eth_account import Account
 from eth_account.messages import encode_defunct
 from eth_typing import HexAddress
 from eth_utils import add_0x_prefix, function_signature_to_4byte_selector
 from hexbytes import HexBytes
+from requests import HTTPError
 from web3 import Web3
 from web3.constants import ADDRESS_ZERO
 from web3.types import StateOverride, TxParams
@@ -24,7 +26,7 @@ AA_BUNDLER_URL = env.str("AA_BUNDLER_URL", env.str("WEB3_PROVIDER_URI", "http://
 AA_BUNDLER_SENDER = env.str("AA_BUNDLER_SENDER", None)
 AA_BUNDLER_ENTRYPOINT = env.str("AA_BUNDLER_ENTRYPOINT", "0x0000000071727De22E5E9d8BAf0edAc6f37da032")
 AA_BUNDLER_EXECUTOR_PK = env.str("AA_BUNDLER_EXECUTOR_PK", None)
-AA_BUNDLER_PROVIDER = env.str("AA_BUNDLER_PROVIDER", "alchemy")
+AA_BUNDLER_PROVIDER = env.str("AA_BUNDLER_PROVIDER", "generic")
 AA_BUNDLER_GAS_LIMIT_FACTOR = env.float("AA_BUNDLER_GAS_LIMIT_FACTOR", 1)
 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)
@@ -47,7 +49,7 @@ 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)
 
 GET_NONCE_ABI = [
     {
@@ -81,6 +83,10 @@ class BundlerRevertError(RevertError):
         self.response = response
 
 
+class BundlerError(Exception):
+    pass
+
+
 @dataclass(frozen=True)
 class UserOpEstimation:
     """eth_estimateUserOperationGas response"""
@@ -97,6 +103,21 @@ class GasPrice:
     max_fee_per_gas: int
 
 
+@dataclass(frozen=True)
+class PaymasterAndData:
+    paymaster: HexAddress
+    paymaster_data: HexBytes
+    paymaster_verification_gas_limit: int
+    paymaster_post_op_gas_limit: int
+
+
+@dataclass(frozen=True)
+class AlchemyGasAndPaymasterAndData:
+    estimation: UserOpEstimation
+    gas_price: GasPrice
+    paymaster_and_data: PaymasterAndData
+
+
 @dataclass(frozen=True)
 class Tx:
     target: HexAddress
@@ -141,7 +162,11 @@ class UserOperation:
     signature: HexBytes = DUMMY_SIGNATURE
 
     init_code: HexBytes = HexBytes("0x")
-    paymaster_and_data: HexBytes = HexBytes("0x")
+
+    paymaster: HexAddress = None
+    paymaster_data: HexBytes = HexBytes("0x")
+    paymaster_verification_gas_limit: int = 0
+    paymaster_post_op_gas_limit: int = 0
 
     @classmethod
     def from_tx(cls, tx: Tx, nonce):
@@ -172,6 +197,10 @@ class UserOperation:
             "maxPriorityFeePerGas": "0x%x" % self.max_priority_fee_per_gas,
             "maxFeePerGas": "0x%x" % self.max_fee_per_gas,
             "signature": add_0x_prefix(self.signature.hex()),
+            "paymaster": self.paymaster,
+            "paymasterData": self.paymaster_data,
+            "paymasterVerificationGasLimit": "0x%x" % self.paymaster_verification_gas_limit,
+            "paymasterPostOpGasLimit": "0x%x" % self.paymaster_post_op_gas_limit,
         }
 
     def add_estimation(self, estimation: UserOpEstimation) -> "UserOperation":
@@ -189,6 +218,15 @@ class UserOperation:
             max_fee_per_gas=gas_price.max_fee_per_gas,
         )
 
+    def add_paymaster_and_data(self, paymaster_and_data: PaymasterAndData) -> "UserOperation":
+        return replace(
+            self,
+            paymaster=paymaster_and_data.paymaster,
+            paymaster_data=paymaster_and_data.paymaster_data,
+            paymaster_verification_gas_limit=paymaster_and_data.paymaster_verification_gas_limit,
+            paymaster_post_op_gas_limit=paymaster_and_data.paymaster_post_op_gas_limit,
+        )
+
     def sign(self, private_key: HexBytes, chain_id, entrypoint) -> "UserOperation":
         signature = Account.sign_message(
             encode_defunct(
@@ -225,7 +263,21 @@ class PackedUserOperation:
             pre_verification_gas=user_operation.pre_verification_gas,
             gas_fees=pack_two(user_operation.max_priority_fee_per_gas, user_operation.max_fee_per_gas),
             init_code=user_operation.init_code,
-            paymaster_and_data=user_operation.paymaster_and_data,
+            paymaster_and_data=(
+                HexBytes(
+                    encode_packed(
+                        ["address", "uint128", "uint128", "bytes"],
+                        [
+                            user_operation.paymaster,
+                            user_operation.paymaster_verification_gas_limit,
+                            user_operation.paymaster_post_op_gas_limit,
+                            user_operation.paymaster_data,
+                        ],
+                    )
+                )
+                if user_operation.paymaster is not None
+                else HexBytes("0x")
+            ).to_0x_hex(),
             signature=user_operation.signature,
         )
 
@@ -333,6 +385,7 @@ class Bundler:
         max_fee_per_gas: int = AA_BUNDLER_MAX_FEE_PER_GAS,
         executor_pk: HexBytes = AA_BUNDLER_EXECUTOR_PK,
         overrides: StateOverride = AA_BUNDLER_STATE_OVERRIDES,
+        alchemy_gas_policy_id: str = AA_BUNDLER_ALCHEMY_GAS_POLICY_ID,
     ):
         self.w3 = w3
         self.bundler = Web3(Web3.HTTPProvider(bundler_url), middleware=[])
@@ -351,6 +404,10 @@ class Bundler:
         # https://docs.alchemy.com/reference/eth-estimateuseroperationgas
         self.overrides = overrides
 
+        if alchemy_gas_policy_id is None and bundler_type == "alchemy":
+            raise BundlerError("Must provide alchemy_gas_policy_id when using alchemy bundler_type")
+        self.alchemy_gas_policy_id = alchemy_gas_policy_id
+
     def __str__(self):
         return (
             f"Bundler(type={self.bundler_type}, entrypoint={self.entrypoint}, nonce_mode={self.nonce_mode}, "
@@ -404,14 +461,68 @@ class Bundler:
             ),
         )
 
-    def alchemy_gas_price(self):
-        resp = self.bundler.provider.make_request("rundler_maxPriorityFeePerGas", [])
-        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 = min(max_priority_fee_per_gas + self.get_base_fee(), self.max_fee_per_gas)
+    def alchemy_estimation(self, user_operation: UserOperation) -> AlchemyGasAndPaymasterAndData:
+        try:
+            resp = self.bundler.provider.make_request(
+                "alchemy_requestGasAndPaymasterAndData",
+                [
+                    {
+                        "policyId": self.alchemy_gas_policy_id,
+                        "entryPoint": self.entrypoint,
+                        "dummySignature": DUMMY_SIGNATURE,
+                        "userOperation": user_operation.as_reduced_dict(),
+                        "overrides": {
+                            "maxFeePerGas": {"multiplier": self.base_gas_price_factor},
+                            "maxPriorityFeePerGas": {"multiplier": self.priority_gas_price_factor},
+                            "callGasLimit": {"multiplier": self.gas_limit_factor},
+                            "verificationGasLimit": {"multiplier": self.verification_gas_factor},
+                        },
+                    }
+                ],
+            )
+        except HTTPError as e:
+            raise BundlerRevertError(
+                f"HTTP error while requesting gas and paymaster data: {str(e)}",
+                userop=user_operation,
+                response=e.response,
+            ) from e
 
-        return GasPrice(max_priority_fee_per_gas=max_priority_fee_per_gas, max_fee_per_gas=max_fee_per_gas)
+        if "error" in resp:
+            raise BundlerRevertError(resp["error"]["message"], userop=user_operation, response=resp)
+
+        # {
+        #     "callGasLimit": "0x3dab",
+        #     "paymasterVerificationGasLimit": "0x9afa",
+        #     "paymasterPostOpGasLimit": "0x0",
+        #     "verificationGasLimit": "0xac33",
+        #     "maxPriorityFeePerGas": "0x7aef40a00",
+        #     "paymaster": "0x2cc0c7981D846b9F2a16276556f6e8cb52BfB633",
+        #     "maxFeePerGas": "0xaf9fe62e48",
+        #     "paymasterData": "0xabcd...",
+        #     "preVerificationGas": "0xb8ec"
+        #   }
+
+        estimation = UserOpEstimation(
+            pre_verification_gas=int(resp["result"]["preVerificationGas"], 16),
+            verification_gas_limit=int(resp["result"]["verificationGasLimit"], 16),
+            call_gas_limit=int(resp["result"]["callGasLimit"], 16),
+            paymaster_verification_gas_limit=int(resp["result"]["paymasterVerificationGasLimit"], 16),
+        )
+        gas_price = GasPrice(
+            max_priority_fee_per_gas=int(resp["result"]["maxPriorityFeePerGas"], 16),
+            max_fee_per_gas=int(resp["result"]["maxFeePerGas"], 16),
+        )
+        paymaster_and_data = PaymasterAndData(
+            paymaster=resp["result"]["paymaster"],
+            paymaster_data=HexBytes(resp["result"]["paymasterData"]),
+            paymaster_verification_gas_limit=int(resp["result"]["paymasterVerificationGasLimit"], 16),
+            paymaster_post_op_gas_limit=int(resp["result"]["paymasterPostOpGasLimit"], 16),
+        )
+        return AlchemyGasAndPaymasterAndData(
+            estimation=estimation,
+            gas_price=gas_price,
+            paymaster_and_data=paymaster_and_data,
+        )
 
     def generic_gas_price(self):
         base_fee = self.get_base_fee()
@@ -426,21 +537,29 @@ class Bundler:
         consume_nonce(nonce_key, nonce)
 
         user_operation = UserOperation.from_tx(tx, make_nonce(nonce_key, nonce))
-        estimation = self.estimate_user_operation_gas(user_operation)
-
-        user_operation = user_operation.add_estimation(estimation)
 
         if self.bundler_type == "alchemy":
-            gas_price = self.alchemy_gas_price()
+            estimation_and_paymaster = self.alchemy_estimation(user_operation)
+
+            user_operation = user_operation.add_estimation(estimation_and_paymaster.estimation)
+            user_operation = user_operation.add_gas_price(estimation_and_paymaster.gas_price)
+            user_operation = user_operation.add_paymaster_and_data(
+                estimation_and_paymaster.paymaster_and_data
+            )
 
         elif self.bundler_type == "generic":
+            estimation = self.estimate_user_operation_gas(user_operation)
+
+            user_operation = user_operation.add_estimation(estimation)
+
             gas_price = self.generic_gas_price()
 
+            user_operation = user_operation.add_gas_price(gas_price)
+
         else:
-            warn(f"Unknown bundler_type: {self.bundler_type}")
-            gas_price = GasPrice(0, 0)
+            raise BundlerError(f"Unknown bundler_type: {self.bundler_type}")
 
-        return user_operation.add_gas_price(gas_price)
+        return user_operation
 
     def send_transaction(self, tx: Tx, retry_nonce=None):
         user_operation = self.build_user_operation(tx, retry_nonce).sign(