flamenco: add instruction failed index

firedancer-io · May 15, 2024 · 5b33e32 · 5b33e32
1 parent 5aac1fd
commit 5b33e32
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 7 deletions.
diff --git a/src/flamenco/capture/fd_solcap.pb.h b/src/flamenco/capture/fd_solcap.pb.h
diff --git a/src/flamenco/capture/fd_solcap.proto b/src/flamenco/capture/fd_solcap.proto
@@ -93,4 +93,5 @@ message Transaction {
 
     // instr_err is the instruction processing error code.
     uint32 instr_err = 9;
+    int32 instr_err_idx = 10;
 }
diff --git a/src/flamenco/capture/fd_solcap_yaml.c b/src/flamenco/capture/fd_solcap_yaml.c
@@ -432,10 +432,12 @@ if ( verbose < 3 )
   printf(
     "    - txn_sig:        '%64J'\n"
     "      txn_err:         %d\n"
-    "      cus_used:        %lu\n",
+    "      cus_used:        %lu\n"
+    "      instr_err_idx:   %d\n",
     meta.txn_sig,
     meta.fd_txn_err,
-    meta.fd_cus_used );
+    meta.fd_cus_used,
+    meta.instr_err_idx);
 
   /* Only print custom error if it has been set*/
   if ( meta.fd_txn_err == FD_EXECUTOR_INSTR_ERR_CUSTOM_ERR) {

diff --git a/src/flamenco/runtime/context/fd_exec_txn_ctx.c b/src/flamenco/runtime/context/fd_exec_txn_ctx.c
@@ -213,6 +213,7 @@ fd_exec_txn_ctx_setup( fd_exec_txn_ctx_t * txn_ctx,
   txn_ctx->dirty_vote_acc  = 0;
   txn_ctx->dirty_stake_acc = 0;
   txn_ctx->failed_instr    = NULL;
+  txn_ctx->instr_err_idx   = INT_MAX;
   txn_ctx->capture_ctx     = NULL;
 }
 

diff --git a/src/flamenco/runtime/context/fd_exec_txn_ctx.h b/src/flamenco/runtime/context/fd_exec_txn_ctx.h
@@ -62,6 +62,7 @@ struct __attribute__((aligned(8UL))) fd_exec_txn_ctx {
   uchar                 instr_stack_sz;                  /* Current depth of the instruction execution stack. */
   fd_exec_instr_ctx_t   instr_stack[6];                  /* Instruction execution stack. */
   fd_exec_instr_ctx_t * failed_instr;
+  int                   instr_err_idx;
   ulong                 accounts_cnt;                    /* Number of account pubkeys accessed by this transaction. */
   fd_pubkey_t           accounts[128];                   /* Array of account pubkeys accessed by this transaction. */
   ulong                 executable_cnt;                  /* Number of BPF upgradeable loader accounts. */

diff --git a/src/flamenco/runtime/fd_executor.c b/src/flamenco/runtime/fd_executor.c
@@ -1116,6 +1116,10 @@ fd_execute_txn( fd_exec_txn_ctx_t * txn_ctx ) {
 
       int exec_result = fd_execute_instr( txn_ctx, &instrs[i] );
       if( exec_result != FD_EXECUTOR_INSTR_SUCCESS ) {
+        if ( txn_ctx->instr_err_idx == INT_MAX )
+        {
+          txn_ctx->instr_err_idx = i;
+        }
   #ifdef VLOG
         if ( 257037453 == txn_ctx->slot_ctx->slot_bank.slot ) {
   #endif

diff --git a/src/flamenco/runtime/fd_runtime.c b/src/flamenco/runtime/fd_runtime.c
@@ -1061,6 +1061,7 @@ fd_runtime_write_transaction_status( fd_capture_ctx_t * capture_ctx,
         .solana_txn_err  = solana_txn_err,
         .fd_cus_used     = fd_cus_consumed,
         .solana_cus_used = solana_cus_consumed,
+        .instr_err_idx = txn_ctx->instr_err_idx == INT_MAX ? -1 : txn_ctx->instr_err_idx,
       };
       memcpy( txn.txn_sig, sig, sizeof(fd_signature_t) );
 

diff --git a/src/flamenco/runtime/tests/fd_exec_instr_test.c b/src/flamenco/runtime/tests/fd_exec_instr_test.c
@@ -279,6 +279,7 @@ _context_create( fd_exec_instr_test_runner_t *        runner,
   txn_ctx->dirty_vote_acc          = 0;
   txn_ctx->dirty_stake_acc         = 0;
   txn_ctx->failed_instr            = NULL;
+  txn_ctx->instr_err_idx           = INT_MAX;
   txn_ctx->capture_ctx             = NULL;
   txn_ctx->vote_accounts_pool      = NULL;