eth-prototype 1.1.0__py3-none-any.whl → 1.2.0b1__py3-none-any.whl

{eth_prototype-1.1.0.dist-info → eth_prototype-1.2.0b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-prototype
-Version: 1.1.0
+Version: 1.2.0b1
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -28,10 +28,10 @@ Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: gmpy2; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: web3[tester]==6.*; extra == "testing"
+Requires-Dist: web3[tester]==7.*; extra == "testing"
 Requires-Dist: boto3; extra == "testing"
 Provides-Extra: web3
-Requires-Dist: web3==6.*; extra == "web3"
+Requires-Dist: web3==7.*; extra == "web3"
 
 # eth-prototype
 

eth_prototype-1.2.0b1.dist-info/RECORD

@@ -0,0 +1,14 @@
+ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
+ethproto/aa_bundler.py,sha256=R4P3o6Cmt05StuVsReMRlhpSTzsGSEhj0Mcfy8HqFv8,9460
+ethproto/build_artifacts.py,sha256=xwCd5hJUHP82IA-y3sSfX6fV15kjCGtV19RxNRcoor0,5441
+ethproto/contracts.py,sha256=rNVbCK1hURy7lWKhzSdXgVWo3wx9O_Ghk-6PfgOsRNk,18662
+ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
+ethproto/w3wrappers.py,sha256=fEkqvzWFCHirUsfQqyoqsrpDlNfMIgBBik3yTFws8Is,21260
+ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
+ethproto/wrappers.py,sha256=9qDwRDOXw3wquzvGfIsub-VPWm98GBWP7dHLFOUPWzg,17307
+eth_prototype-1.2.0b1.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.2.0b1.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.2.0b1.dist-info/METADATA,sha256=hz3CfguoZtt1YZck0PhTaVDAcTeX2dlk4MBvcwLobWY,2484
+eth_prototype-1.2.0b1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+eth_prototype-1.2.0b1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.2.0b1.dist-info/RECORD,,

{eth_prototype-1.1.0.dist-info → eth_prototype-1.2.0b1.dist-info}/WHEEL

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

ethproto/aa_bundler.py

@@ -1,15 +1,17 @@
 import random
-from warnings import warn
 from enum import Enum
-import requests
+from warnings import warn
+
 from environs import Env
 from eth_abi import encode
 from eth_account import Account
 from eth_account.messages import encode_defunct
+from eth_utils import add_0x_prefix
 from hexbytes import HexBytes
 from web3 import Web3
-from .contracts import RevertError
+from web3.constants import ADDRESS_ZERO
 
+from .contracts import RevertError
 
 env = Env()
 
@@ -17,6 +19,9 @@ 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_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)
 
 NonceMode = Enum(
     "NonceMode",
@@ -51,8 +56,8 @@ RANDOM_NONCE_KEY = None
 
 
 def pack_two(a, b):
-    a = HexBytes(a).hex()[2:]
-    b = HexBytes(b).hex()[2:]
+    a = HexBytes(a).hex()
+    b = HexBytes(b).hex()
     return "0x" + a.zfill(32) + b.zfill(32)
 
 
@@ -98,23 +103,23 @@ def hash_packed_user_operation_only(packed_user_op):
                 hash_paymaster_and_data,
             ],
         ).hex()
-    ).hex()
+    )
 
 
 def hash_packed_user_operation(packed_user_op, chain_id, entry_point):
     return Web3.keccak(
         hexstr=encode(
             ["bytes32", "address", "uint256"],
-            [HexBytes(hash_packed_user_operation_only(packed_user_op)), entry_point, chain_id],
+            [hash_packed_user_operation_only(packed_user_op), entry_point, chain_id],
         ).hex()
-    ).hex()
+    )
 
 
 def sign_user_operation(private_key, user_operation, chain_id, entry_point):
     packed_user_op = pack_user_operation(user_operation)
     hash = hash_packed_user_operation(packed_user_op, chain_id, entry_point)
-    signature = Account.sign_message(encode_defunct(hexstr=hash), private_key)
-    return signature.signature.hex()
+    signature = Account.sign_message(encode_defunct(hexstr=hash.hex()), private_key)
+    return signature.signature
 
 
 def make_nonce(nonce_key, nonce):
