eth-prototype 1.3.0b1__tar.gz → 1.3.1__tar.gz

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.0b1
+Version: 1.3.1
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -26,14 +26,16 @@ Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
 Requires-Dist: gmpy2; extra == "gmpy2"
 Provides-Extra: testing
-Requires-Dist: setuptools; extra == "testing"
-Requires-Dist: pytest; extra == "testing"
+Requires-Dist: boto3; extra == "testing"
+Requires-Dist: factory-boy; extra == "testing"
 Requires-Dist: gmpy2; extra == "testing"
+Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: web3[tester]==7.*; extra == "testing"
-Requires-Dist: boto3; extra == "testing"
+Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
-Requires-Dist: factory-boy; extra == "testing"
+Requires-Dist: setuptools; extra == "testing"
+Requires-Dist: web3[tester]==7.*; extra == "testing"
+Dynamic: license-file
 
 # eth-prototype
 

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/setup.cfg

@@ -41,14 +41,15 @@ defender =
 gmpy2 = 
 	gmpy2
 testing = 
-	setuptools
-	pytest
+	boto3
+	factory-boy
 	gmpy2
+	pytest
 	pytest-cov
-	web3[tester]==7.*
-	boto3
+	pytest-mock
 	pytest-recording
-	factory-boy
+	setuptools
+	web3[tester]==7.*
 
 [options.entry_points]
 

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/eth_prototype.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.0b1
+Version: 1.3.1
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -26,14 +26,16 @@ Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
 Requires-Dist: gmpy2; extra == "gmpy2"
 Provides-Extra: testing
-Requires-Dist: setuptools; extra == "testing"
-Requires-Dist: pytest; extra == "testing"
+Requires-Dist: boto3; extra == "testing"
+Requires-Dist: factory-boy; extra == "testing"
 Requires-Dist: gmpy2; extra == "testing"
+Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
-Requires-Dist: web3[tester]==7.*; extra == "testing"
-Requires-Dist: boto3; extra == "testing"
+Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
-Requires-Dist: factory-boy; extra == "testing"
+Requires-Dist: setuptools; extra == "testing"
+Requires-Dist: web3[tester]==7.*; extra == "testing"
+Dynamic: license-file
 
 # eth-prototype
 

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/eth_prototype.egg-info/SOURCES.txt

@@ -64,4 +64,7 @@ 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
+tests/hardhat-project/contracts/TestNFT.sol
+tests/hardhat-project/verifiable-binaries/@anotherOrg/aPkg/1.0.2/build/contracts/TestCurrency.sol/TestCurrency.json
+tests/hardhat-project/verifiable-binaries/@org/pkg/0.2.1/build/contracts/TestCurrency.json
+tests/hardhat-project/verifiable-binaries/@org/pkg/0.3.0/build/contracts/TestCurrency.json

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/eth_prototype.egg-info/requires.txt

@@ -13,14 +13,15 @@ boto3
 gmpy2
 
 [testing]
-setuptools
-pytest
+boto3
+factory-boy
 gmpy2
+pytest
 pytest-cov
-web3[tester]==7.*
-boto3
+pytest-mock
 pytest-recording
-factory-boy
+setuptools
+web3[tester]==7.*
 
 [web3]
 web3==7.*

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/ethproto/aa_bundler.py

@@ -14,6 +14,7 @@ from eth_utils import add_0x_prefix, function_signature_to_4byte_selector
 from hexbytes import HexBytes
 from web3 import Web3
 from web3.constants import ADDRESS_ZERO
+from web3.types import TxParams
 
 from .contracts import RevertError
 
@@ -40,7 +41,7 @@ NonceMode = Enum(
     ],
 )
 
-AA_BUNDLER_NONCE_MODE = env.enum("AA_BUNDLER_NONCE_MODE", default="FIXED_KEY_LOCAL_NONCE", type=NonceMode)
+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)
 
@@ -94,6 +95,16 @@ class Tx:
     from_: HexAddress = ADDRESS_ZERO
     chain_id: int = None
 
