eth-prototype 1.3.4__py3-none-any.whl → 1.3.5__py3-none-any.whl

{eth_prototype-1.3.4.dist-info → eth_prototype-1.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth-prototype
-Version: 1.3.4
+Version: 1.3.5
 Summary: Prototype Ethereum Smart Contracts in Python
 Home-page: https://github.com/gnarvaja/eth-prototype
 Author: Guillermo M. Narvaja

{eth_prototype-1.3.4.dist-info → eth_prototype-1.3.5.dist-info}/RECORD

@@ -1,5 +1,5 @@
-eth_prototype-1.3.4.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
-eth_prototype-1.3.4.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
+eth_prototype-1.3.5.dist-info/licenses/AUTHORS.rst,sha256=Ui-05yYXtDZxna6o1yNcfdm8Jt68UIDQ01osiLxlYlU,95
+eth_prototype-1.3.5.dist-info/licenses/LICENSE.txt,sha256=U_Q6_nDYDwZPIuhttHi37hXZ2qU2-HlV2geo9hzHXFw,1087
 ethproto/__init__.py,sha256=YWkAFysBp4tZjLWWB2FFmp5yG23pUYhQvgQW9b3soXs,579
 ethproto/aa_bundler.py,sha256=W47fIA_w7orUu7yczfHPaHpUJRFh5op0YZHPgW3Iwik,17420
 ethproto/build_artifacts.py,sha256=whIXEqnh5f89UYu4Cb3KDigGV7juUCbDnfZkg-SYMKA,9878
@@ -7,12 +7,12 @@ ethproto/contracts.py,sha256=rNVbCK1hURy7lWKhzSdXgVWo3wx9O_Ghk-6PfgOsRNk,18662
 ethproto/defender_relay.py,sha256=05A8TfRZwiBhCpo924Pf9CjfKSir2Wvgg1p_asFxJbw,1777
 ethproto/w3wrappers.py,sha256=aA5yQ25d01s8gtWkGSxSEZlVRdq6JM1ceS3cfvSj4uM,22614
 ethproto/wadray.py,sha256=JBsu5KcyU9k70bDK03T2IY6qPVFO30WbYPhwrAHdXao,8262
-ethproto/wrappers.py,sha256=ggZxNBCC-EqgvR3qj4DdHPehewQ96FjXGemWl769DGc,17376
+ethproto/wrappers.py,sha256=kqv6_1lPbRBlncaeMtXjas80GSxzErflN_KwawYyL3E,17725
 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.4.dist-info/METADATA,sha256=xZ2xRsL3AW-Un8yUO0Dh2uDMORYqdPtD8RdWAbTEKNs,2695
-eth_prototype-1.3.4.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-eth_prototype-1.3.4.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
-eth_prototype-1.3.4.dist-info/RECORD,,
+eth_prototype-1.3.5.dist-info/METADATA,sha256=e7dqeWwx0k7h3zIJLkhi_uKAt2X9KJFkHiZ8rMk97Fs,2695
+eth_prototype-1.3.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eth_prototype-1.3.5.dist-info/top_level.txt,sha256=Dl0X7m6N1hxeo4JpGpSNqWC2gtsN0731g-DL1J0mpjc,9
+eth_prototype-1.3.5.dist-info/RECORD,,

{eth_prototype-1.3.4.dist-info → eth_prototype-1.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ethproto/wrappers.py

@@ -18,6 +18,8 @@ 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}/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,9 +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, chainid=self.w3.eth.chain_id
-        )
+        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()
@@ -283,9 +288,12 @@ class BaseProvider(ABC):
         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