eth-prototype 1.5.0b1__py3-none-any.whl → 1.5.0b3__py3-none-any.whl

{eth_prototype-1.5.0b1.dist-info → eth_prototype-1.5.0b3.dist-info}/METADATA

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

{eth_prototype-1.5.0b1.dist-info → eth_prototype-1.5.0b3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-eth_prototype-1.5.0b1.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.5.0b1.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.5.0b3.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.5.0b3.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
 ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
-ethproto/aa_bundler.py,sha256=aECUJJzvdEDJCzM8qTET9m309xPnQfvfWVQskkIHEss,22162
+ethproto/aa_bundler.py,sha256=BV8UJD2hKs-CfQxo3r6dS-2Bk9fNQM9QIdt0VIZbfq4,24289
 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.5.0b1.dist-info/METADATA,sha256=7nJRJXEAzIvwO4C8xNG47vlspDOkhaGQs5crBAWy2TQ,2697
-eth_prototype-1.5.0b1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-eth_prototype-1.5.0b1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.5.0b1.dist-info/RECORD,,
+eth_prototype-1.5.0b3.dist-info/METADATA,sha256=omwxdFV1FIeoFDkqgAud8HV5JI4zxr5jIk3u1qI1ZMY,2697
+eth_prototype-1.5.0b3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+eth_prototype-1.5.0b3.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.5.0b3.dist-info/RECORD,,

ethproto/aa_bundler.py

@@ -13,6 +13,7 @@ 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
@@ -197,7 +198,7 @@ class UserOperation:
             "maxFeePerGas": "0x%x" % self.max_fee_per_gas,
             "signature": add_0x_prefix(self.signature.hex()),
             "paymaster": self.paymaster,
-            "paymasterData": self.paymaster_data,
+            "paymasterData": self.paymaster_data.to_0x_hex(),
             "paymasterVerificationGasLimit": "0x%x" % self.paymaster_verification_gas_limit,
             "paymasterPostOpGasLimit": "0x%x" % self.paymaster_post_op_gas_limit,
         }
@@ -441,7 +442,7 @@ class Bundler:
     def estimate_user_operation_gas(self, user_operation: UserOperation) -> UserOpEstimation:
         resp = self.bundler.provider.make_request(
             "eth_estimateUserOperationGas",
-            [user_operation.as_reduced_dict(), self.entrypoint, self.overrides],
+            [user_operation.as_dict(), self.entrypoint, self.overrides],
         )
         if "error" in resp:
             raise BundlerRevertError(resp["error"]["message"], user_operation, resp)
@@ -461,23 +462,32 @@ class Bundler:
         )
 
     def alchemy_estimation(self, user_operation: UserOperation) -> AlchemyGasAndPaymasterAndData:
-        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},
-                    },
-                }
-            ],
-        )
+        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},
+                        },
+                        # Alchemy seems to be ignoring this, even though it's documented
+                        "stateOverrideSet": self.overrides,
+                    }
+                ],
+            )
+        except HTTPError as e:
+            raise BundlerRevertError(
+                f"HTTP error while requesting gas and paymaster data: {str(e)}",
+                userop=user_operation,
+                response=e.response.json(),
+            ) from e
 
         if "error" in resp:
             raise BundlerRevertError(resp["error"]["message"], userop=user_operation, response=resp)
@@ -516,6 +526,35 @@ class Bundler:
             paymaster_and_data=paymaster_and_data,
         )
 
+    def pimlico_gas_price(self):
+        resp = self.bundler.provider.make_request("pimlico_getUserOperationGasPrice", [])
+        if "error" in resp:
+            raise BundlerRevertError(resp["error"]["message"], response=resp)
+        # {
+        #   "jsonrpc": "2.0",
+        #   "id": 1,
+        #   "result": {
+        #           "slow": {
+        #           "maxFeePerGas": "0x829b42b5",
+        #           "maxPriorityFeePerGas": "0x829b42b5"
+        #       },
+        #           "standard": {
+        #           "maxFeePerGas": "0x88d36a75",
+        #           "maxPriorityFeePerGas": "0x88d36a75"
+        #       },
+        #           "fast": {
+        #           "maxFeePerGas": "0x8f0b9234",
+        #           "maxPriorityFeePerGas": "0x8f0b9234"
+        #       }
+        #   }
+        # }
+        priority_fee = int(resp["result"]["standard"]["maxPriorityFeePerGas"], 16)
+        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)
+        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
@@ -539,6 +578,15 @@ class Bundler:
                 estimation_and_paymaster.paymaster_and_data
             )
 
+        elif self.bundler_type == "pimlico":
+            estimation = self.estimate_user_operation_gas(user_operation)
+
+            user_operation = user_operation.add_estimation(estimation)
+
+            gas_price = self.pimlico_gas_price()
+
+            user_operation = user_operation.add_gas_price(gas_price)
+
         elif self.bundler_type == "generic":
             estimation = self.estimate_user_operation_gas(user_operation)