+    @classmethod
+    def from_tx_params(cls, params: TxParams) -> "Tx":
+        return cls(
+            target=params["to"],
+            data=HexBytes(params["data"]),
+            value=params["value"],
+            from_=params.get("from", ADDRESS_ZERO),
+            chain_id=params.get("chainId", None),
+        )
+
     def as_execute_args(self):
         return [self.target, self.value, self.data]
 
@@ -320,6 +331,14 @@ class Bundler:
         self.base_gas_price_factor = base_gas_price_factor
         self.executor_pk = executor_pk
 
+    def __str__(self):
+        return (
+            f"Bundler(type={self.bundler_type}, entrypoint={self.entrypoint}, nonce_mode={self.nonce_mode}, "
+            f"fixed_nonce_key={self.fixed_nonce_key}, verification_gas_factor={self.verification_gas_factor}, "
+            f"gas_limit_factor={self.gas_limit_factor}, priority_gas_price_factor={self.priority_gas_price_factor}, "
+            f"base_gas_price_factor={self.base_gas_price_factor})"
+        )
+
     def get_nonce_and_key(self, tx: Tx, fetch=False):
         nonce_key = tx.nonce_key
         nonce = tx.nonce

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/ethproto/build_artifacts.py

@@ -6,10 +6,14 @@ import os.path
 import re
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Union, Tuple
+from typing import Tuple, Union
 
 LIBRARY_PLACEHOLDER_MATCHER = re.compile(r"__\$[0-9a-f]{34}\$__")
 
+CONTRACT_REF_MATCHER = re.compile(r"^(?:(?P<package>.*)/)?(?P<contract>[^@]+)(?:@(?P<version>.+))?$")
+
+VERSION_MATCHER = re.compile(r"^\d+\.\d+\.\d+$")
+
 
 @dataclass
 class Artifact:
@@ -94,6 +98,7 @@ class ArtifactLibrary:
         self.lookup_paths = [Path(p).absolute() for p in paths]
         self._fullpath_cache = {}
         self._name_cache = {}
