eth-prototype 1.3.3__tar.gz → 1.3.5__tar.gz

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.3
+Version: 1.3.5
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -33,6 +33,7 @@ Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
+Requires-Dist: responses; extra == "testing"
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: web3[tester]==7.*; extra == "testing"
 Dynamic: license-file

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/setup.cfg

@@ -48,6 +48,7 @@ testing =
 	pytest-cov
 	pytest-mock
 	pytest-recording
+	responses
 	setuptools
 	web3[tester]==7.*
 

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/src/eth_prototype.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.3
+Version: 1.3.5
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja
@@ -33,6 +33,7 @@ Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-cov; extra == "testing"
 Requires-Dist: pytest-mock; extra == "testing"
 Requires-Dist: pytest-recording; extra == "testing"
+Requires-Dist: responses; extra == "testing"
 Requires-Dist: setuptools; extra == "testing"
 Requires-Dist: web3[tester]==7.*; extra == "testing"
 Dynamic: license-file

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/src/eth_prototype.egg-info/requires.txt

@@ -20,6 +20,7 @@ pytest
 pytest-cov
 pytest-mock
 pytest-recording
+responses
 setuptools
 web3[tester]==7.*
 

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/src/ethproto/wrappers.py

@@ -17,7 +17,9 @@ DEFAULT_PROVIDER = env.str("DEFAULT_PROVIDER", None)
 
 ETHERSCAN_TOKEN = env.str("ETHERSCAN_TOKEN", None)
 ETHERSCAN_DOMAIN = env.str("ETHERSCAN_DOMAIN", "api.etherscan.io")
-ETHERSCAN_URL = env.str("ETHERSCAN_URL", "https://{domain}/api?apikey={token}&")
+ETHERSCAN_URL = env.str("ETHERSCAN_URL", "https://{domain}/v2/api?apikey={token}&chainid={chainid}&")
+ETHERSCAN_CHAIN_ID = env.int("ETHERSCAN_CHAIN_ID", None)
+
 AMOUNT_DECIMALS = env.int("AMOUNT_DECIMALS", 18)
 AMOUNT_CLASSNAME = env.str("AMOUNT_CLASSNAME", None)
 
@@ -31,6 +33,10 @@ MAXUINT256 = 2**256 - 1
 _providers = {}
 
 
+class EtherscanError(Exception):
+    ...
+
+
 def get_provider(provider_key=None):
     global DEFAULT_PROVIDER
     provider_key = provider_key or DEFAULT_PROVIDER
@@ -266,7 +272,8 @@ class BaseProvider(ABC):
     def get_etherscan_url(self):
         if ETHERSCAN_TOKEN is None:
             return None
-        return ETHERSCAN_URL.format(token=ETHERSCAN_TOKEN, domain=ETHERSCAN_DOMAIN)
+        chain_id = ETHERSCAN_CHAIN_ID or self.w3.eth.chain_id
+        return ETHERSCAN_URL.format(token=ETHERSCAN_TOKEN, domain=ETHERSCAN_DOMAIN, chainid=chain_id)
 
     def get_first_block(self, eth_wrapper):
         etherscan_url = self.get_etherscan_url()
@@ -275,15 +282,18 @@ class BaseProvider(ABC):
         address = self.get_contract_address(eth_wrapper)
         url = (
             etherscan_url
-            + f"&module=account&action=txlist&address={address}&startblock=0&"
+            + f"module=account&action=txlist&address={address}&startblock=0&"
             + "endblock=99999999&page=1&offset=10&sort=asc"
         )
         resp = requests.get(url)
         resp.raise_for_status()
         resp = resp.json()
-        if not resp["result"]:
-            return -1
-        return int(resp["result"][0]["blockNumber"])
+        if resp.get("status") != "1":
+            raise EtherscanError(f"Failed to get first block from {etherscan_url}:  {resp}")
+        try:
+            return int(resp["result"][0]["blockNumber"])
+        except (KeyError, TypeError):
+            raise EtherscanError(f"Failed to parse first block for {address}: {resp}")
 
     def get_contract_address(self, eth_wrapper):
         return eth_wrapper.contract.address

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/tests/test_aa_bundler.py