@@ -147,7 +152,7 @@ def get_nonce_and_key(w3, tx, nonce_mode, entry_point=AA_BUNDLER_ENTRYPOINT, fet
 
     if nonce is None:
         if fetch or nonce_mode == NonceMode.FIXED_KEY_FETCH_ALWAYS:
-            nonce = fetch_nonce(w3, tx.get("from", AA_BUNDLER_SENDER), entry_point, nonce_key)
+            nonce = fetch_nonce(w3, get_sender(tx), entry_point, nonce_key)
         elif nonce_key not in NONCE_CACHE:
             nonce = 0
         else:
@@ -168,7 +173,16 @@ def handle_response_error(resp, w3, tx, retry_nonce):
 
 def get_base_fee(w3):
     blk = w3.eth.get_block("latest")
-    return blk["baseFeePerGas"]
+    return int(_to_uint(blk["baseFeePerGas"]) * AA_BUNDLER_BASE_GAS_PRICE_FACTOR)
+
+
+def get_sender(tx):
+    if "from" not in tx or tx["from"] == ADDRESS_ZERO:
+        if AA_BUNDLER_SENDER is None:
+            raise RuntimeError("Must define AA_BUNDLER_SENDER or send 'from' in the TX")
+        return AA_BUNDLER_SENDER
+    else:
+        return tx["from"]
 
 
 def send_transaction(w3, tx, retry_nonce=None):
@@ -185,7 +199,7 @@ def send_transaction(w3, tx, retry_nonce=None):
         "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c"
     )
     user_operation = {
-        "sender": tx.get("from", AA_BUNDLER_SENDER),
+        "sender": get_sender(tx),
         "nonce": hex(make_nonce(nonce_key, nonce)),
         "callData": call_data,
         "signature": dummy_signature,
@@ -203,9 +217,12 @@ def send_transaction(w3, tx, retry_nonce=None):
         resp = w3.provider.make_request("rundler_maxPriorityFeePerGas", [])
         if "error" in resp:
             raise RevertError(resp["error"]["message"])
-        max_priority_fee_per_gas = resp["result"]
-        user_operation["maxPriorityFeePerGas"] = max_priority_fee_per_gas
-        user_operation["maxFeePerGas"] = hex(_to_uint(max_priority_fee_per_gas) + _to_uint(get_base_fee(w3)))
+        max_priority_fee_per_gas = int(_to_uint(resp["result"]) * AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR)
+        user_operation["maxPriorityFeePerGas"] = hex(max_priority_fee_per_gas)
+        user_operation["maxFeePerGas"] = hex(max_priority_fee_per_gas + get_base_fee(w3))
+        user_operation["callGasLimit"] = hex(
+            int(_to_uint(user_operation["callGasLimit"]) * AA_BUNDLER_GAS_LIMIT_FACTOR)
+        )
     elif AA_BUNDLER_PROVIDER == "gelato":
         user_operation.update(
             {
@@ -216,8 +233,10 @@ def send_transaction(w3, tx, retry_nonce=None):
                 "maxPriorityFeePerGas": "0x00",
             }
         )
-    user_operation["signature"] = sign_user_operation(
-        AA_BUNDLER_EXECUTOR_PK, user_operation, tx["chainId"], AA_BUNDLER_ENTRYPOINT
+    user_operation["signature"] = add_0x_prefix(
+        sign_user_operation(
+            AA_BUNDLER_EXECUTOR_PK, user_operation, tx["chainId"], AA_BUNDLER_ENTRYPOINT
+        ).hex()
     )
     # Remove paymaster related fields
     user_operation.pop("paymaster", None)
@@ -231,4 +250,4 @@ def send_transaction(w3, tx, retry_nonce=None):
 
     # Store nonce in the cache, so next time uses a new nonce
     NONCE_CACHE[nonce_key] = nonce + 1
-    return resp["result"]
+    return {"userOpHash": resp["result"]}

ethproto/w3wrappers.py

@@ -9,7 +9,7 @@ from eth_utils.abi import event_abi_to_log_topic
 from hexbytes import HexBytes
 from web3.contract import Contract
 from web3.exceptions import ContractLogicError, ExtraDataLengthError
-from web3.middleware import geth_poa_middleware
+from web3.middleware import ExtraDataToPOAMiddleware
 
 from .build_artifacts import ArtifactLibrary
 from .contracts import RevertError
@@ -68,9 +68,9 @@ def register_w3_provider(provider_key="w3", tester=None, provider_kwargs={}):
         try:
             w3.eth.get_block("latest")
         except ExtraDataLengthError:
-            w3.middleware_onion.inject(geth_poa_middleware, layer=0)
+            w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
     elif W3_POA == "yes":
-        w3.middleware_onion.inject(geth_poa_middleware, layer=0)
+        w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
 
     # If address_book not provided and there are envs with W3_ADDRESS_BOOK_PREFIX,
     # use W3EnvAddressBook
@@ -375,6 +375,8 @@ class W3ETHCall(ETHCall):
     def normalize_receipt(self, wrapper, receipt):
         if W3_TRANSACT_MODE == "defender-async":
             return receipt  # Don't do anything because the receipt is just a dict of not-yet-mined tx
+        elif W3_TRANSACT_MODE == "aa-bundler-async":
+            return receipt  # Don't do anything because the receipt is just a dict of {"userOpHash": "..."}
         return ReceiptWrapper(receipt, wrapper.contract)
 
     def _handle_exception(self, err):
@@ -442,7 +444,7 @@ class W3Provider(BaseProvider):
     def get_events(self, eth_wrapper, event_name, filter_kwargs={}):
         """Returns a list of events given a filter, like this:
 
-        >>> provider.get_events(currencywrapper, "Transfer", dict(fromBlock=0))
+        >>> provider.get_events(currencywrapper, "Transfer", dict(from_block=0))
         [AttributeDict({
             'args': AttributeDict(
                 {'from': '0x0000000000000000000000000000000000000000',
@@ -461,8 +463,8 @@ class W3Provider(BaseProvider):
         """
         contract = eth_wrapper.contract
         event = getattr(contract.events, event_name)
-        if "fromBlock" not in filter_kwargs:
-            filter_kwargs["fromBlock"] = self.get_first_block(eth_wrapper)
+        if "from_block" not in filter_kwargs:
+            filter_kwargs["from_block"] = self.get_first_block(eth_wrapper)
         event_filter = event.create_filter(**filter_kwargs)
         return event_filter.get_all_entries()
 
@@ -488,7 +490,7 @@ class W3Provider(BaseProvider):
             constructor_params, init_params = init_params
             real_contract = self.construct(eth_contract, constructor_params, {"from": eth_wrapper.owner})
             ERC1967Proxy = self.get_contract_factory("ERC1967Proxy")
-            init_data = eth_contract.encodeABI(fn_name="initialize", args=init_params)
+            init_data = eth_contract.encode_abi(abi_element_identifier="initialize", args=init_params)
             proxy_contract = self.construct(
                 ERC1967Proxy,
                 (real_contract.address, init_data),

eth_prototype-1.1.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
-ethproto/aa_bundler.py,sha256=34yXgQw_vV81Wmf9cFxcLTxLUb1jzCrBE7XOw5RIjtI,8652
-ethproto/build_artifacts.py,sha256=xwCd5hJUHP82IA-y3sSfX6fV15kjCGtV19RxNRcoor0,5441
-ethproto/contracts.py,sha256=rNVbCK1hURy7lWKhzSdXgVWo3wx9O_Ghk-6PfgOsRNk,18662
-ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
-ethproto/w3wrappers.py,sha256=UbSuaB5_TYF4kiGNwIzvPPE7f0A6soZ7gc5jd180mVM,21065
-ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
-ethproto/wrappers.py,sha256=9qDwRDOXw3wquzvGfIsub-VPWm98GBWP7dHLFOUPWzg,17307
-eth_prototype-1.1.0.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.1.0.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
-eth_prototype-1.1.0.dist-info/METADATA,sha256=uOJw45vu6Xwc3uzJ1IfWV0RW1i2ST_ZHJ775Uwbi7zk,2482
-eth_prototype-1.1.0.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-eth_prototype-1.1.0.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.1.0.dist-info/RECORD,,