eth-prototype 1.0.0__tar.gz → 1.0.1__tar.gz

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/.github/workflows/test.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v3

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/PKG-INFO

@@ -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
@@ -20,7 +20,7 @@ Requires-Dist: requests
 Requires-Dist: hexbytes
 Requires-Dist: importlib-metadata; python_version < "3.8"
 Provides-Extra: web3
-Requires-Dist: web3; extra == "web3"
+Requires-Dist: web3>=6; extra == "web3"
 Provides-Extra: defender
 Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
@@ -31,7 +31,7 @@ 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"

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/setup.cfg

@@ -35,7 +35,7 @@ exclude =
 
 [options.extras_require]
 web3 = 
-	web3
+	web3>=6
 defender = 
 	boto3
 gmpy2 = 
@@ -46,7 +46,7 @@ testing =
 	gmpy2
 	pytest-cov
 testing-w3 = 
-	web3[tester]
+	web3[tester]>=6
 	setuptools
 	pytest
 	pytest-cov

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/src/eth_prototype.egg-info/PKG-INFO

@@ -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
@@ -20,7 +20,7 @@ Requires-Dist: requests
 Requires-Dist: hexbytes
 Requires-Dist: importlib-metadata; python_version < "3.8"
 Provides-Extra: web3
-Requires-Dist: web3; extra == "web3"
+Requires-Dist: web3>=6; extra == "web3"
 Provides-Extra: defender
 Requires-Dist: boto3; extra == "defender"
 Provides-Extra: gmpy2
@@ -31,7 +31,7 @@ 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"

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/src/eth_prototype.egg-info/requires.txt

@@ -19,11 +19,11 @@ gmpy2
 pytest-cov
 
 [testing-w3]
-web3[tester]
+web3[tester]>=6
 setuptools
 pytest
 pytest-cov
 boto3
 
 [web3]
-web3
+web3>=6

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/src/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

{eth-prototype-1.0.0 → eth_prototype-1.0.1}/src/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 → eth_prototype-1.0.1}/tox.ini

@@ -4,13 +4,12 @@
 
 [tox]
 minversion = 3.15
-envlist = {py37,py38,py39}, {py37,py38,py39}-w3
+envlist = {py39,py310}, {py39,py310}-w3
 
 [gh-actions]
 python =
-    3.7: py37, py37-w3
-    3.8: py38, py38-w3
     3.9: py39, py39-w3
+    3.10: py310, py310-w3
 
 [testenv]
 description = invoke pytest to run automated tests
@@ -27,7 +26,7 @@ commands =
     pytest {posargs}
 
 
-[testenv:{py37,py38,py39}-w3]
+[testenv:{py39,py310}-w3]
 description = invoke pytest to run automated tests
 isolated_build = True
 setenv =