eth-prototype 1.1.0__tar.gz → 1.1.2__tar.gz

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/.github/workflows/test.yaml

@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: ["main"]
+    branches: ["main", "v1.1.x"]
   pull_request:
-    branches: ["main"]
+    branches: ["main", "v1.1.x"]
 
 jobs:
   build:

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/PKG-INFO

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

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/src/eth_prototype.egg-info/PKG-INFO

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

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/src/eth_prototype.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ tests/hardhat-project/contracts/CounterUpgradeable.sol
 tests/hardhat-project/contracts/CounterUpgradeableWithLibrary.sol
 tests/hardhat-project/contracts/CounterWithLibrary.sol
 tests/hardhat-project/contracts/Datatypes.sol
+tests/hardhat-project/contracts/EventLauncher.sol
 tests/hardhat-project/contracts/TestCurrency.sol
 tests/hardhat-project/contracts/TestCurrencyUUPS.sol
 tests/hardhat-project/contracts/TestNFT.sol

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/src/ethproto/aa_bundler.py

@@ -1,15 +1,18 @@
 import random
-from warnings import warn
+from collections import defaultdict
 from enum import Enum
-import requests
+from threading import local
+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 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 +20,10 @@ 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)
+AA_BUNDLER_VERIFICATION_GAS_FACTOR = env.float("AA_BUNDLER_VERIFICATION_GAS_FACTOR", 1)
 
 NonceMode = Enum(
     "NonceMode",
@@ -46,8 +53,8 @@ GET_NONCE_ABI = [
     }
 ]
 
-NONCE_CACHE = {}
-RANDOM_NONCE_KEY = None
+NONCE_CACHE = defaultdict(lambda: 0)
+RANDOM_NONCE_KEY = local()
 
 
 def pack_two(a, b):
@@ -64,6 +71,10 @@ def _to_uint(x):
     raise RuntimeError(f"Invalid int value {x}")
 
 
+def apply_factor(x, factor):
+    return int(_to_uint(x) * factor)
+
+
 def pack_user_operation(user_operation):
     # https://github.com/eth-infinitism/account-abstraction/blob/develop/contracts/interfaces/PackedUserOperation.sol
     return {
@@ -129,10 +140,9 @@ def fetch_nonce(w3, account, entry_point, nonce_key):
 
 
 def get_random_nonce_key():
-    global RANDOM_NONCE_KEY
-    if RANDOM_NONCE_KEY is None:
-        RANDOM_NONCE_KEY = random.randint(1, 2**192 - 1)
-    return RANDOM_NONCE_KEY
+    if getattr(RANDOM_NONCE_KEY, "key", None) is None:
+        RANDOM_NONCE_KEY.key = random.randint(1, 2**192 - 1)
+    return RANDOM_NONCE_KEY.key
 
 
 def get_nonce_and_key(w3, tx, nonce_mode, entry_point=AA_BUNDLER_ENTRYPOINT, fetch=False):
@@ -147,31 +157,45 @@ 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)
-        elif nonce_key not in NONCE_CACHE:
-            nonce = 0
+            nonce = fetch_nonce(w3, get_sender(tx), entry_point, nonce_key)
         else:
             nonce = NONCE_CACHE[nonce_key]
     return nonce_key, nonce
 
 
-def handle_response_error(resp, w3, tx, retry_nonce):
+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 RevertError(resp["error"]["message"])
         warn(f'{resp["error"]["message"]} error, I will retry fetching the nonce')
-        return send_transaction(w3, tx, retry_nonce=(retry_nonce or 0) + 1)
+        return (retry_nonce or 0) + 1
     else:
         raise RevertError(resp["error"]["message"])
 
 
 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 send_transaction(w3, tx, retry_nonce=None):
+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 build_user_operation(w3, tx, retry_nonce=None):
     nonce_key, nonce = get_nonce_and_key(
         w3, tx, AA_BUNDLER_NONCE_MODE, entry_point=AA_BUNDLER_ENTRYPOINT, fetch=retry_nonce is not None
     )
@@ -185,7 +209,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,
@@ -196,39 +220,63 @@ def send_transaction(w3, tx, retry_nonce=None):
             "eth_estimateUserOperationGas", [user_operation, AA_BUNDLER_ENTRYPOINT]
         )
         if "error" in resp:
-            return handle_response_error(resp, w3, tx, retry_nonce)
+            next_nonce = check_nonce_error(resp, retry_nonce)
+            return build_user_operation(w3, tx, retry_nonce=next_nonce)
 
         user_operation.update(resp["result"])
 
         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)))
