From 017154207c8da2381a154bb71661e2ac4efc54a3 Mon Sep 17 00:00:00 2001 From: Andrey Date: Wed, 25 Oct 2023 14:21:24 +0300 Subject: [PATCH] Add changes. Delete object log. --- .../mooncrawl/mooncrawl/state_crawler/cli.py | 14 ++-- .../state_crawler/jobs/mumbai-jobs.json | 70 +++++++++++++++++++ 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/crawlers/mooncrawl/mooncrawl/state_crawler/cli.py b/crawlers/mooncrawl/mooncrawl/state_crawler/cli.py index 5ff280e0..8f09f5ee 100644 --- a/crawlers/mooncrawl/mooncrawl/state_crawler/cli.py +++ b/crawlers/mooncrawl/mooncrawl/state_crawler/cli.py @@ -90,7 +90,10 @@ def execute_query(query: Dict[str, Any], token: str): result = [] for item in data: - result.append(tuple([item[key] for key in keys])) + if len(keys) == 1: + result.append(item[keys[0]]) + else: + result.append(tuple([item[key] for key in keys])) return result @@ -193,7 +196,7 @@ def crawl_calls_level( block_number, blockchain_type, block_timestamp, - max_batch_size=5000, + max_batch_size=3000, min_batch_size=4, ): calls_of_level = [] @@ -203,8 +206,6 @@ def crawl_calls_level( continue parameters = [] - logger.info(f"Call: {json.dumps(call, indent=4)}") - for input in call["inputs"]: if type(input["value"]) in (str, int): if input["value"] not in responces: @@ -260,9 +261,6 @@ def crawl_calls_level( block_number, ) make_multicall_result = future.result(timeout=20) - logger.info( - f"Multicall2 returned {len(make_multicall_result)} results at block {block_number}" - ) retry = 0 calls_of_level = calls_of_level[batch_size:] logger.info(f"lenght of task left {len(calls_of_level)}.") @@ -274,7 +272,7 @@ def crawl_calls_level( time.sleep(4) if retry > 5: raise (e) - batch_size = max(batch_size // 3, min_batch_size) + batch_size = max(batch_size // 4, min_batch_size) except TimeoutError as e: # timeout logger.error(f"TimeoutError: {e}, retrying") retry += 1 diff --git a/crawlers/mooncrawl/mooncrawl/state_crawler/jobs/mumbai-jobs.json b/crawlers/mooncrawl/mooncrawl/state_crawler/jobs/mumbai-jobs.json index 6de0ccc9..0f66c036 100644 --- a/crawlers/mooncrawl/mooncrawl/state_crawler/jobs/mumbai-jobs.json +++ b/crawlers/mooncrawl/mooncrawl/state_crawler/jobs/mumbai-jobs.json @@ -62,5 +62,75 @@ } ], "address": "0x230E4e85d4549343A460F5dE0a7035130F62d74C" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "seasonId", + "type": "uint256", + "value": 1 + }, + { + "internalType": "address", + "name": "user", + "type": "address", + "value": { + "type": "queryAPI", + "query_url": "twilight_tactics_players", + "blockchain": "mumbai", + "params": { + "season_id": "1" + }, + "keys": [ + "player" + ] + } + } + ], + "name": "twtGetSeasonalDominationPointsByAccount", + "address": "0xb93D53A10793C7EA7DaE973625C9BB3b18Eec2A7", + "outputs": [ + { + "internalType": "uint256[5]", + "name": "shadowcornDominationPoints", + "type": "uint256[5]" + }, + { + "internalType": "uint256[5]", + "name": "unicornDominationPoints", + "type": "uint256[5]" + } + ], + "stateMutability": "view", + "type": "function", + "selector": "0x1c109952" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "seasonId", + "type": "uint256", + "value": 1 + } + ], + "name": "twtGetSeasonalDominationPointsForAllRegions", + "address": "0xb93D53A10793C7EA7DaE973625C9BB3b18Eec2A7", + "outputs": [ + { + "internalType": "uint256[5]", + "name": "shadowcornDominationPoints", + "type": "uint256[5]" + }, + { + "internalType": "uint256[5]", + "name": "unicornDominationPoints", + "type": "uint256[5]" + } + ], + "stateMutability": "view", + "type": "function", + "selector": "0xa491c0f6" } ] \ No newline at end of file