eth-prototype 1.3.0b1__py3-none-any.whl → 1.3.0b2__py3-none-any.whl

{eth_prototype-1.3.0b1.dist-info → eth_prototype-1.3.0b2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-prototype
-Version: 1.3.0b1
+Version: 1.3.0b2
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -26,14 +26,15 @@ 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"
 
 # eth-prototype
 

{eth_prototype-1.3.0b1.dist-info → eth_prototype-1.3.0b2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
-ethproto/aa_bundler.py,sha256=vVEiorWPpLq7ev8-wKUQ8fpgDZpaOz9LGlKGNFH0faU,14987
+ethproto/aa_bundler.py,sha256=HupCu7fRCwlE556WXDqytRU5GEFLdBoFYzjpqDHBtE4,15789
 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=4ZEnJFrc8bV1qHG4dNdom4FL1gEUhgoJORY6cGzlJDk,21549
+ethproto/w3wrappers.py,sha256=lmyfJLhQmPYrclmbzzsthH2cShlQb6LwavKq30jqxFE,21651
 ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
-ethproto/wrappers.py,sha256=9qDwRDOXw3wquzvGfIsub-VPWm98GBWP7dHLFOUPWzg,17307
+ethproto/wrappers.py,sha256=Mj2sgZmcLVmqsnNab6PqIXtNMMPyRVvUj2_8ButEd4w,17304
 ethproto/test_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.3.0b1.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.3.0b1.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
-eth_prototype-1.3.0b1.dist-info/METADATA,sha256=Ipe-jiFcOwqo89hto7kwoZ52UetWAmwC7i8y_5km0_g,2583
-eth_prototype-1.3.0b1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-eth_prototype-1.3.0b1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.3.0b1.dist-info/RECORD,,
+eth_prototype-1.3.0b2.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.3.0b2.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.3.0b2.dist-info/METADATA,sha256=VGLInjZc46w_OraflEsO2vG9yXmA_crJL0DVP5dFLvM,2630
+eth_prototype-1.3.0b2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+eth_prototype-1.3.0b2.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.3.0b2.dist-info/RECORD,,

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
 
@@ -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

ethproto/w3wrappers.py

@@ -111,7 +111,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 +211,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]
@@ -483,7 +483,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:

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)