@@ -5,13 +5,21 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from hexbytes import HexBytes
-from web3.auto import w3
+from web3 import HTTPProvider, Web3
 from web3.constants import HASH_ZERO
+from web3.middleware import ExtraDataToPOAMiddleware
 
 from ethproto import aa_bundler
 from ethproto.test_utils import factories
 
 
+@pytest.fixture
+def w3():
+    w3 = Web3(HTTPProvider("http://example.org"))
+    w3.middleware_onion.inject(ExtraDataToPOAMiddleware, layer=0)
+    return w3
+
+
 def test_pack_two():
     assert aa_bundler.pack_two(0, 0) == HASH_ZERO
     assert aa_bundler.pack_two(1, 2) == "0x0000000000000000000000000000000100000000000000000000000000000002"
@@ -166,8 +174,8 @@ def test_get_nonce_with_local_cache(fetch_nonce_mock, randint_mock):
         fetch_nonce_mock.assert_not_called()
 
 
-def test_send_transaction():
-    w3 = MagicMock()
+def test_send_transaction(w3):
+    w3.eth = MagicMock()
     w3.eth.chain_id = CHAIN_ID
 
     tx = aa_bundler.Tx(
@@ -275,7 +283,8 @@ def test_random_key_nonces_are_thread_safe():
 
 
 @pytest.mark.vcr
-def test_build_user_operation():
+def test_build_user_operation(w3):
+
     tx = aa_bundler.Tx(
         value=0,
         chain_id=137,

{eth_prototype-1.3.3 → eth_prototype-1.3.5}/tests/test_w3.py

@@ -1,6 +1,9 @@
+import importlib
 import os
+import sys
 
 import pytest
+import responses
 from web3 import Web3
 
 from ethproto import w3wrappers, wrappers
@@ -11,6 +14,28 @@ pytestmark = [
 ]
 
 
+@pytest.fixture
+def provider_with_etherscan_env(mocker):
+    mocker.patch.dict(
+        os.environ,
+        {"ETHERSCAN_TOKEN": "abc123", "ETHERSCAN_DOMAIN": "api.etherscan.io"},
+    )
+    sys.modules.pop("ethproto.wrappers", None)
+    sys.modules.pop("ethproto.w3wrappers", None)
+    wrappers = importlib.import_module("ethproto.wrappers")
+    w3wrappers = importlib.import_module("ethproto.w3wrappers")
+
+    w3wrappers.register_w3_provider("w3_test", Web3(Web3.EthereumTesterProvider()))
+    provider = wrappers.get_provider("w3_test")
+
+    return provider
+
+
+class DummyWrapper:
+    address = "0x8e3aab1fc53e8b0f5d987c20b1899a2db3b2f95c"  # random generated address
+    contract = type("Contract", (), {"address": address})()
+
+
 class Counter(wrappers.ETHWrapper):
     eth_contract = "Counter"
     # libraries_required = []
@@ -182,3 +207,29 @@ def test_sign_and_send_interact_with_existing_contract(sign_and_send):
     assert connected.value() == 1
 
     assert counter.value() == 1  # sanity check
+
+
+def test_get_etherscan_url_v2_format(provider_with_etherscan_env):
+    provider = provider_with_etherscan_env
+    chainid = provider.w3.eth.chain_id
+    assert provider.get_etherscan_url() == f"https://api.etherscan.io/v2/api?apikey=abc123&chainid={chainid}&"
+
+
+@responses.activate
+def test_get_first_block_makes_request(provider_with_etherscan_env):
+    provider = provider_with_etherscan_env
+    address = "0x8e3aab1fc53e8b0f5d987c20b1899a2db3b2f95c"
+    chainid = provider.w3.eth.chain_id
+    responses.get(
+        f"https://api.etherscan.io/v2/api?apikey=abc123&chainid={chainid}&"
+        f"&module=account&action=txlist&address={address}&startblock=0&"
+        "endblock=99999999&page=1&offset=10&sort=asc",
+        json={"status": "1", "message": "OK", "result": [{"blockNumber": "1"}]},
+        status=200,
+    )
+
+    block = provider.get_first_block(DummyWrapper())
+    assert block == 1
+
+    assert len(responses.calls) == 1
+    assert responses.calls[0].request.url.startswith("https://api.etherscan.io")