Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/firedancer/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ fd_topo_initialize( config_t * config ) {
config->firedancer.runtime.program_cache.heap_size_mib<<20 );
/**/ fd_topob_tile_uses( topo, &topo->tiles[ fd_topo_find_tile( topo, "replay", 0UL ) ], progcache_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );
FOR(exec_tile_cnt) fd_topob_tile_uses( topo, &topo->tiles[ fd_topo_find_tile( topo, "exec", i ) ], progcache_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );
FOR(bank_tile_cnt) fd_topob_tile_uses( topo, &topo->tiles[ fd_topo_find_tile( topo, "bank", i ) ], progcache_obj, FD_SHMEM_JOIN_MODE_READ_ONLY );
FOR(bank_tile_cnt) fd_topob_tile_uses( topo, &topo->tiles[ fd_topo_find_tile( topo, "bank", i ) ], progcache_obj, FD_SHMEM_JOIN_MODE_READ_WRITE );

if( FD_LIKELY( config->tiles.gui.enabled ) ) {
fd_topob_wksp( topo, "gui" );
Expand Down
3 changes: 3 additions & 0 deletions src/disco/pack/fd_pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -2593,6 +2593,9 @@ fd_pack_rebate_cus( fd_pack_t * pack,
pack->cumulative_vote_cost -= rebate->vote_cost_rebate;
pack->data_bytes_consumed -= rebate->data_bytes_rebate;
pack->cumulative_rebated_cus += rebate->total_cost_rebate;

FD_LOG_NOTICE(("PACK REBATE CUS %lu %lu %lu", rebate->total_cost_rebate, pack->cumulative_block_cost, pack->cumulative_rebated_cus ));

/* For now, we want to ignore the microblock count rebate. There are
3 places the microblock count is kept (here, in the pack tile, and
in the PoH tile), and they all need to count microblocks that end
Expand Down
9 changes: 7 additions & 2 deletions src/discof/bank/fd_bank_tile.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,14 @@ handle_microblock( fd_bank_ctx_t * ctx,

FD_SPAD_FRAME_BEGIN( ctx->exec_spad ) {

int is_simple_vote = fd_txn_is_simple_vote_transaction( TXN(txn), txn->payload );
if( FD_UNLIKELY( is_simple_vote ) ) {
txn->flags |= FD_TXN_P_FLAGS_IS_SIMPLE_VOTE;
}

txn_ctx->exec_err = fd_runtime_prepare_and_execute_txn( ctx->banks, ctx->_bank_idx, txn_ctx, txn, NULL );
if( FD_UNLIKELY( !(txn_ctx->flags & FD_TXN_P_FLAGS_SANITIZE_SUCCESS ) ) ) {
FD_LOG_NOTICE(("REBATE %u", txn->bank_cu.rebated_cus));
fd_pack_rebate_sum_add_txn( ctx->rebater, txn, NULL, 1UL );
ctx->metrics.txn_result[ fd_bank_err_from_runtime_err( txn_ctx->exec_err ) ]++;
continue;
Expand All @@ -196,8 +202,7 @@ handle_microblock( fd_bank_ctx_t * ctx,
uint actual_execution_cus = (uint)(txn_ctx->compute_budget_details.compute_unit_limit - txn_ctx->compute_budget_details.compute_meter);
uint actual_acct_data_cus = (uint)(txn_ctx->loaded_accounts_data_size_cost);

int is_simple_vote = 0;
if( FD_UNLIKELY( is_simple_vote = fd_txn_is_simple_vote_transaction( TXN(txn), txn->payload ) ) ) {
if( FD_UNLIKELY( is_simple_vote ) ) {
/* Simple votes are charged fixed amounts of compute regardless of
the real cost they incur. Unclear what cost is returned by
fd_execute txn, however, so we override it here. */
Expand Down
2 changes: 2 additions & 0 deletions src/discof/replay/fd_replay_tile.c
Original file line number Diff line number Diff line change
Expand Up @@ -1975,6 +1975,7 @@ process_exec_task_done( fd_replay_tile_t * ctx,
/* Every transaction in a valid block has to execute.
Otherwise, we should mark the block as dead. Also freeze the
bank if possible. */
FD_LOG_WARNING(("TXN ERR %d", msg->txn_exec->err));
fd_banks_mark_bank_dead( ctx->banks, bank );
fd_sched_block_abandon( ctx->sched, bank->idx );
}
Expand All @@ -1989,6 +1990,7 @@ process_exec_task_done( fd_replay_tile_t * ctx,
/* Every transaction in a valid block has to sigverify.
Otherwise, we should mark the block as dead. Also freeze the
bank if possible. */
FD_LOG_WARNING(("TXN SIGVERIFY ERR %d", msg->txn_sigverify->err));
fd_banks_mark_bank_dead( ctx->banks, bank );
fd_sched_block_abandon( ctx->sched, bank->idx );
}
Expand Down
1 change: 1 addition & 0 deletions src/discof/resolv/fd_resolv_tile.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,7 @@ publish_txn( fd_resolv_ctx_t * ctx,
txnm->reference_slot = ctx->flushing_slot;

if( FD_UNLIKELY( txnt->addr_table_adtl_cnt ) ) {
return 0;
if( FD_UNLIKELY( !ctx->bank ) ) {
FD_MCNT_INC( RESOLF, NO_BANK_DROP, 1 );
return 0;
Expand Down
Loading