diff --git a/block_details_database.py b/block_details_database.py index 0c05e27..547d7f3 100644 --- a/block_details_database.py +++ b/block_details_database.py @@ -12,7 +12,7 @@ def find_block_by_slotnumber(slot_number: int): SELECT * FROM ( SELECT slot, - block_hash,e + block_hash, leader_identity, processed_transactions, successful_transactions, @@ -20,7 +20,7 @@ def find_block_by_slotnumber(slot_number: int): total_cu_used, total_cu_requested, heavily_writelocked_accounts, - heavily_readlocked_accounts, + heavily_readlocked_accounts FROM banking_stage_results.blocks -- this critera uses index idx_blocks_slot WHERE slot = %s @@ -36,11 +36,11 @@ def find_block_by_slotnumber(slot_number: int): # format see BankingStageErrorsTrackingSidecar -> block_info.rs # parse (k:GubTBrbgk9JwkwX1FkXvsrF1UC2AP7iTgg8SGtgH14QE, cu_req:600000, cu_con:2243126) - parsed_accounts = row["heavily_writelocked_accounts"] + parsed_accounts = json.loads(row["heavily_writelocked_accounts"]) parsed_accounts.sort(key=lambda acc: int(acc['cu_consumed']), reverse=True) row["heavily_writelocked_accounts_parsed"] = parsed_accounts - parsed_accounts = row["heavily_readlocked_accounts"] + parsed_accounts = json.loads(row["heavily_readlocked_accounts"]) parsed_accounts.sort(key=lambda acc: int(acc['cu_consumed']), reverse=True) row["heavily_readlocked_accounts_parsed"] = parsed_accounts diff --git a/recent_blocks_database.py b/recent_blocks_database.py index 2c56b41..fc4641d 100644 --- a/recent_blocks_database.py +++ b/recent_blocks_database.py @@ -12,14 +12,14 @@ def format_width_percentage(x): def calc_figures(row): successful_transactions = row['successful_transactions'] processed_transactions = row['processed_transactions'] - banking_stage_errors = row['banking_stage_errors'] + banking_stage_errors = row['banking_stage_errors'] or 0 txerrors = processed_transactions - successful_transactions row['txerrors'] = txerrors def calc_bars(row): successful_transactions = row['successful_transactions'] processed_transactions = row['processed_transactions'] - banking_stage_errors = row['banking_stage_errors'] + banking_stage_errors = row['banking_stage_errors'] or 0 total = processed_transactions + banking_stage_errors if total > 0: row['hide_bar'] = False @@ -81,6 +81,7 @@ def run_query(): for row in maprows: calc_bars(row) + row['banking_stage_errors'] = row['banking_stage_errors'] or 0 calc_figures(row) return maprows diff --git a/templates/block_details.html b/templates/block_details.html index 0abf15a..85ceef4 100644 --- a/templates/block_details.html +++ b/templates/block_details.html @@ -57,7 +57,8 @@
@@ -69,7 +70,7 @@ - + @@ -78,32 +79,32 @@ {% for write_account in block.heavily_writelocked_accounts_parsed %} - - + + {% endfor %} - +
Accounts CU requested CU consumed
- +
{{write_account.k}} + class="font-monospace">{{write_account.key}}
{{write_account.cu_req}}{{write_account.cu_con}}{{write_account.cu_requested}}{{write_account.cu_consumed}}
diff --git a/transaction_database.py b/transaction_database.py index 73ddc08..d48eb97 100644 --- a/transaction_database.py +++ b/transaction_database.py @@ -9,7 +9,6 @@ def run_query(): SELECT * FROM ( SELECT signature, - message, errors, is_executed, is_confirmed, @@ -52,7 +51,6 @@ def find_transaction_by_sig(tx_sig: str): SELECT * FROM ( SELECT signature, - message, errors, is_executed, is_confirmed,