diff --git a/setup.cfg b/setup.cfg index ddc0d5c4..b440196d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [pycodestyle] max-line-length = 120 -ignore = E501, W605, W503, E127, E128 +ignore = E501, W605, W503, E127, E128, E721 exclude = env/* diff --git a/src/staketaxcsv/common/ibc/MsgInfoIBC.py b/src/staketaxcsv/common/ibc/MsgInfoIBC.py index f54eda62..8c0bcfb8 100644 --- a/src/staketaxcsv/common/ibc/MsgInfoIBC.py +++ b/src/staketaxcsv/common/ibc/MsgInfoIBC.py @@ -201,10 +201,6 @@ def amount_currency(self, amount_string): amount, currency = self.amount_currency_single(amount_raw, currency_raw) - # Convert from raw string to float amount and currency symbol - #amount, currency = MsgInfoIBC.amount_currency_from_raw( - # amount_raw, currency_raw, self.lcd_node, self.ibc_addresses) - out.append((amount, currency)) return out diff --git a/src/staketaxcsv/common/ibc/api_lcd_v2.py b/src/staketaxcsv/common/ibc/api_lcd_v2.py index 3c7725a6..22f1aa01 100644 --- a/src/staketaxcsv/common/ibc/api_lcd_v2.py +++ b/src/staketaxcsv/common/ibc/api_lcd_v2.py @@ -56,7 +56,7 @@ def get_txs(self, wallet_address, events_type, page=1, limit=TXS_LIMIT_PER_QUERY def _get_txs_one_by_one(self, wallet_address, events_type, page, limit, sleep_seconds): """ Rewrites original query by retrieving set of txs one-by-one. """ - p_start = (page-1) * limit + 1 + p_start = (page - 1) * limit + 1 p_end = page * limit elems = [] diff --git a/src/staketaxcsv/common/ibc/api_mintscan_v1.py b/src/staketaxcsv/common/ibc/api_mintscan_v1.py index 3162cce2..64cddd33 100644 --- a/src/staketaxcsv/common/ibc/api_mintscan_v1.py +++ b/src/staketaxcsv/common/ibc/api_mintscan_v1.py @@ -32,6 +32,7 @@ "STRD": "stride", } + class MintscanAPI: """ Mintscan API for fetching transaction data """ session = requests.Session() @@ -103,15 +104,15 @@ def get_txs_all(ticker, address, max_txs, progress=None, from_date=None, to_date progress.report_message(f"Starting fetch stage ...") for i in range(max_pages): logging.info("Fetching mintscan page %i for address=%s using search_after=%s, from_date=%s, to_date=%s", - i+1, address, search_after, from_date, to_date) + i + 1, address, search_after, from_date, to_date) elems, search_after, is_last_page = api.get_txs( address, search_after, limit=TXS_LIMIT_PER_QUERY, from_date=from_date, to_date=to_date) out.extend(elems) if progress: - message = f"Fetched page {i+1} ..." - progress.report(i+1, message) + message = f"Fetched page {i + 1} ..." + progress.report(i + 1, message) if is_last_page: break diff --git a/src/staketaxcsv/luna1/util_terra.py b/src/staketaxcsv/luna1/util_terra.py index ae6e024c..76e3846b 100644 --- a/src/staketaxcsv/luna1/util_terra.py +++ b/src/staketaxcsv/luna1/util_terra.py @@ -171,10 +171,6 @@ def _transfers_log(log, wallet_address, multicurrency=False): if k == "sender": sender = v - #recipient = attributes[i]["value"] - #sender = attributes[i + 1]["value"] - #amount_string = attributes[i + 2]["value"] - if recipient == wallet_address: if multicurrency: for amount, currency in _amounts(amount_string): diff --git a/src/staketaxcsv/settings_csv.py b/src/staketaxcsv/settings_csv.py index 540bec6a..ee1919f5 100644 --- a/src/staketaxcsv/settings_csv.py +++ b/src/staketaxcsv/settings_csv.py @@ -34,7 +34,7 @@ TORI_NODE = os.environ.get("STAKETAX_TORI_NODE", "") LUNA2_NODE = os.environ.get("STAKETAX_LUNA2_NODE", "https://phoenix-lcd.terra.dev") -########### Optional environment variables ######################################################## +# ########## Optional environment variables ######################################################## SOL_REWARDS_DB_READ = os.environ.get("STAKETAX_SOL_REWARDS_DB_READ", False) MINTSCAN_KEY = os.environ.get("STAKETAX_MINTSCAN_KEY", "") diff --git a/src/staketaxcsv/sol/api_rpc.py b/src/staketaxcsv/sol/api_rpc.py index 9fe6ffd7..dcabe343 100644 --- a/src/staketaxcsv/sol/api_rpc.py +++ b/src/staketaxcsv/sol/api_rpc.py @@ -33,7 +33,6 @@ def _fetch(cls, method, params_list): return result - @classmethod def fetch_account(cls, address): params_list = [address, {"encoding": "jsonParsed"}]