+        self._ref_cache = None
 
     def get_artifact(self, contract: str) -> Artifact:
         """Returns a build artifact by full contract path
@@ -139,3 +144,115 @@ class ArtifactLibrary:
                 raise FileNotFoundError(f"Could not find artifact for {contract_name} on {self.lookup_paths}")
 
         return self._name_cache[contract_name]
+
+    def _load_ref_cache(self):
+        self._ref_cache = {}
+        for path in self.lookup_paths:
+            path = Path(path)
+            json_files = path.rglob("*.json")
+
+            for json_file in json_files:
+                # Skip build-info and debug files
+                if json_file.parent.stem == "build-info" or json_file.stem.endswith(".dbg"):
+                    continue
+
+                parts = json_file.parts[len(path.parts) - 1 :]
+
+                # Find the first parent named either "build" or "artifacts"
+                try:
+                    build_idx = next(i for i, part in enumerate(parts) if part in ("build", "artifacts"))
+                except StopIteration:
+                    continue
+
+                if build_idx == 0:
+                    # Our lookup path is already a build directory, we're probably looking at a hardhat build output
+                    version = "local"
+                else:
+                    # If we have a version number right before the build directory, we're probably looking at a
+                    # verifiable binaries directory
+                    version = parts[build_idx - 1]
+                    if not VERSION_MATCHER.match(version):
+                        version = "local"
+
+                if version == "local":
+                    # For hardhat output dir, package is everything up to "contracts"
+                    try:
+                        package = "/".join(parts[build_idx + 1 : parts.index("contracts")])
+                    except ValueError:
+                        # There are exceptions, like @openzeppelin/contracts-upgradeable
+                        # For those the package is everythin up to the contract directory
+                        package = "/".join(parts[build_idx + 1 : -2])
+
+                else:
+                    # For verifiable binaries dir, package is everything up to version
+                    package = "/".join(parts[1 : build_idx - 1])
+
+                if json_file.stem not in self._ref_cache:
+                    self._ref_cache[json_file.stem] = []
+                self._ref_cache[json_file.stem].append(
+                    {
+                        "path": json_file,
+                        "package": package,
+                        "version": version,
+                    }
+                )
+
+    def _find_ref(self, contract_ref: str):
+        if self._ref_cache is None:
+            self._load_ref_cache()
+
+        ref_match = CONTRACT_REF_MATCHER.match(contract_ref)
+        if not ref_match:
+            raise ValueError(f"Invalid contract reference: {contract_ref}")
+
+        contract = ref_match.group("contract")
+        if contract not in self._ref_cache:
+            return None
+
+        ref = self._ref_cache[contract]
+
+        package = ref_match.group("package")
+        if package:
+            ref = [r for r in ref if r["package"] == package]
+
+        version = ref_match.group("version")
+        if version:
+            ref = [r for r in ref if r["version"] == version]
+
+        if not ref:
+            return None
+
+        # Sort by version ascending, forcing local to be last
+        ref = sorted(
+            ref,
+            key=lambda x: (
+                x["version"] == "local",
+                tuple(map(int, x["version"].split("."))) if x["version"] != "local" else None,
+            ),
+        )[-1]
+
+        return ref
+
+    def get_artifact_by_ref(self, contract_ref: str) -> Artifact:
+        """Returns a build artifact by looking for a matching contract reference.
+
+        This is compatible with the verifiable binaries structure.
+
+        Accepts the following kind of references:
+
+        - <ContractClass>
+        - <ContractClass>@<version>
+        - <package>/<ContractClass>
+        - <package>/<ContractClass>@<version>
+
+        If version is not specified it uses the latest version available.
+
+        Calling with contract_ref <ContractClass>@local is the same as calling get_artifact_by_name(<ContractClass>).
+        """
+        ref = self._find_ref(contract_ref)
+
+        if ref is None:
+            raise FileNotFoundError(f"Could not find artifact for {contract_ref} on {self.lookup_paths}")
+
+        with open(ref["path"]) as f:
+            return Artifact(**json.load(f))

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/ethproto/w3wrappers.py

@@ -5,9 +5,10 @@ from typing import Iterator, List, Union
 from environs import Env
 from eth_account.account import Account, LocalAccount
 from eth_account.signers.base import BaseAccount
-from eth_utils.abi import event_abi_to_log_topic
+from eth_utils import add_0x_prefix, event_abi_to_log_topic
 from hexbytes import HexBytes
 from web3.contract import Contract
+from web3.contract.contract import ContractEvent
 from web3.exceptions import ContractLogicError, ExtraDataLengthError
 from web3.middleware import ExtraDataToPOAMiddleware
 
@@ -111,7 +112,7 @@ def transact(provider, function, tx_kwargs):
             }
         )
         signed_tx = from_.sign_transaction(tx)
-        tx_hash = provider.w3.eth.send_raw_transaction(signed_tx.rawTransaction)
+        tx_hash = provider.w3.eth.send_raw_transaction(signed_tx.raw_transaction)
     elif W3_TRANSACT_MODE == "defender-async":
         from .defender_relay import send_transaction
 
@@ -211,8 +212,8 @@ class W3EnvAddressBook(AddressBook):
         if isinstance(name, (Account, LocalAccount)):
             return name
         if name is None:
-            return self.ZERO
-        if type(name) == str and name.startswith("0x"):
+            return list(self.signers.values())[0] if self.signers else self.ZERO
+        if isinstance(name, str) and name.startswith("0x"):
             return name
         if name in self.name_to_address:
             return self.name_to_address[name]
@@ -437,7 +438,7 @@ class W3Provider(BaseProvider):
         self.tx_kwargs = tx_kwargs or {}
 
     def get_contract_def(self, eth_contract):
-        return self.artifact_library.get_artifact_by_name(eth_contract)
+        return self.artifact_library.get_artifact_by_ref(eth_contract)
 
     def get_contract_factory(self, eth_contract):
         contract_def = self.get_contract_def(eth_contract)
@@ -448,7 +449,9 @@ class W3Provider(BaseProvider):
         kwargs["from"] = from_
         return self.construct(factory, init_params, kwargs)
 
-    def get_events(self, eth_wrapper, event_name, filter_kwargs={}):
+    def get_events(
+        self, eth_wrapper, event_names: Union[list[Union[str, ContractEvent]], str], filter_kwargs=None
+    ):
         """Returns a list of events given a filter, like this:
 
         >>> provider.get_events(currencywrapper, "Transfer", dict(from_block=0))
