diff --git a/ape_subsquid/archive.py b/ape_subsquid/archive.py index 0a68697..72c3668 100644 --- a/ape_subsquid/archive.py +++ b/ape_subsquid/archive.py @@ -271,11 +271,11 @@ def _retry(self, request: Callable[..., T], *args, **kwargs) -> T: return response def _is_retryable_error(self, error: HTTPError) -> bool: - assert error.response + assert error.response is not None return error.response.status_code == 503 def _raise_error(self, error: HTTPError) -> ApeSubsquidError: - assert error.response + assert error.response is not None text = error.response.text if "not ready to serve block" in text: raise NotReadyToServeError(text) diff --git a/ape_subsquid/networks.py b/ape_subsquid/networks.py new file mode 100644 index 0000000..000d025 --- /dev/null +++ b/ape_subsquid/networks.py @@ -0,0 +1,14 @@ +from ape.api.query import QueryAPI + + +def get_network(engine: QueryAPI) -> str: + ecosystem_name = engine.network_manager.ecosystem.name + network_name = engine.network_manager.network.name + + if ecosystem_name == "bsc": + ecosystem_name = "binance" + elif ecosystem_name == "arbitrum": + if network_name == "mainnet": + network_name = "one" + + return f"{ecosystem_name}-{network_name}" diff --git a/ape_subsquid/query.py b/ape_subsquid/query.py index 2e88cb1..483ab77 100644 --- a/ape_subsquid/query.py +++ b/ape_subsquid/query.py @@ -23,6 +23,7 @@ TxFieldSelection, ) from ape_subsquid.mappings import map_header, map_log, map_receipt +from ape_subsquid.networks import get_network class SubsquidQueryEngine(QueryAPI): @@ -200,9 +201,3 @@ def archive_ingest(archive: Archive, network: str, query: Query) -> Iterator[lis break query["fromBlock"] = last_block["header"]["number"] + 1 - - -def get_network(engine: QueryAPI) -> str: - ecosystem_name = engine.network_manager.ecosystem.name - network_name = engine.network_manager.network.name - return f"{ecosystem_name}-{network_name}"