eth-prototype 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

{eth_prototype-1.0.0.dist-info → eth_prototype-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eth-prototype
-Version: 1.0.0
+Version: 1.0.1
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -29,13 +29,13 @@ Requires-Dist: pytest ; extra == 'testing'
 Requires-Dist: gmpy2 ; extra == 'testing'
 Requires-Dist: pytest-cov ; extra == 'testing'
 Provides-Extra: testing-w3
-Requires-Dist: web3[tester] ; extra == 'testing-w3'
+Requires-Dist: web3[tester] >=6 ; extra == 'testing-w3'
 Requires-Dist: setuptools ; extra == 'testing-w3'
 Requires-Dist: pytest ; extra == 'testing-w3'
 Requires-Dist: pytest-cov ; extra == 'testing-w3'
 Requires-Dist: boto3 ; extra == 'testing-w3'
 Provides-Extra: web3
-Requires-Dist: web3 ; extra == 'web3'
+Requires-Dist: web3 >=6 ; extra == 'web3'
 
 # eth-prototype
 

eth_prototype-1.0.1.dist-info/RECORD

@@ -0,0 +1,13 @@
+ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
+ethproto/build_artifacts.py,sha256=FzgUO6ierhCVBKHRxTkgrRx4AaAL6G5ql5Yzx_oTTmg,5578
+ethproto/contracts.py,sha256=rNVbCK1hURy7lWKhzSdXgVWo3wx9O_Ghk-6PfgOsRNk,18662
+ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
+ethproto/w3wrappers.py,sha256=MrRf7GLFgDhKYKiTctjNONZHQNTo6nVzqPzprv0BU2w,20607
+ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
+ethproto/wrappers.py,sha256=9qDwRDOXw3wquzvGfIsub-VPWm98GBWP7dHLFOUPWzg,17307
+eth_prototype-1.0.1.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.0.1.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.0.1.dist-info/METADATA,sha256=TE-gm2NZKjLg7mgbihmuddG0XwORT7DrAM8UqtLPMtg,2669
+eth_prototype-1.0.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+eth_prototype-1.0.1.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.0.1.dist-info/RECORD,,

{eth_prototype-1.0.0.dist-info → eth_prototype-1.0.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.43.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ethproto/w3wrappers.py

@@ -8,7 +8,7 @@ from eth_account.signers.base import BaseAccount
 from eth_utils.abi import event_abi_to_log_topic
 from hexbytes import HexBytes
 from web3.contract import Contract
-from web3.exceptions import ExtraDataLengthError
+from web3.exceptions import ContractLogicError, ExtraDataLengthError
 from web3.middleware import geth_poa_middleware
 
 from .build_artifacts import ArtifactLibrary
@@ -97,7 +97,7 @@ def transact(provider, function, tx_kwargs):
         else:  # it's a string, I try to get the PK from the environment
             from_ = provider.address_book.get_signer_account(from_)
             tx_kwargs["from"] = from_.address
-        tx = function.buildTransaction(
+        tx = function.build_transaction(
             {
                 **tx_kwargs,
                 **{"nonce": provider.w3.eth.get_transaction_count(from_.address)},
@@ -109,7 +109,7 @@ def transact(provider, function, tx_kwargs):
         from .defender_relay import send_transaction
 
         tx_kwargs = {**provider.tx_kwargs, **tx_kwargs}
-        tx = function.buildTransaction(tx_kwargs)
+        tx = function.build_transaction(tx_kwargs)
         return send_transaction(tx)
 
     return provider.w3.eth.wait_for_transaction_receipt(tx_hash)
@@ -368,8 +368,12 @@ class W3ETHCall(ETHCall):
         return ReceiptWrapper(receipt, wrapper.contract)
 
     def _handle_exception(self, err):
-        if str(err).startswith("execution reverted: "):
-            raise RevertError(str(err)[len("execution reverted: ") :])
+        if isinstance(err, ContractLogicError):
+            raise RevertError(
+                err.message[len("execution reverted: ") :]
+                if err.message and err.message.startswith("execution reverted: ")
+                else err.message
+            )
         super()._handle_exception(err)
 
     @classmethod

ethproto/wrappers.py

@@ -49,10 +49,6 @@ def auto_register_provider(provider_key):
         from .w3wrappers import register_w3_provider
 
         register_w3_provider()
-    elif provider_key == "brownie":
-        from .brwrappers import BrownieProvider
-
-        register_provider("brownie", BrownieProvider())
     else:
         raise RuntimeError(f"Unknown provider {provider_key}")
 

eth_prototype-1.0.0.dist-info/RECORD

@@ -1,13 +0,0 @@
-ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
-ethproto/build_artifacts.py,sha256=FzgUO6ierhCVBKHRxTkgrRx4AaAL6G5ql5Yzx_oTTmg,5578
-ethproto/contracts.py,sha256=rNVbCK1hURy7lWKhzSdXgVWo3wx9O_Ghk-6PfgOsRNk,18662
-ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
-ethproto/w3wrappers.py,sha256=Z4REzEE56pv2IYbV1cNIh6xfYj24oE1llmI9Nyh0wgs,20445
-ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
-ethproto/wrappers.py,sha256=gUB4ml9jFZNXbmOnUJH2OdGz7G7qxHS9si7a64DpCTE,17448
-eth_prototype-1.0.0.dist-info/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.0.0.dist-info/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
-eth_prototype-1.0.0.dist-info/METADATA,sha256=cW-aeuxBJW1QpvCQ6tZgAUN_Qm9oXAqrADsfC3pT7TU,2661
-eth_prototype-1.0.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-eth_prototype-1.0.0.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.0.0.dist-info/RECORD,,