flamenco, fuzz: consolidate fuzzing harnesses with production code

Author: mjain-jump

src/discof/exec/fd_exec_tile.c

@@ -73,7 +73,6 @@ struct fd_exec_tile_ctx {
 
   /* Current bank being executed. */
   fd_banks_t *          banks;
-  fd_bank_t *           bank;
 
   fd_capture_ctx_t *    capture_ctx;
 };
@@ -94,96 +93,19 @@ scratch_footprint( fd_topo_tile_t const * tile FD_PARAM_UNUSED ) {
   /* clang-format on */
 }
 
-static fd_funk_txn_t *
-funk_txn_get( fd_exec_tile_ctx_t * ctx ) {
-/* Query the funk transaction for the given slot. */
-  fd_funk_txn_map_t * txn_map = fd_funk_txn_map( ctx->funk );
-  if( FD_UNLIKELY( !txn_map->map ) ) {
-    FD_LOG_ERR(( "Could not find valid funk transaction map" ));
-  }
-  fd_funk_txn_xid_t xid = { .ul = { ctx->slot, ctx->slot } };
-  fd_funk_txn_start_read( ctx->funk );
-  fd_funk_txn_t * funk_txn = fd_funk_txn_query( &xid, txn_map );
-  if( FD_UNLIKELY( !funk_txn ) ) {
-    FD_LOG_ERR(( "Could not find valid funk transaction" ));
-  }
-  fd_funk_txn_end_read( ctx->funk );
-  return funk_txn;
-}
-
-static fd_bank_t *
-bank_get( fd_exec_tile_ctx_t * ctx ) {
-  return fd_banks_get_bank( ctx->banks, ctx->slot );
-}
-
 static void
 execute_txn( fd_exec_tile_ctx_t * ctx ) {
-
-  FD_SPAD_FRAME_BEGIN( ctx->exec_spad ) {
-
-  ctx->exec_res = 0;
-
-  ctx->txn_ctx->funk_txn = funk_txn_get( ctx );
-  if( FD_UNLIKELY( !ctx->txn_ctx->funk_txn ) ) {
-    FD_LOG_CRIT(( "Could not get funk transaction for slot %lu", ctx->slot ));
-  }
-
-  /* Get the bank for the given slot. */
   fd_banks_lock( ctx->banks );
-  ctx->bank = bank_get( ctx );
-  if( FD_UNLIKELY( !ctx->bank ) ) {
-    FD_LOG_CRIT(( "Could not get bank for slot %lu", ctx->slot ));
-  }
-
-  /* Setup and execute the transaction. */
-  ctx->txn_ctx->bank     = ctx->bank;
-  ctx->txn_ctx->slot     = fd_bank_slot_get( ctx->bank );
-  ctx->txn_ctx->features = fd_bank_features_get( ctx->bank );
-
-  fd_txn_t const * txn_descriptor = TXN( &ctx->txn );
-  fd_rawtxn_b_t    raw_txn        = {
-    .raw    = ctx->txn.payload,
-    .txn_sz = (ushort)ctx->txn.payload_sz
-  };
-
-  ctx->txn.flags = FD_TXN_P_FLAGS_SANITIZE_SUCCESS;
-
-  fd_exec_txn_ctx_setup( ctx->txn_ctx, txn_descriptor, &raw_txn );
-  ctx->txn_ctx->capture_ctx = ctx->capture_ctx;
-
-  /* Set up the core account keys. These are the account keys directly
-     passed in via the serialized transaction, represented as an array.
-     Note that this does not include additional keys referenced in
-     address lookup tables. */
-  fd_executor_setup_txn_account_keys( ctx->txn_ctx );
-
-  if( FD_UNLIKELY( fd_executor_txn_verify( ctx->txn_ctx )!=0 ) ) {
-    FD_LOG_WARNING(( "sigverify failed: %s", FD_BASE58_ENC_64_ALLOCA( (uchar *)ctx->txn_ctx->_txn_raw->raw+ctx->txn_ctx->txn_descriptor->signature_off ) ));
-    ctx->txn.flags = 0U;
-    ctx->exec_res  = FD_RUNTIME_TXN_ERR_SIGNATURE_FAILURE;
-    fd_banks_unlock( ctx->banks );
-    return;
-  }
-
-  ctx->exec_res = fd_runtime_pre_execute_check( &ctx->txn, ctx->txn_ctx );
-  if( FD_UNLIKELY( !( ctx->txn.flags & FD_TXN_P_FLAGS_SANITIZE_SUCCESS ) ) ) {
-    fd_banks_unlock( ctx->banks );
-    return;
-  }
-
-  /* Execute */
-  ctx->txn.flags |= FD_TXN_P_FLAGS_EXECUTE_SUCCESS;
-
-  if( FD_LIKELY( !(ctx->txn.flags & FD_TXN_P_FLAGS_FEES_ONLY) ) ) {
-    ctx->exec_res = fd_execute_txn( ctx->txn_ctx );
-  }
-
-  if( FD_LIKELY( ctx->exec_res==FD_EXECUTOR_INSTR_SUCCESS ) ) {
-    fd_txn_reclaim_accounts( ctx->txn_ctx );
-  }
+  ctx->exec_res = fd_runtime_prepare_and_execute_txn(
+      ctx->banks,
+      ctx->txn_ctx,
+      &ctx->txn,
+      ctx->exec_spad,
+      ctx->slot,
+      ctx->capture_ctx,
+      1
+  );
   fd_banks_unlock( ctx->banks );
-
-  } FD_SPAD_FRAME_END;
 }
 
 static void

