From c9e1e426e5521eb86ffa802acefac4dc878b1f77 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 11:32:42 +0300 Subject: [PATCH 01/19] TODO: recheck this endless cycle --- proxy/indexer/indexer_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/indexer/indexer_base.py b/proxy/indexer/indexer_base.py index 381ad4fe5..eeb8f0e03 100644 --- a/proxy/indexer/indexer_base.py +++ b/proxy/indexer/indexer_base.py @@ -131,6 +131,7 @@ def _get_tx_receipts(self, solana_signature): except Exception as err: self.debug(err) time.sleep(1) + # TODO: recheck this endless cycle self.counter_ += 1 if self.counter_ % 100 == 0: From f6cc76a1d72609dad74bb7a352cf6a5305edac50 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 11:54:26 +0300 Subject: [PATCH 02/19] write an error on Exception on submitting transaction --- proxy/indexer/indexer_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/indexer_db.py b/proxy/indexer/indexer_db.py index e83ec35e2..4ce272288 100644 --- a/proxy/indexer/indexer_db.py +++ b/proxy/indexer/indexer_db.py @@ -44,7 +44,7 @@ def submit_transaction(self, neon_tx: NeonTxInfo, neon_res: NeonTxResultInfo, us self._txs_db.set_tx(tx) except Exception as err: err_tb = "".join(traceback.format_tb(err.__traceback__)) - self.warning('Exception on submitting transaction. ' + + self.error('Exception on submitting transaction. ' + f'Type(err): {type(err)}, Error: {err}, Traceback: {err_tb}') def _fill_block_from_net(self, block: SolanaBlockDBInfo): From 59352b188c8830a1ba2e6c62fd6992eca29733a0 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 11:56:29 +0300 Subject: [PATCH 03/19] write an error on Failed to read product account --- proxy/indexer/pythnetwork.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/pythnetwork.py b/proxy/indexer/pythnetwork.py index 57392ef7c..2d229199f 100644 --- a/proxy/indexer/pythnetwork.py +++ b/proxy/indexer/pythnetwork.py @@ -161,7 +161,7 @@ def update_mapping(self, mapping_acc: PublicKey): self.info(f'Product account {prod_acc}: {symbol}') self.price_accounts[symbol] = product['price_acc'] except Exception as err: - self.warning(f'Failed to read product account {prod_acc}: {err}') + self.error(f'Failed to read product account {prod_acc}: {err}') continue def get_price(self, symbol): From 63178b4c2ca4157b0b0fdd608741a16e0f936c26 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:01:21 +0300 Subject: [PATCH 04/19] write an error on Neon tx rlp error --- proxy/indexer/indexer.py | 7 ++----- proxy/indexer/utils.py | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index 32c50a874..93703ff20 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -266,7 +266,7 @@ def neon_addr_fmt(neon_tx: NeonTxInfo): def _getadd_tx(self, storage_account, neon_tx=None, blocked_accounts=[str]) -> NeonTxObject: tx = self.state.get_tx(storage_account) if tx and neon_tx and tx.neon_tx and (neon_tx.sign != tx.neon_tx.sign): - self._log_warning(f'storage {storage_account}, tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx})') + self.warning(f'storage {storage_account}, tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx})') self.state.unmark_ix_used(tx) self.state.del_tx(tx) tx = None @@ -278,9 +278,6 @@ def _getadd_tx(self, storage_account, neon_tx=None, blocked_accounts=[str]) -> N tx.neon_tx = neon_tx return tx - def _log_warning(self, msg: str): - self.warning(f'{self}: {msg}') - def _decoding_start(self): """ Start decoding process: @@ -369,7 +366,7 @@ def _init_tx_from_holder(self, holder_account: str, storage_account: str, blocke rlp_error = tx.neon_tx.decode(rlp_sign=rlp_sign, rlp_data=bytes(rlp_data)) if rlp_error: - self._log_warning(f'Neon tx rlp error "{rlp_error}"') + self.error(f'Neon tx rlp error "{rlp_error}"') tx.holder_account = holder_account tx.move_ix_used(holder) diff --git a/proxy/indexer/utils.py b/proxy/indexer/utils.py index cb1d75f73..2c9e8989a 100644 --- a/proxy/indexer/utils.py +++ b/proxy/indexer/utils.py @@ -212,7 +212,6 @@ def decode(self, rlp_sign: bytes, rlp_data: bytes): return None except Exception as e: - self.warning(f'Exception on RLP decoding: {e}') self.error = e return self.error From e5f82448b2c0fe8945be132e6d456e0f60d81370 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:03:43 +0300 Subject: [PATCH 05/19] write an error on ERR: solana error --- proxy/indexer/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/utils.py b/proxy/indexer/utils.py index 2c9e8989a..f20f8b475 100644 --- a/proxy/indexer/utils.py +++ b/proxy/indexer/utils.py @@ -456,7 +456,7 @@ def call(self, *args): self.debug(cmd) return subprocess.check_output(cmd, universal_newlines=True) except subprocess.CalledProcessError as err: - self.debug("ERR: solana error {}".format(err)) + self.error("ERR: solana error {}".format(err)) raise def unlock_accounts(self, blocked_storages): From 87d2f6bdff60c9c20592231b098792f47629c2b0 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:05:14 +0300 Subject: [PATCH 06/19] write an error on Exception on eth_estimateGas --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index 5b0b0f1cb..d01fc0c28 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -113,7 +113,7 @@ def eth_estimateGas(self, param): value = param.get('value', "") return estimate_gas(self.client, self.signer, contract_id, EthereumAddress(caller_id), data, value) except Exception as err: - self.debug("Exception on eth_estimateGas: %s", err) + self.error("Exception on eth_estimateGas: %s", err) raise def __repr__(self): From 620e52f84408197cdf5f8266ba5b7b2685203bde Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:10:04 +0300 Subject: [PATCH 07/19] write an error on eth_getStorageAt on Neon-cli failed to execute --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index d01fc0c28..adf80665d 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -216,7 +216,7 @@ def eth_getStorageAt(self, account, position, block_identifier): value = neon_cli().call('get-storage-at', account, position) return value except Exception as err: - self.debug(f"Neon-cli failed to execute: {err}") + self.error(f"eth_getStorageAt: Neon-cli failed to execute: {err}") return '0x00' def eth_getBlockByHash(self, block_hash, full): From 84a1bef1cad472fb93e9a7c192b91a10b657ea21 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:11:03 +0300 Subject: [PATCH 08/19] write an error on eth_call Exception --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index adf80665d..87b188429 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -273,7 +273,7 @@ def eth_call(self, obj, tag): value = obj.get('value', '') return "0x"+call_emulated(contract_id, caller_id, data, value)['result'] except Exception as err: - self.debug("eth_call %s", err) + self.error("eth_call Exception %s", err) raise def eth_getTransactionCount(self, account, tag): From 6089519f79a18a4393423f38dca5b91ea5af7183 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:13:13 +0300 Subject: [PATCH 09/19] write an error on eth_getTransactionCount: Can't get account info --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index 87b188429..678855f41 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -282,7 +282,7 @@ def eth_getTransactionCount(self, account, tag): acc_info = getAccountInfo(self.client, EthereumAddress(account)) return hex(int.from_bytes(acc_info.trx_count, 'little')) except Exception as err: - print("Can't get account info: %s"%err) + self.error("eth_getTransactionCount: Can't get account info: %s", err) return hex(0) def _getTransactionReceipt(self, tx): From 1c93cc4708c3a00ff7fe6419efd1b4ee2853d281 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:15:35 +0300 Subject: [PATCH 10/19] write an error on eth_sendRawTransaction Exception --- proxy/plugin/solana_rest_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index 678855f41..cffcf7533 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -395,10 +395,10 @@ def eth_sendRawTransaction(self, rawTrx): self._log_transaction_error(err) raise except EthereumError as err: - self.debug("eth_sendRawTransaction EthereumError:%s", err) + self.error("eth_sendRawTransaction EthereumError:%s", err) raise except Exception as err: - self.debug("eth_sendRawTransaction type(err):%s, Exception:%s", type(err), err) + self.error("eth_sendRawTransaction type(err):%s, Exception:%s", type(err), err) raise def _log_transaction_error(self, error: SolanaTrxError): From afe246fda36ba99c72a0821ef6bf738acd4a8314 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:17:01 +0300 Subject: [PATCH 11/19] write an error on Exception on process request --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index cffcf7533..ab30e73b6 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -527,7 +527,7 @@ def process_request(self, request): response['error'] = err.getError() except Exception as err: err_tb = "".join(traceback.format_tb(err.__traceback__)) - self.warning('Exception on process request. ' + + self.error('Exception on process request. ' + f'Type(err): {type(err)}, Error: {err}, Traceback: {err_tb}') response['error'] = {'code': -32000, 'message': str(err)} From b897755ed8acd8032b3e3d9d0d19722b82eb6fe4 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:24:49 +0300 Subject: [PATCH 12/19] write an info message on handle_request <<< and >>> --- proxy/plugin/solana_rest_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index ab30e73b6..b0e5a2b68 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -545,7 +545,7 @@ def handle_request(self, request: HttpParser) -> None: }))) return start_time = time.time() - self.debug('<<< %s 0x%x %s', threading.get_ident(), id(self.model), request.body.decode('utf8')) + self.info('<<< %s 0x%x %s', threading.get_ident(), id(self.model), request.body.decode('utf8')) response = None try: @@ -566,7 +566,7 @@ def handle_request(self, request: HttpParser) -> None: response = {'jsonrpc': '2.0', 'error': {'code': -32000, 'message': str(err)}} resp_time_ms = (time.time() - start_time)*1000 # convert this into milliseconds - self.debug('>>> %s 0x%0x %s %s resp_time_ms= %s', threading.get_ident(), id(self.model), json.dumps(response), + self.info('>>> %s 0x%0x %s %s resp_time_ms= %s', threading.get_ident(), id(self.model), json.dumps(response), request.get('method', '---'), resp_time_ms) From 8ce4e9f77d89dfe3f847259b7ebac02bde712028 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 12:41:47 +0300 Subject: [PATCH 13/19] Introdueced RETRY_ON_FAIL_ON_GETTING_CONFIRMED_TRANSACTION Refactored the endless cycle in indexer_base.py _get_tx_receipts --- proxy/environment.py | 1 + proxy/indexer/indexer_base.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/proxy/environment.py b/proxy/environment.py index 01f1a125e..2dd75b12a 100644 --- a/proxy/environment.py +++ b/proxy/environment.py @@ -18,6 +18,7 @@ WRITE_TRANSACTION_COST_IN_DB = os.environ.get("WRITE_TRANSACTION_COST_IN_DB", "NO") == "YES" RETRY_ON_BLOCKED = max(int(os.environ.get("RETRY_ON_BLOCKED", "32")), 1) RETRY_ON_FAIL = int(os.environ.get("RETRY_ON_FAIL", "2")) +RETRY_ON_FAIL_ON_GETTING_CONFIRMED_TRANSACTION = max(int(os.environ.get("RETRY_ON_FAIL_ON_GETTING_CONFIRMED_TRANSACTION", "1000")), 1) @logged_group("neon.proxy") diff --git a/proxy/indexer/indexer_base.py b/proxy/indexer/indexer_base.py index eeb8f0e03..f85293d56 100644 --- a/proxy/indexer/indexer_base.py +++ b/proxy/indexer/indexer_base.py @@ -6,6 +6,8 @@ from typing import Dict, Union from logged_groups import logged_group +from ..environment import RETRY_ON_FAIL_ON_GETTING_CONFIRMED_TRANSACTION + try: from sql_dict import SQLDict from trx_receipts_storage import TrxReceiptsStorage @@ -38,7 +40,6 @@ def __init__(self, self.max_known_tx = self.transaction_receipts.max_known_trx() self._move_data_from_old_table() - def _move_data_from_old_table(self): if self.transaction_receipts.size() == 0: transaction_receipts_old = SQLDict(tablename="known_transactions") @@ -107,7 +108,6 @@ def gather_unknown_transactions(self): self.debug(max_known_tx) self.max_known_tx = max_known_tx - def _get_signatures(self, before, until): opts: Dict[str, Union[int, str]] = {} if until is not None: @@ -118,20 +118,21 @@ def _get_signatures(self, before, until): result = self.client._provider.make_request("getSignaturesForAddress", self.evm_loader_id, opts) return result['result'] - def _get_tx_receipts(self, solana_signature): # trx = None - retry = True + retry = RETRY_ON_FAIL_ON_GETTING_CONFIRMED_TRANSACTION - while retry: + while retry > 0: try: trx = self.client.get_confirmed_transaction(solana_signature)['result'] self._add_trx(solana_signature, trx) - retry = False + retry = 0 except Exception as err: - self.debug(err) + self.debug(f'Exception on get_confirmed_transaction: "{err}"') time.sleep(1) - # TODO: recheck this endless cycle + retry -= 1 + if retry == 0: + self.error(f'Exception on get_confirmed_transaction: "{err}"') self.counter_ += 1 if self.counter_ % 100 == 0: From 4eba52bf7abc9dabea1902b61d1872acf781d665 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 13:31:58 +0300 Subject: [PATCH 14/19] Added current parsed instruction --- proxy/indexer/indexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index 93703ff20..dd576c0ad 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -266,7 +266,7 @@ def neon_addr_fmt(neon_tx: NeonTxInfo): def _getadd_tx(self, storage_account, neon_tx=None, blocked_accounts=[str]) -> NeonTxObject: tx = self.state.get_tx(storage_account) if tx and neon_tx and tx.neon_tx and (neon_tx.sign != tx.neon_tx.sign): - self.warning(f'storage {storage_account}, tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx})') + self.warning(f'tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx}); current parsed instruction {self.str()}, storage {storage_account}') self.state.unmark_ix_used(tx) self.state.del_tx(tx) tx = None From 58e7d4e511496d87ea8c7bef8302812750b70278 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 14:10:56 +0300 Subject: [PATCH 15/19] Added current parsed instruction --- proxy/indexer/indexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index dd576c0ad..6cb16615f 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -266,7 +266,7 @@ def neon_addr_fmt(neon_tx: NeonTxInfo): def _getadd_tx(self, storage_account, neon_tx=None, blocked_accounts=[str]) -> NeonTxObject: tx = self.state.get_tx(storage_account) if tx and neon_tx and tx.neon_tx and (neon_tx.sign != tx.neon_tx.sign): - self.warning(f'tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx}); current parsed instruction {self.str()}, storage {storage_account}') + self.warning(f'tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx}); current parsed instruction: {self}, storage: {storage_account}') self.state.unmark_ix_used(tx) self.state.del_tx(tx) tx = None From 0457cd55e33cbecd0f872b10daef8cf8b447c860 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 14:37:08 +0300 Subject: [PATCH 16/19] Added current parsed instruction --- proxy/indexer/indexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index 6cb16615f..794268ab4 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -366,7 +366,7 @@ def _init_tx_from_holder(self, holder_account: str, storage_account: str, blocke rlp_error = tx.neon_tx.decode(rlp_sign=rlp_sign, rlp_data=bytes(rlp_data)) if rlp_error: - self.error(f'Neon tx rlp error "{rlp_error}"') + self.error(f'Neon tx rlp error: {rlp_error}, on instruction: {self}') tx.holder_account = holder_account tx.move_ix_used(holder) From 9cffbbd05138af89fc30642732fb5e0040a7c36d Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 15:09:11 +0300 Subject: [PATCH 17/19] Use string format: f' {}' --- proxy/plugin/solana_rest_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index b0e5a2b68..c09e7f5bd 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -113,7 +113,7 @@ def eth_estimateGas(self, param): value = param.get('value', "") return estimate_gas(self.client, self.signer, contract_id, EthereumAddress(caller_id), data, value) except Exception as err: - self.error("Exception on eth_estimateGas: %s", err) + self.error(f'Exception on eth_estimateGas: {err}') raise def __repr__(self): From 62e0b53c486be6115ed08e0db1257f2fea8eb3f8 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Thu, 20 Jan 2022 16:39:08 +0300 Subject: [PATCH 18/19] Refactored to revert to previous format --- proxy/indexer/indexer.py | 2 +- proxy/plugin/solana_rest_api.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index 794268ab4..4aad5ffea 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -266,7 +266,7 @@ def neon_addr_fmt(neon_tx: NeonTxInfo): def _getadd_tx(self, storage_account, neon_tx=None, blocked_accounts=[str]) -> NeonTxObject: tx = self.state.get_tx(storage_account) if tx and neon_tx and tx.neon_tx and (neon_tx.sign != tx.neon_tx.sign): - self.warning(f'tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx}); current parsed instruction: {self}, storage: {storage_account}') + self.warning(f'{self}: tx.neon_tx({tx.neon_tx}) != neon_tx({neon_tx}), storage: {storage_account}') self.state.unmark_ix_used(tx) self.state.del_tx(tx) tx = None diff --git a/proxy/plugin/solana_rest_api.py b/proxy/plugin/solana_rest_api.py index c09e7f5bd..2a93cbf65 100644 --- a/proxy/plugin/solana_rest_api.py +++ b/proxy/plugin/solana_rest_api.py @@ -113,7 +113,7 @@ def eth_estimateGas(self, param): value = param.get('value', "") return estimate_gas(self.client, self.signer, contract_id, EthereumAddress(caller_id), data, value) except Exception as err: - self.error(f'Exception on eth_estimateGas: {err}') + self.error("Exception on eth_estimateGas: {}".format(err)) raise def __repr__(self): @@ -545,7 +545,7 @@ def handle_request(self, request: HttpParser) -> None: }))) return start_time = time.time() - self.info('<<< %s 0x%x %s', threading.get_ident(), id(self.model), request.body.decode('utf8')) + self.info('handle_request <<< %s 0x%x %s', threading.get_ident(), id(self.model), request.body.decode('utf8')) response = None try: @@ -566,7 +566,7 @@ def handle_request(self, request: HttpParser) -> None: response = {'jsonrpc': '2.0', 'error': {'code': -32000, 'message': str(err)}} resp_time_ms = (time.time() - start_time)*1000 # convert this into milliseconds - self.info('>>> %s 0x%0x %s %s resp_time_ms= %s', threading.get_ident(), id(self.model), json.dumps(response), + self.info('handle_request >>> %s 0x%0x %s %s resp_time_ms= %s', threading.get_ident(), id(self.model), json.dumps(response), request.get('method', '---'), resp_time_ms) From 82a39148d336fe82545deefc90e7fa3aa2a68e04 Mon Sep 17 00:00:00 2001 From: Vasiliy Zaznobin Date: Fri, 21 Jan 2022 09:37:03 +0300 Subject: [PATCH 19/19] Refactored to revert to previous format --- proxy/indexer/indexer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/indexer/indexer.py b/proxy/indexer/indexer.py index 4aad5ffea..1b5a39009 100644 --- a/proxy/indexer/indexer.py +++ b/proxy/indexer/indexer.py @@ -366,7 +366,7 @@ def _init_tx_from_holder(self, holder_account: str, storage_account: str, blocke rlp_error = tx.neon_tx.decode(rlp_sign=rlp_sign, rlp_data=bytes(rlp_data)) if rlp_error: - self.error(f'Neon tx rlp error: {rlp_error}, on instruction: {self}') + self.error(f'{self} Neon tx rlp error: {rlp_error}') tx.holder_account = holder_account tx.move_ix_used(holder)