more verbose blockhash errors

Author: ibhatt-jumptrading

book/api/metrics-generated.md

@@ -1025,6 +1025,9 @@
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">max_&#8203;loaded_&#8203;accounts_&#8203;data_&#8203;size_&#8203;exceeded</span>"} | counter | Result of loading and executing a transaction. (The total account data size of the loaded accounts exceeds the consensus limit) |
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">duplicate_&#8203;instruction</span>"} | counter | Result of loading and executing a transaction. (A compute budget program instruction was invoked more than once) |
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">invalid_&#8203;loaded_&#8203;accounts_&#8203;data_&#8203;size_&#8203;limit</span>"} | counter | Result of loading and executing a transaction. (The compute budget program was invoked and set the loaded accounts data size to zero) |
+| <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">blockhash_&#8203;nonce_&#8203;not_&#8203;advanceable</span>"} | counter | Result of loading and executing a transaction. (The transaction references a nonce account that is not advanceable) |
+| <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">blockhash_&#8203;no_&#8203;advance_&#8203;nonce_&#8203;instr</span>"} | counter | Result of loading and executing a transaction. (The transaction references a nonce account that is not advanceable) |
+| <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">blockhash_&#8203;advance_&#8203;nonce_&#8203;fail</span>"} | counter | Result of loading and executing a transaction. (The transaction references a nonce account that is not advanceable) |
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">account_&#8203;in_&#8203;use</span>"} | counter | Result of loading and executing a transaction. (The transaction conflicts with another transaction in the microblock. TODO: No longer possible with smart dispatcher) |
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">account_&#8203;loaded_&#8203;twice</span>"} | counter | Result of loading and executing a transaction. (The transaction references the same account twice) |
 | <span class="metrics-name">bankf_&#8203;transaction_&#8203;result</span><br/>{transaction_&#8203;result="<span class="metrics-enum">signature_&#8203;failure</span>"} | counter | Result of loading and executing a transaction. (The transaction had an invalid signature) |

src/disco/metrics/generated/fd_metrics_bankf.c

@@ -18,6 +18,9 @@ const fd_metrics_meta_t FD_METRICS_BANKF[FD_METRICS_BANKF_TOTAL] = {
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, MAX_LOADED_ACCOUNTS_DATA_SIZE_EXCEEDED ),
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, DUPLICATE_INSTRUCTION ),
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT ),
+    DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, BLOCKHASH_NONCE_NOT_ADVANCEABLE ),
+    DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, BLOCKHASH_NO_ADVANCE_NONCE_INSTR ),
+    DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, BLOCKHASH_ADVANCE_NONCE_FAIL ),
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, ACCOUNT_IN_USE ),
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, ACCOUNT_LOADED_TWICE ),
     DECLARE_METRIC_ENUM( BANKF_TRANSACTION_RESULT, COUNTER, TRANSACTION_RESULT, SIGNATURE_FAILURE ),

src/disco/metrics/generated/fd_metrics_bankf.h