-    elif AA_BUNDLER_PROVIDER == "gelato":
-        user_operation.update(
-            {
-                "preVerificationGas": "0x00",
-                "callGasLimit": "0x00",
-                "verificationGasLimit": "0x00",
-                "maxFeePerGas": "0x00",
-                "maxPriorityFeePerGas": "0x00",
-            }
+        user_operation["maxPriorityFeePerGas"] = resp["result"]
+        user_operation["maxFeePerGas"] = hex(int(resp["result"], 16) + get_base_fee(w3))
+
+    elif AA_BUNDLER_PROVIDER == "generic":
+        resp = w3.provider.make_request(
+            "eth_estimateUserOperationGas", [user_operation, AA_BUNDLER_ENTRYPOINT]
         )
-    user_operation["signature"] = sign_user_operation(
-        AA_BUNDLER_EXECUTOR_PK, user_operation, tx["chainId"], AA_BUNDLER_ENTRYPOINT
+        if "error" in resp:
+            next_nonce = check_nonce_error(resp, retry_nonce)
+            return build_user_operation(w3, tx, retry_nonce=next_nonce)
+
+        user_operation.update(resp["result"])
+
+    else:
+        warn(f"Unknown AA_BUNDLER_PROVIDER: {AA_BUNDLER_PROVIDER}")
+
+    # Apply increase factors
+    user_operation["verificationGasLimit"] = hex(
+        apply_factor(user_operation["verificationGasLimit"], AA_BUNDLER_VERIFICATION_GAS_FACTOR)
     )
+    if "maxPriorityFeePerGas" in user_operation:
+        user_operation["maxPriorityFeePerGas"] = hex(
+            apply_factor(user_operation["maxPriorityFeePerGas"], AA_BUNDLER_PRIORITY_GAS_PRICE_FACTOR)
+        )
+    if "callGasLimit" in user_operation:
+        user_operation["callGasLimit"] = hex(
+            apply_factor(user_operation["callGasLimit"], AA_BUNDLER_GAS_LIMIT_FACTOR)
+        )
+
     # Remove paymaster related fields
     user_operation.pop("paymaster", None)
     user_operation.pop("paymasterData", None)
     user_operation.pop("paymasterVerificationGasLimit", None)
     user_operation.pop("paymasterPostOpGasLimit", None)
 
+    # Consume the nonce, even if the userop may fail later
+    consume_nonce(nonce_key, nonce)
+
+    return user_operation
+
+
+def send_transaction(w3, tx, retry_nonce=None):
+    user_operation = build_user_operation(w3, tx, retry_nonce)
+    user_operation["signature"] = sign_user_operation(
+        AA_BUNDLER_EXECUTOR_PK, user_operation, tx["chainId"], AA_BUNDLER_ENTRYPOINT
+    )
     resp = w3.provider.make_request("eth_sendUserOperation", [user_operation, AA_BUNDLER_ENTRYPOINT])
     if "error" in resp:
-        return handle_response_error(resp, w3, tx, retry_nonce)
+        next_nonce = check_nonce_error(resp, retry_nonce)
+        return send_transaction(w3, tx, retry_nonce=next_nonce)
 
-    # 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"]}

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/src/ethproto/w3wrappers.py

@@ -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.2/tests/hardhat-project/contracts/EventLauncher.sol

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.9;
+
+contract EventLauncher {
+    event Event1(uint256 value);
+
+    event Event2(uint256 value);
+
+    function launchEvent1(uint256 value) public {
+        emit Event1(value);
+    }
+
+    function launchEvent2(uint256 value) public {
+        emit Event2(value);
+    }
+}

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/tests/test_aa_bundler.py

@@ -1,7 +1,11 @@
+from queue import Queue
+from threading import Event, Thread
+from unittest.mock import MagicMock, patch
+
 from hexbytes import HexBytes
-from ethproto import aa_bundler
 from web3.constants import HASH_ZERO
-from unittest.mock import MagicMock, patch
+
+from ethproto import aa_bundler
 
 
 def test_pack_two():
@@ -65,9 +69,7 @@ def test_hash_packed_user_operation():
 
 def test_sign_user_operation():
     signature = aa_bundler.sign_user_operation(TEST_PRIVATE_KEY, user_operation, CHAIN_ID, ENTRYPOINT)
-    assert (
-        signature
-        == "0xb9b872bfe4e90f4628e8ec24879a5b01045f91da8457f3ce2b417d2e5774b508261ec1147a820e75a141cb61b884a78d7e88996ceddafb9a7016cfe7a48a1f4f1b"  # noqa
+    assert (signature == "0xb9b872bfe4e90f4628e8ec24879a5b01045f91da8457f3ce2b417d2e5774b508261ec1147a820e75a141cb61b884a78d7e88996ceddafb9a7016cfe7a48a1f4f1b"  # noqa
     )
 
 
@@ -75,9 +77,7 @@ def test_sign_user_operation_gas_diff():
     user_operation_2 = dict(user_operation)
     user_operation_2["maxPriorityFeePerGas"] -= 1
     signature = aa_bundler.sign_user_operation(TEST_PRIVATE_KEY, user_operation_2, CHAIN_ID, ENTRYPOINT)
-    assert (
-        signature
-        == "0x8162479d2dbd18d7fe93a2f51e283021d6e4eae4f57d20cdd553042723a0b0ea690ab3903d45126b0047da08ab53dfdf86656e4f258ac4936ba96a759ccb77f61b"  # noqa
+    assert (signature == "0x8162479d2dbd18d7fe93a2f51e283021d6e4eae4f57d20cdd553042723a0b0ea690ab3903d45126b0047da08ab53dfdf86656e4f258ac4936ba96a759ccb77f61b"  # noqa
     )
 
 
@@ -155,8 +155,8 @@ def test_get_nonce_random_key_mode(fetch_nonce_mock, randint_mock):
     fetch_nonce_mock.assert_not_called()
     randint_mock.assert_called_with(1, 2**192 - 1)
     randint_mock.reset_mock()
-    assert aa_bundler.RANDOM_NONCE_KEY == 444
-    aa_bundler.RANDOM_NONCE_KEY = None  # cleanup
+    assert aa_bundler.RANDOM_NONCE_KEY.key == 444
+    aa_bundler.RANDOM_NONCE_KEY.key = None  # cleanup
 
 
 @patch.object(aa_bundler.random, "randint")
@@ -175,6 +175,7 @@ def test_get_nonce_with_local_cache(fetch_nonce_mock, randint_mock):
         fetch_nonce_mock.assert_not_called()
 
 
+@patch.object(aa_bundler, "AA_BUNDLER_NONCE_MODE", new=aa_bundler.NonceMode.FIXED_KEY_LOCAL_NONCE)
 @patch.object(aa_bundler, "get_base_fee")
 def test_send_transaction(get_base_fee_mock):
     get_base_fee_mock.return_value = 0
@@ -239,4 +240,45 @@ def test_send_transaction(get_base_fee_mock):
     ret = aa_bundler.send_transaction(w3, tx)
     get_base_fee_mock.assert_called_once_with(w3)
     assert aa_bundler.NONCE_CACHE[0] == 1
-    assert ret == "0xa950a17ca1ed83e974fb1aa227360a007cb65f566518af117ffdbb04d8d2d524"
+    assert ret == {"userOpHash": "0xa950a17ca1ed83e974fb1aa227360a007cb65f566518af117ffdbb04d8d2d524"}
+
+
+def test_random_key_nonces_are_thread_safe():
+    queue = Queue()
+    event = Event()
+
+    def worker():
+        event.wait()  # Get all threads running at the same time
+        nonce_key, nonce = aa_bundler.get_nonce_and_key(
+            FAIL_IF_USED,
+            {"from": TEST_SENDER},
+            nonce_mode=aa_bundler.NonceMode.RANDOM_KEY,
+        )
+        aa_bundler.consume_nonce(nonce_key, nonce)
+        queue.put(
+            aa_bundler.get_nonce_and_key(
+                FAIL_IF_USED,
+                {"from": TEST_SENDER},
+                nonce_mode=aa_bundler.NonceMode.RANDOM_KEY,
+            )
+        )
+
+    threads = [Thread(target=worker) for _ in range(15)]
+    for thread in threads:
+        thread.start()
+
+    # Fire all threads at once
+    event.set()
+    for thread in threads:
+        thread.join()
+
+    nonces = {}
+
+    while not queue.empty():
+        nonce_key, nonce = queue.get_nowait()
+        # Each thread got a different key
+        assert nonce_key not in nonces
+        nonces[nonce_key] = nonce
+
+    # All nonces are the same
+    assert all(nonce == 1 for nonce in nonces.values())

{eth_prototype-1.1.0 → eth_prototype-1.1.2}/tests/test_w3.py

@@ -77,3 +77,32 @@ def test_wrapper_build_from_def():
     assert counter.value() == 0
     counter.increase()
     assert counter.value() == 1
+
+
+def test_get_events():
+    provider = wrappers.get_provider("w3")
+    contract_def = provider.get_contract_def("EventLauncher")
+    wrapper = wrappers.ETHWrapper.build_from_def(contract_def)
+
+    launcher = wrapper()
+
+    launcher.launchEvent1(1)
+
+    cutoff_block = provider.w3.eth.get_block("latest")
+    launcher.launchEvent2(2)
+    launcher.launchEvent1(3)
+
+    all_event1 = provider.get_events(launcher, "Event1", dict(from_block=0))
+    assert len(all_event1) == 2
+
+    first_event1_only = provider.get_events(launcher, "Event1", dict(to_block=cutoff_block.number))
+    assert len(first_event1_only) == 1
+    assert first_event1_only[0] == all_event1[0]
+
+    last_event1_only = provider.get_events(launcher, "Event1", dict(from_block=cutoff_block.number + 1))
+    assert len(last_event1_only) == 1
+    assert last_event1_only[0] == all_event1[-1]
+
+    event2 = provider.get_events(launcher, "Event2")
+    assert len(event2) == 1
+    assert event2[0].args.value == 2