src/discof/writer/fd_writer_tile.c

@@ -243,8 +243,7 @@ after_frag( fd_writer_tile_ctx_t * ctx,
     if( FD_UNLIKELY( msg->exec_tile_id!=in_idx ) ) {
       FD_LOG_CRIT(( "exec_tile_id %u should be == in_idx %lu", msg->exec_tile_id, in_idx ));
     }
-    fd_exec_txn_ctx_t * txn_ctx  = ctx->txn_ctx[ in_idx ];
-    int                 exec_res = txn_ctx->exec_err;
+    fd_exec_txn_ctx_t * txn_ctx = ctx->txn_ctx[ in_idx ];
 
     fd_banks_lock( ctx->banks );
     ctx->bank = fd_banks_get_bank( ctx->banks, txn_ctx->slot );
@@ -276,7 +275,6 @@ after_frag( fd_writer_tile_ctx_t * ctx,
           ctx->funk,
           ctx->funk_txn,
           txn_ctx,
-          exec_res,
           ctx->spad,
           ctx->bank,
           ctx->capture_ctx );

src/flamenco/runtime/fd_executor.c

@@ -1371,23 +1371,12 @@ fd_execute_instr( fd_exec_txn_ctx_t * txn_ctx,
 }
 
 void
-fd_txn_reclaim_accounts( fd_exec_txn_ctx_t * txn_ctx ) {
-  for( ushort i=0; i<txn_ctx->accounts_cnt; i++ ) {
-    fd_txn_account_t * acc_rec = &txn_ctx->accounts[i];
-
-    /* An account writable iff it is writable AND it is not being
-       demoted. If this criteria is not met, the account should not be
-       marked as touched via updating its most recent slot. */
-    if( !fd_exec_txn_ctx_account_is_writable_idx( txn_ctx, i ) ) {
-      continue;
-    }
-
-    fd_txn_account_set_slot( acc_rec, txn_ctx->slot );
-
-    if( !fd_txn_account_get_lamports( acc_rec ) ) {
-      fd_txn_account_set_data_len( acc_rec, 0UL );
-      fd_txn_account_clear_owner( acc_rec );
-    }
+fd_executor_reclaim_account( fd_exec_txn_ctx_t * txn_ctx,
+                             fd_txn_account_t *  account ) {
+  fd_txn_account_set_slot( account, txn_ctx->slot );
+  if( FD_UNLIKELY( fd_txn_account_get_lamports( account )==0UL ) ) {
+    fd_txn_account_set_data_len( account, 0UL );
+    fd_txn_account_clear_owner( account );
   }
 }
 
@@ -1557,34 +1546,6 @@ fd_executor_setup_accounts_for_txn( fd_exec_txn_ctx_t * txn_ctx ) {
   fd_executor_setup_instr_infos_from_txn_instrs( txn_ctx );
 }
 
-/* Stuff to be done before multithreading can begin */
-int
-fd_execute_txn_prepare_start( fd_exec_slot_ctx_t const * slot_ctx,
-                              fd_exec_txn_ctx_t *        txn_ctx,
-                              fd_txn_t const *           txn_descriptor,
-                              fd_rawtxn_b_t const *      txn_raw ) {
-
-  fd_funk_t * funk           = slot_ctx->funk;
-  fd_wksp_t * funk_wksp      = fd_funk_wksp( funk );
-  ulong       funk_txn_gaddr = fd_wksp_gaddr( funk_wksp, slot_ctx->funk_txn );
-  ulong       funk_gaddr     = fd_wksp_gaddr( funk_wksp, slot_ctx->funk->shmem );
-
-  /* Init txn ctx */
-  fd_exec_txn_ctx_new( txn_ctx );
-  fd_exec_txn_ctx_from_exec_slot_ctx( slot_ctx,
-                                      txn_ctx,
-                                      funk_wksp,
-                                      funk_txn_gaddr,
-                                      funk_gaddr,
-                                      NULL );
-  fd_exec_txn_ctx_setup( txn_ctx, txn_descriptor, txn_raw );
-
-  /* Set up the core account keys */
-  fd_executor_setup_txn_account_keys( txn_ctx );
-
-  return FD_RUNTIME_EXECUTE_SUCCESS;
-}
-
 int
 fd_executor_txn_verify( fd_exec_txn_ctx_t * txn_ctx ) {
   fd_sha512_t * shas[ FD_TXN_ACTUAL_SIG_MAX ];
@@ -1607,10 +1568,10 @@ fd_executor_txn_verify( fd_exec_txn_ctx_t * txn_ctx ) {
   /* Verify signatures */
   int res = fd_ed25519_verify_batch_single_msg( msg, msg_sz, signatures, pubkeys, shas, signature_cnt );
   if( FD_UNLIKELY( res != FD_ED25519_SUCCESS ) ) {
-    return -1;
+    return FD_RUNTIME_TXN_ERR_SIGNATURE_FAILURE;
   }
 
-  return 0;
+  return FD_RUNTIME_EXECUTE_SUCCESS;
 }
 
 int

src/flamenco/runtime/fd_executor.h

@@ -73,12 +73,6 @@ int
 fd_execute_instr( fd_exec_txn_ctx_t * txn_ctx,
                   fd_instr_info_t *   instr_info );
 
-int
-fd_execute_txn_prepare_start( fd_exec_slot_ctx_t const * slot_ctx,
-                              fd_exec_txn_ctx_t *        txn_ctx,
-                              fd_txn_t const *           txn_descriptor,
-                              fd_rawtxn_b_t const *      txn_raw );
-
 /*
   Execute the given transaction.
 
@@ -106,7 +100,8 @@ int
 fd_executor_txn_check( fd_exec_txn_ctx_t * txn_ctx );
 
 void
-fd_txn_reclaim_accounts( fd_exec_txn_ctx_t * txn_ctx );
+fd_executor_reclaim_account( fd_exec_txn_ctx_t * txn_ctx,
+                             fd_txn_account_t *  account );
 
 /* fd_io_strerror converts an FD_EXECUTOR_INSTR_ERR_{...} code into a
    human readable cstr.  The lifetime of the returned pointer is