@@ -468,12 +471,36 @@ class W3Provider(BaseProvider):
             'blockNumber': 23
         })]
         """
-        contract = eth_wrapper.contract
-        event = getattr(contract.events, event_name)
-        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()
+        if filter_kwargs is None:
+            filter_kwargs = {}
+
+        if isinstance(event_names, (str, ContractEvent)):
+            # Backwards compatibility, if we don't get a list we're getting a single event name/ref
+            event_names = [event_names]
+
+        topics = {}
+
+        for name in event_names:
+            if isinstance(name, str):
+                # We got a plain event name, let's get the event from the contract
+                event: ContractEvent = getattr(eth_wrapper.contract.events, name)
+            else:
+                # Assume we already got an event reference
+                event: ContractEvent = name
+
+            topics[event.topic] = event
+
+        filter_params = {
+            "fromBlock": filter_kwargs.get("from_block", self.get_first_block(eth_wrapper)),
+            "toBlock": filter_kwargs.get("to_block", "latest"),
+            "address": eth_wrapper.contract.address,
+            "topics": [list(topics.keys())],
+        }
+
+        logs = self.w3.eth.get_logs(filter_params)
+
+        parsed_events = [topics[add_0x_prefix(log["topics"][0].hex())].process_log(log) for log in logs]
+        return parsed_events
 
     def init_eth_wrapper(self, eth_wrapper, owner, init_params, kwargs):
         eth_wrapper.owner = self.address_book.get_account(owner)
@@ -483,7 +510,7 @@ class W3Provider(BaseProvider):
         for lib, _ in contract_def.libraries():
             if lib not in libraries:
                 library_def = self.get_contract_factory(lib)
-                library = self.construct(library_def)
+                library = self.construct(library_def, transact_kwargs={"from": eth_wrapper.owner})
                 libraries[lib] = library.address
 
         if libraries:

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/src/ethproto/wrappers.py

@@ -303,7 +303,7 @@ class ETHWrapper:
     constructor_args = None
     initialize_args = None
 
-    def __init__(self, owner="owner", *init_params, **kwargs):
+    def __init__(self, owner=None, *init_params, **kwargs):
         self.provider_key = kwargs.get("provider_key", None)
         init_params = self._parse_init_params(init_params, kwargs)
         self.provider.init_eth_wrapper(self, owner, init_params, kwargs)

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/tests/conftest.py

@@ -24,11 +24,11 @@ def local_node_provider(hardhat_node):
     if os.environ.get("TEST_ENV", None) == "web3py":
         from web3 import Web3
 
-        from ethproto import w3wrappers, wrappers
+        from ethproto import w3wrappers
 
-        wrappers.register_provider("w3", w3wrappers.W3Provider(Web3(Web3.HTTPProvider(hardhat_node))))
+        w3wrappers.register_w3_provider("w3", Web3(Web3.HTTPProvider(hardhat_node)))
         yield
-        wrappers.register_provider("w3", w3wrappers.W3Provider(w3))
+        w3wrappers.register_w3_provider("w3", w3)
         return
     yield
 

eth_prototype-1.3.1/tests/hardhat-project/verifiable-binaries/@anotherOrg/aPkg/1.0.2/build/contracts/TestCurrency.sol/TestCurrency.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TestCurrency",
+  "sourceName": "contracts/TestCurrency.sol",
+  "abi": [],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

eth_prototype-1.3.1/tests/hardhat-project/verifiable-binaries/@org/pkg/0.2.1/build/contracts/TestCurrency.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TestCurrency",
+  "sourceName": "contracts/TestCurrency.sol",
+  "abi": [],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

eth_prototype-1.3.1/tests/hardhat-project/verifiable-binaries/@org/pkg/0.3.0/build/contracts/TestCurrency.json

@@ -0,0 +1,10 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "TestCurrency",
+  "sourceName": "contracts/TestCurrency.sol",
+  "abi": [],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/tests/test_build_artifacts.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 import pytest
 
@@ -122,3 +123,58 @@ def test_artifact_libraries_generator():
     artifact_with_no_libraries = library.get_artifact("contracts/Counter.sol")
     libraries = list(artifact_with_no_libraries.libraries())
     assert libraries == []
+
+
+def test_artifact_library_ref_lookup():
+    library = ArtifactLibrary(
+        os.path.join(HARDHAT_PROJECT, "artifacts"),
+        os.path.join(HARDHAT_PROJECT, "verifiable-binaries"),
+    )
+
+    assert library.get_artifact_by_ref("TestCurrency") == library.get_artifact("contracts/TestCurrency.sol")
+
+    # Testing the internal _find_ref method to avoid the need of actual artifacts and to better check the results.
+
+    # No package or version specified, local is loaded
+    assert library._find_ref("TestCurrency") == {
+        "path": Path(HARDHAT_PROJECT) / "artifacts" / "contracts" / "TestCurrency.sol" / "TestCurrency.json",
+        "package": "",
+        "version": "local",
+    }
+
+    # Local version explicitly requested
+    assert library._find_ref("TestCurrency@local") == {
+        "path": Path(HARDHAT_PROJECT) / "artifacts" / "contracts" / "TestCurrency.sol" / "TestCurrency.json",
+        "package": "",
+        "version": "local",
+    }
+
+    # Specific package requested, latest version is loaded
+    assert library._find_ref("@org/pkg/TestCurrency") == {
+        "path": Path(HARDHAT_PROJECT)
+        / "verifiable-binaries/@org/pkg/0.3.0/build/contracts/TestCurrency.json",
+        "package": "@org/pkg",
+        "version": "0.3.0",
+    }
+
+    # Specific package and version requested
+    assert library._find_ref("@org/pkg/TestCurrency@0.2.1") == {
+        "path": Path(HARDHAT_PROJECT)
+        / "verifiable-binaries/@org/pkg/0.2.1/build/contracts/TestCurrency.json",
+        "package": "@org/pkg",
+        "version": "0.2.1",
+    }
+
+    # Different package, latest version too
+    assert library._find_ref("@anotherOrg/aPkg/TestCurrency") == {
+        "path": Path(HARDHAT_PROJECT)
+        / "verifiable-binaries/@anotherOrg/aPkg/1.0.2/build/contracts/TestCurrency.sol/TestCurrency.json",
+        "package": "@anotherOrg/aPkg",
+        "version": "1.0.2",
+    }
+
+    # Specific version requested, not found
+    assert library._find_ref("@anotherOrg/aPkg/TestCurrency@1.2.0") is None
+
+    # Specific package requested, not found
+    assert library._find_ref("@anotherOrg/package2/TestCurrency") is None

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/tests/test_w3.py

@@ -1,8 +1,9 @@
 import os
 
 import pytest
+from web3 import Web3
 
-from ethproto import wrappers
+from ethproto import w3wrappers, wrappers
 
 pytestmark = [
     pytest.mark.skipif(os.environ.get("TEST_ENV", None) != "web3py", reason="web3py-only tests"),
@@ -36,7 +37,7 @@ class CounterUpgradeableWithLibrary(Counter):
 
 @pytest.mark.parametrize("contract_class", [Counter, CounterWithLibrary, CounterUpgradeableWithLibrary])
 def test_deploy_counter(contract_class):
-    counter = contract_class(initial_value=0)
+    counter = contract_class(initial_value=0, owner="owner")
     assert counter.value() == 0
     counter.increase()
     assert counter.value() == 1
@@ -51,7 +52,7 @@ class Datatypes(wrappers.ETHWrapper):
 def test_address_arguments():
     from eth_account import Account
 
-    wrapper = Datatypes()
+    wrapper = Datatypes(owner="owner")
 
     account = Account.create("TEST TEST TEST")
 
@@ -76,7 +77,7 @@ def test_wrapper_build_from_def():
     contract_def = provider.get_contract_def("Counter")
     wrapper = wrappers.ETHWrapper.build_from_def(contract_def)
 
-    counter = wrapper(initialValue=0)
+    counter = wrapper(initialValue=0, owner="owner")
     assert counter.value() == 0
     counter.increase()
     assert counter.value() == 1
@@ -87,7 +88,7 @@ def test_get_events():
     contract_def = provider.get_contract_def("EventLauncher")
     wrapper = wrappers.ETHWrapper.build_from_def(contract_def)
 
-    launcher = wrapper()
+    launcher = wrapper(owner="owner")
 
     launcher.launchEvent1(1)
 
@@ -109,3 +110,75 @@ def test_get_events():
     event2 = provider.get_events(launcher, "Event2")
     assert len(event2) == 1
     assert event2[0].args.value == 2
+
+
+def test_get_multiple_events():
+    provider = wrappers.get_provider("w3")
+    contract_def = provider.get_contract_def("EventLauncher")
+    wrapper = wrappers.ETHWrapper.build_from_def(contract_def)
+
+    launcher = wrapper(owner="owner")
+
+    launcher.launchEvent1(1)
+    launcher.launchEvent2(2)
+    launcher.launchEvent1(3)
+
+    all_events = provider.get_events(launcher, ["Event1", "Event2"], dict(from_block=0))
+    assert len(all_events) == 3
+
+    all_events_by_reference = provider.get_events(
+        launcher, [launcher.contract.events.Event1, launcher.contract.events.Event2], dict(from_block=0)
+    )
+    assert len(all_events_by_reference) == 3
+
+    all_events_mixed = provider.get_events(
+        launcher, ["Event1", launcher.contract.events.Event2], dict(from_block=0)
+    )
+    assert len(all_events_mixed) == 3
+
+    single_event_by_reference = provider.get_events(
+        launcher, launcher.contract.events.Event1, dict(from_block=0)
+    )
+    assert len(single_event_by_reference) == 2
+
+
+@pytest.fixture
+def sign_and_send(mocker, hardhat_node):
+    """Sets up sign-and-send transact mode with a well-known address, returns the address"""
+    mocker.patch("ethproto.w3wrappers.W3_TRANSACT_MODE", "sign-and-send")
+    mocker.patch.dict(
+        os.environ,
+        {"W3_ADDR_HARDHAT_18": "0xde9be858da4a475276426320d5e9262ecfc3ba460bfac56360bfa6c4c28b4ee0"},
+    )
+    # Force recreate the provider and its address book after patching the environment
+    w3wrappers.register_w3_provider("w3", Web3(Web3.HTTPProvider(hardhat_node)))
+    return "0xdD2FD4581271e230360230F9337D5c0430Bf44C0"
+
+
+def test_sign_and_send(sign_and_send):
+    # Deploy a contract using sign-and-send
+    wrapper = Datatypes(owner="HARDHAT_18")
+
+    assert wrapper.echoAddress("HARDHAT_18") == "HARDHAT_18"
+    assert wrappers.get_provider("w3").address_book.get_account("HARDHAT_18") == sign_and_send
+
+
+def test_sign_and_send_upgradeable(sign_and_send):
+    upgradeable = CounterUpgradeableWithLibrary(initial_value=0, owner="HARDHAT_18")
+    assert upgradeable.value() == 0
+    upgradeable.increase()
+    assert upgradeable.value() == 1
+
+
+def test_sign_and_send_interact_with_existing_contract(sign_and_send):
+    counter = Counter(initial_value=0, owner="HARDHAT_18")
+    assert counter.value() == 0  # sanity check
+
+    connected = Counter.connect(counter.contract.address)
+
+    # Interactions with the connected contract work as expected
+    assert connected.value() == 0
+    connected.increase()
+    assert connected.value() == 1
+
+    assert counter.value() == 1  # sanity check

{eth_prototype-1.3.0b1 → eth_prototype-1.3.1}/tox.ini

@@ -18,13 +18,10 @@ setenv =
     TOXINIDIR = {toxinidir}
     TEST_ENV = web3py
     WEB3_PROVIDER_URI = https://polygon-mainnet.g.alchemy.com/v2/FAKEY
+    W3_POA = no
 passenv =
     HOME
     WADRAY_USE_GMPY2
-    W3_*
-    TRANSACT_MODE
-    WEB3_PROVIDER_URI
-    WEB3_*
 extras =
     testing
 deps =