wip

Author: ibhatt-jumptrading

src/flamenco/runtime/context/fd_exec_txn_ctx.h

@@ -149,6 +149,7 @@ struct fd_exec_txn_ctx {
   /* Execution error and type, to match Agave. */
   int exec_err;
   int exec_err_kind;
+  int is_fees_only;
 
    /* The current instruction index being executed */
   int current_instr_idx;

src/flamenco/runtime/fd_runtime.c

@@ -663,7 +663,7 @@ fd_runtime_pre_execute_check( fd_exec_txn_ctx_t * txn_ctx ) {
     /* Regardless of whether transaction accounts were loaded successfully, the transaction is
        included in the block and transaction fees are collected.
        https://github.com/anza-xyz/agave/blob/v2.1.6/svm/src/transaction_processor.rs#L341-L357 */
-    txn_ctx->flags |= FD_TXN_P_FLAGS_FEES_ONLY;
+    txn_ctx->is_fees_only = 1;
 
     /* If the transaction fails to load, the "rollback" accounts will include one of the following:
         1. Nonce account only
@@ -1045,6 +1045,7 @@ fd_runtime_prepare_and_execute_txn( fd_banks_t *        banks,
   ulong slot = fd_bank_slot_get( bank );
 
   /* Setup and execute the transaction. */
+  txn_ctx->is_fees_only          = 0;
   txn_ctx->bank                  = bank;
   txn_ctx->slot                  = fd_bank_slot_get( bank );
   txn_ctx->bank_idx              = bank_idx;
@@ -1055,7 +1056,7 @@ fd_runtime_prepare_and_execute_txn( fd_banks_t *        banks,
   txn_ctx->exec_stack            = exec_stack;
   txn_ctx->dumping_mem           = dumping_mem;
   txn_ctx->tracing_mem           = tracing_mem;
-  txn_ctx->flags                 = FD_TXN_P_FLAGS_SANITIZE_SUCCESS;
+  txn_ctx->flags                 = FD_TXN_P_FLAGS_SANITIZE_SUCCESS | FD_TXN_P_FLAGS_EXECUTE_SUCCESS;
   fd_exec_txn_ctx_setup_basic( txn_ctx );
   txn_ctx->capture_ctx           = capture_ctx;
 
@@ -1067,14 +1068,14 @@ fd_runtime_prepare_and_execute_txn( fd_banks_t *        banks,
 
   /* Pre-execution checks */
   exec_res = fd_runtime_pre_execute_check( txn_ctx );
-  if( FD_UNLIKELY( !( txn_ctx->flags & FD_TXN_P_FLAGS_SANITIZE_SUCCESS ) ) ) {
+
+  if( FD_UNLIKELY( exec_res!=FD_RUNTIME_EXECUTE_SUCCESS && !txn_ctx->is_fees_only ) ) {
     return exec_res;
   }
 
   /* Execute the transaction. Note that fees-only transactions are still
      marked as "executed". */
-  txn_ctx->flags |= FD_TXN_P_FLAGS_EXECUTE_SUCCESS;
-  if( FD_LIKELY( !( txn_ctx->flags & FD_TXN_P_FLAGS_FEES_ONLY ) ) ) {
+  if( FD_LIKELY( !txn_ctx->is_fees_only ) ) {
     exec_res = fd_execute_txn( txn_ctx );
   }
 

src/flamenco/runtime/tests/fd_txn_harness.c

@@ -431,7 +431,7 @@ fd_solfuzz_pb_txn_run( fd_solfuzz_runner_t * runner,
 
     if( txn_result->sanitization_error ) {
       /* Collect fees for transactions that failed to load */
-      if( txn_ctx->flags & FD_TXN_P_FLAGS_FEES_ONLY ) {
+      if( txn_ctx->is_fees_only ) {
         txn_result->has_fee_details                = true;
         txn_result->fee_details.prioritization_fee = txn_ctx->priority_fee;
         txn_result->fee_details.transaction_fee    = txn_ctx->execution_fee;
@@ -502,7 +502,7 @@ fd_solfuzz_pb_txn_run( fd_solfuzz_runner_t * runner,
     /* If the transaction is a fees-only transaction, we have to create rollback accounts to iterate over and save. */
     fd_txn_account_t * accounts_to_save = txn_ctx->accounts;
     ulong              accounts_cnt     = txn_ctx->accounts_cnt;
-    if( txn_ctx->flags & FD_TXN_P_FLAGS_FEES_ONLY ) {
+    if( txn_ctx->is_fees_only ) {
       accounts_to_save = fd_spad_alloc( runner->spad, alignof(fd_txn_account_t), sizeof(fd_txn_account_t) * 2 );
       accounts_cnt     = 0UL;