@@ -11,7 +11,7 @@
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_DESC "Result of loading and executing a transaction."
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_CVT  (FD_METRICS_CONVERTER_NONE)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_CNT  (23UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_CNT  (26UL)
 
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_SUCCESS_OFF (16UL)
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_INSTRUCTON_ERROR_OFF (17UL)
@@ -29,15 +29,18 @@
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_MAX_LOADED_ACCOUNTS_DATA_SIZE_EXCEEDED_OFF (29UL)
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_DUPLICATE_INSTRUCTION_OFF (30UL)
 #define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT_OFF (31UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_ACCOUNT_IN_USE_OFF (32UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_ACCOUNT_LOADED_TWICE_OFF (33UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_SIGNATURE_FAILURE_OFF (34UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_TOO_MANY_ACCOUNT_LOCKS_OFF (35UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_INSUFFICIENT_FUNDS_FOR_RENT_OFF (36UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_UNBALANCED_TRANSACTION_OFF (37UL)
-#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_BUNDLE_PEER_OFF (38UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_BLOCKHASH_NONCE_NOT_ADVANCEABLE_OFF (32UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_BLOCKHASH_NO_ADVANCE_NONCE_INSTR_OFF (33UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_BLOCKHASH_ADVANCE_NONCE_FAIL_OFF (34UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_ACCOUNT_IN_USE_OFF (35UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_ACCOUNT_LOADED_TWICE_OFF (36UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_SIGNATURE_FAILURE_OFF (37UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_TOO_MANY_ACCOUNT_LOCKS_OFF (38UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_INSUFFICIENT_FUNDS_FOR_RENT_OFF (39UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_UNBALANCED_TRANSACTION_OFF (40UL)
+#define FD_METRICS_COUNTER_BANKF_TRANSACTION_RESULT_BUNDLE_PEER_OFF (41UL)
 
-#define FD_METRICS_BANKF_TOTAL (23UL)
+#define FD_METRICS_BANKF_TOTAL (26UL)
 extern const fd_metrics_meta_t FD_METRICS_BANKF[FD_METRICS_BANKF_TOTAL];
 
 #endif /* HEADER_fd_src_disco_metrics_generated_fd_metrics_bankf_h */

src/disco/metrics/generated/fd_metrics_enums.h

@@ -490,7 +490,7 @@
 #define FD_METRICS_ENUM_TRANSACTION_ERROR_V_BUNDLE_PEER_NAME "bundle_peer"
 
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_NAME "transaction_result"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_CNT (23UL)
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_CNT (26UL)
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_SUCCESS_IDX  0
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_SUCCESS_NAME "success"
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INSTRUCTON_ERROR_IDX  1
@@ -523,19 +523,25 @@
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_DUPLICATE_INSTRUCTION_NAME "duplicate_instruction"
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT_IDX  15
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INVALID_LOADED_ACCOUNTS_DATA_SIZE_LIMIT_NAME "invalid_loaded_accounts_data_size_limit"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_IN_USE_IDX  16
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NONCE_NOT_ADVANCEABLE_IDX  16
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NONCE_NOT_ADVANCEABLE_NAME "blockhash_nonce_not_advanceable"
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NO_ADVANCE_NONCE_INSTR_IDX  17
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NO_ADVANCE_NONCE_INSTR_NAME "blockhash_no_advance_nonce_instr"
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_ADVANCE_NONCE_FAIL_IDX  18
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_ADVANCE_NONCE_FAIL_NAME "blockhash_advance_nonce_fail"
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_IN_USE_IDX  19
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_IN_USE_NAME "account_in_use"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_LOADED_TWICE_IDX  17
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_LOADED_TWICE_IDX  20
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_ACCOUNT_LOADED_TWICE_NAME "account_loaded_twice"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_SIGNATURE_FAILURE_IDX  18
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_SIGNATURE_FAILURE_IDX  21
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_SIGNATURE_FAILURE_NAME "signature_failure"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_TOO_MANY_ACCOUNT_LOCKS_IDX  19
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_TOO_MANY_ACCOUNT_LOCKS_IDX  22
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_TOO_MANY_ACCOUNT_LOCKS_NAME "too_many_account_locks"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INSUFFICIENT_FUNDS_FOR_RENT_IDX  20
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INSUFFICIENT_FUNDS_FOR_RENT_IDX  23
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_INSUFFICIENT_FUNDS_FOR_RENT_NAME "insufficient_funds_for_rent"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_UNBALANCED_TRANSACTION_IDX  21
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_UNBALANCED_TRANSACTION_IDX  24
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_UNBALANCED_TRANSACTION_NAME "unbalanced_transaction"
-#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BUNDLE_PEER_IDX  22
+#define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BUNDLE_PEER_IDX  25
 #define FD_METRICS_ENUM_TRANSACTION_RESULT_V_BUNDLE_PEER_NAME "bundle_peer"
 
 #define FD_METRICS_ENUM_SHRED_PROCESSING_RESULT_NAME "shred_processing_result"

src/disco/metrics/metrics.xml

@@ -657,25 +657,28 @@ metric introduced.
     <int value="13" name="MaxLoadedAccountsDataSizeExceeded" label="The total account data size of the loaded accounts exceeds the consensus limit" />
     <int value="14" name="DuplicateInstruction" label="A compute budget program instruction was invoked more than once" />
     <int value="15" name="InvalidLoadedAccountsDataSizeLimit" label="The compute budget program was invoked and set the loaded accounts data size to zero" />
+    <int value="16" name="BlockhashNonceNotAdvanceable" label="The transaction references a nonce account that is not advanceable" />
+    <int value="17" name="BlockhashNoAdvanceNonceInstr" label="The transaction references a nonce account that is not advanceable" />
+    <int value="18" name="BlockhashAdvanceNonceFail" label="The transaction references a nonce account that is not advanceable" />
 
     <!-- Preflight errors during replay. These are errors in validation
          before we begin executing the transaction, which can only
          occur during replay, as such transactions do not make it to
          execution when we are leader. -->
-    <int value="16" name="AccountInUse" label="The transaction conflicts with another transaction in the microblock. TODO: No longer possible with smart dispatcher" />
-    <int value="17" name="AccountLoadedTwice" label="The transaction references the same account twice" />
-    <int value="18" name="SignatureFailure" label="The transaction had an invalid signature" />
-    <int value="19" name="TooManyAccountLocks" label="The transaction references too many accounts. TODO: No longer possible with smart dispatcher" />
+    <int value="19" name="AccountInUse" label="The transaction conflicts with another transaction in the microblock. TODO: No longer possible with smart dispatcher" />
+    <int value="20" name="AccountLoadedTwice" label="The transaction references the same account twice" />
+    <int value="21" name="SignatureFailure" label="The transaction had an invalid signature" />
+    <int value="22" name="TooManyAccountLocks" label="The transaction references too many accounts. TODO: No longer possible with smart dispatcher" />
 
     <!-- Execution errors. These are errors which occur during actual
          execution of the transaction, after it has been validated. -->
-    <int value="20" name="InsufficientFundsForRent" label="The transaction would leave an account with a lower balance than the rent-exempt minimum" />
-    <int value="21" name="UnbalancedTransaction" label="The total referenced account lamports before and after the transaction was unbalanced" />
+    <int value="23" name="InsufficientFundsForRent" label="The transaction would leave an account with a lower balance than the rent-exempt minimum" />
+    <int value="24" name="UnbalancedTransaction" label="The total referenced account lamports before and after the transaction was unbalanced" />
 
     <!-- Errors that aren't returned by the runtime execution itself,
          but are used by bank as an additional reason transactions
          might fail. -->
-    <int value="22" name="BundlePeer" label="The transaction was part of a bundle and an earlier transaction in the bundle failed" />
+    <int value="25" name="BundlePeer" label="The transaction was part of a bundle and an earlier transaction in the bundle failed" />
 </enum>
 
 <tile name="bankf">

src/discof/bank/fd_bank_err.h

@@ -19,6 +19,9 @@ fd_bank_err_from_runtime_err( int err ) {
       case FD_RUNTIME_TXN_ERR_INVALID_ACCOUNT_FOR_FEE:                 return FD_METRICS_ENUM_TRANSACTION_RESULT_V_INVALID_ACCOUNT_FOR_FEE_IDX;
       case FD_RUNTIME_TXN_ERR_ALREADY_PROCESSED:                       return FD_METRICS_ENUM_TRANSACTION_RESULT_V_ALREADY_PROCESSED_IDX;
       case FD_RUNTIME_TXN_ERR_BLOCKHASH_NOT_FOUND:                     return FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NOT_FOUND_IDX;
+      case FD_RUNTIME_TXN_ERR_BLOCKHASH_NONCE_NOT_ADVANCEABLE:         return FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NONCE_NOT_ADVANCEABLE_IDX;
+      case FD_RUNTIME_TXN_ERR_BLOCKHASH_NO_ADVANCE_NONCE_INSTR:        return FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_NO_ADVANCE_NONCE_INSTR_IDX;
+      case FD_RUNTIME_TXN_ERR_BLOCKHASH_ADVANCE_NONCE_FAIL:            return FD_METRICS_ENUM_TRANSACTION_RESULT_V_BLOCKHASH_ADVANCE_NONCE_FAIL_IDX;
       case FD_RUNTIME_TXN_ERR_INVALID_PROGRAM_FOR_EXECUTION:           return FD_METRICS_ENUM_TRANSACTION_RESULT_V_INVALID_PROGRAM_FOR_EXECUTION_IDX;
       case FD_RUNTIME_TXN_ERR_ADDRESS_LOOKUP_TABLE_NOT_FOUND:          return FD_METRICS_ENUM_TRANSACTION_RESULT_V_ADDRESS_LOOKUP_TABLE_NOT_FOUND_IDX;
       case FD_RUNTIME_TXN_ERR_INVALID_ADDRESS_LOOKUP_TABLE_OWNER:      return FD_METRICS_ENUM_TRANSACTION_RESULT_V_INVALID_ADDRESS_LOOKUP_TABLE_OWNER_IDX;

src/flamenco/runtime/fd_runtime_err.h

@@ -44,4 +44,11 @@
 #define FD_RUNTIME_TXN_ERR_PROGRAM_CACHE_HIT_MAX_LIMIT               -38
 #define FD_RUNTIME_TXN_ERR_COMMIT_CANCELLED                          -39
 
+/* Transaction error that does not directly map to an Agave error.
+   These all map to FD_RUNTIME_TXN_ERR_BLOCKHASH_NOT_FOUND (-8) and are
+   just differentiated to provide additional insight into the error.*/
+#define FD_RUNTIME_TXN_ERR_BLOCKHASH_NONCE_NOT_ADVANCEABLE           -8000
+#define FD_RUNTIME_TXN_ERR_BLOCKHASH_NO_ADVANCE_NONCE_INSTR          -8001
+#define FD_RUNTIME_TXN_ERR_BLOCKHASH_ADVANCE_NONCE_FAIL              -8002
+
 #endif /* HEADER_fd_src_flamenco_runtime_fd_runtime_err_h */