wip

Author: ibhatt-jumptrading

src/discof/bank/fd_bank_tile.c

@@ -184,8 +184,9 @@ handle_microblock( fd_bank_ctx_t *     ctx,
     txn->flags &= ~FD_TXN_P_FLAGS_SANITIZE_SUCCESS;
     txn->flags &= ~FD_TXN_P_FLAGS_EXECUTE_SUCCESS;
 
-    txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( ctx->banks,
-                                                                ctx->_bank_idx,
+    fd_bank_t * bank = fd_banks_bank_query( ctx->banks, ctx->_bank_idx );
+    FD_TEST( bank );
+    txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( bank,
                                                                 txn_ctx,
                                                                 txn,
                                                                 NULL,
@@ -369,8 +370,10 @@ handle_bundle( fd_bank_ctx_t *     ctx,
       txn->flags = (txn->flags & 0x00FFFFFFU) | ((uint)(-FD_RUNTIME_TXN_ERR_BUNDLE_PEER)<<24);
       continue;
     }
-
-    txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( ctx->banks, ctx->_bank_idx, txn_ctx, txn, NULL, &ctx->exec_stack, &ctx->exec_accounts[ i ], NULL, NULL );
+    fd_bank_t * bank = fd_banks_bank_query( ctx->banks, ctx->_bank_idx );
+    FD_TEST( bank );
+    txn_ctx->bundle.is_bundle = 1;
+    txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( bank, txn_ctx, txn, NULL, &ctx->exec_stack, &ctx->exec_accounts[ i ], NULL, NULL );
     txn->flags = (txn->flags & 0x00FFFFFFU) | ((uint)(-txn_ctx->err.exec_err)<<24);
     if( FD_UNLIKELY( !txn_ctx->err.is_committable || txn_ctx->err.exec_err!=FD_RUNTIME_EXECUTE_SUCCESS ) ) {
       execution_success = 0;
@@ -389,7 +392,6 @@ handle_bundle( fd_bank_ctx_t *     ctx,
     for( ulong i=0UL; i<txn_cnt; i++ ) {
 
       fd_exec_txn_ctx_t * txn_ctx = &ctx->txn_ctx[ i ];
-      txn_ctx->bundle.is_bundle = 1;
       uchar * signature = (uchar *)txn_ctx->txn.payload + TXN( &txn_ctx->txn )->signature_off;
 
       txns[ i ].flags |= FD_TXN_P_FLAGS_EXECUTE_SUCCESS | FD_TXN_P_FLAGS_SANITIZE_SUCCESS;

src/discof/exec/fd_exec_tile.c

@@ -128,8 +128,9 @@ returnable_frag( fd_exec_tile_ctx_t * ctx,
       case FD_EXEC_TT_TXN_EXEC: {
         /* Execute. */
         fd_exec_txn_exec_msg_t * msg = fd_chunk_to_laddr( ctx->replay_in->mem, chunk );
-        ctx->txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( ctx->banks,
-                                                                         msg->bank_idx,
+        fd_bank_t * bank = fd_banks_bank_query( ctx->banks, msg->bank_idx );
+        FD_TEST( bank );
+        ctx->txn_ctx->err.exec_err = fd_runtime_prepare_and_execute_txn( bank,
                                                                          ctx->txn_ctx,
                                                                          &msg->txn,
                                                                          ctx->capture_ctx,
@@ -139,7 +140,6 @@ returnable_frag( fd_exec_tile_ctx_t * ctx,
                                                                          &ctx->tracing_mem[0][0] );
 
         /* Commit. */
-        fd_bank_t * bank = fd_banks_bank_query( ctx->banks, msg->bank_idx );
         if( FD_LIKELY( ctx->txn_ctx->err.is_committable ) ) {
           fd_funk_txn_xid_t xid = (fd_funk_txn_xid_t){ .ul = { fd_bank_slot_get( bank ), bank->idx } };
           fd_runtime_finalize_txn( ctx->funk, ctx->progcache, ctx->txncache, &xid, ctx->txn_ctx, bank, ctx->capture_ctx, NULL );

src/flamenco/runtime/fd_runtime.c

@@ -1028,35 +1028,43 @@ fd_runtime_finalize_txn( fd_funk_t *               funk,
 }
 
 int
-fd_runtime_prepare_and_execute_txn( fd_banks_t *         banks,
-                                    ulong                bank_idx,
+fd_runtime_prepare_and_execute_txn( fd_bank_t *          bank,
                                     fd_exec_txn_ctx_t *  txn_ctx,
                                     fd_txn_p_t *         txn,
                                     fd_capture_ctx_t *   capture_ctx,
                                     fd_exec_stack_t *    exec_stack,
                                     fd_exec_accounts_t * exec_accounts,
                                     uchar *              dumping_mem,
                                     uchar *              tracing_mem ) {
-  fd_bank_t * bank = fd_banks_bank_query( banks, bank_idx );
-  if( FD_UNLIKELY( !bank ) ) {
-    FD_LOG_CRIT(( "Could not get bank at pool idx %lu", bank_idx ));
-  }
-
-  /* FIXME: The transaction setup code is super messy and needs to be
-     refactored. */
 
-  /* Setup and execute the transaction. */
   txn_ctx->bank                  = bank;
-  txn_ctx->log.enable_exec_recording = !!( bank->flags & FD_BANK_FLAGS_EXEC_RECORDING );
-  txn_ctx->xid[0]                = (fd_funk_txn_xid_t){ .ul = { fd_bank_slot_get( bank ), bank_idx } };
+  txn_ctx->xid[0]                = (fd_funk_txn_xid_t){ .ul = { fd_bank_slot_get( bank ), bank->idx } };
   txn_ctx->txn                   = *txn;
   txn_ctx->exec_stack            = exec_stack;
   txn_ctx->exec_accounts         = exec_accounts;
+
+  txn_ctx->accounts.accounts_cnt   = 0UL;
+  txn_ctx->accounts.executable_cnt = 0UL;
+
+  txn_ctx->prog_cache.programs_to_reverify_cnt  = 0UL;
+
+  txn_ctx->details.loaded_accounts_data_size      = 0UL;
+  txn_ctx->details.loaded_accounts_data_size_cost = 0UL;
+  txn_ctx->details.accounts_resize_delta          = 0UL;
+  txn_ctx->details.return_data.len                = 0UL;
+  memset( txn_ctx->details.return_data.program_id.key, 0, sizeof(fd_pubkey_t) );
+  fd_compute_budget_details_new( &txn_ctx->details.compute_budget );
+
+  txn_ctx->log.enable_exec_recording = !!( bank->flags & FD_BANK_FLAGS_EXEC_RECORDING );
   txn_ctx->log.dumping_mem       = dumping_mem;
   txn_ctx->log.tracing_mem       = tracing_mem;
-  fd_exec_txn_ctx_setup_basic( txn_ctx );
   txn_ctx->log.capture_ctx       = capture_ctx;
 
+  txn_ctx->instr.info_cnt     = 0UL;
+  txn_ctx->instr.trace_length = 0UL;
+  txn_ctx->instr.current_idx  = 0;
+  txn_ctx->instr.stack_sz     = 0;
+
   txn_ctx->accounts.accounts_cnt   = 0UL;
   txn_ctx->accounts.executable_cnt = 0UL;
 

src/flamenco/runtime/fd_runtime.h

@@ -294,8 +294,7 @@ fd_runtime_pre_execute_check( fd_exec_txn_ctx_t * txn_ctx );
    transaction. */
 
 int
-fd_runtime_prepare_and_execute_txn( fd_banks_t *         banks,
-                                    ulong                bank_idx,
+fd_runtime_prepare_and_execute_txn( fd_bank_t *          bank,
                                     fd_exec_txn_ctx_t *  txn_ctx,
                                     fd_txn_p_t *         txn,
                                     fd_capture_ctx_t *   capture_ctx,

src/flamenco/runtime/tests/fd_txn_harness.c

@@ -361,8 +361,7 @@ fd_solfuzz_txn_ctx_exec( fd_solfuzz_runner_t *     runner,
   }
 
   *exec_res = fd_runtime_prepare_and_execute_txn(
-      runner->banks,
-      0UL,
+      runner->bank,
       txn_ctx,
       txn,
       NULL,