Skip to content

Commit 0c06bc6

Browse files
committed
flamenco, fuzz: runtime 2.3 migration
1 parent bc50382 commit 0c06bc6

34 files changed

+1209
-910
lines changed

contrib/test/test-vectors-fixtures/vm-interp-fixtures/vm_interp-fixtures.list

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/shared_dev/commands/configure/genesis.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ default_enable_features( fd_features_t * features ) {
3232
features->apply_cost_tracker_during_replay = 0UL;
3333
features->reject_callx_r10 = 1UL;
3434
features->update_hashes_per_tick = 0UL;
35-
features->enable_partitioned_epoch_reward = 0UL;
3635
features->pico_inflation = 0UL;
3736
features->remaining_compute_units_syscall_enabled = 0UL;
3837
features->simplify_writable_program_account_check = 0UL;

src/discof/exec/fd_exec_tile.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,11 @@ execute_txn( fd_exec_tile_ctx_t * ctx ) {
144144
fd_exec_txn_ctx_setup( ctx->txn_ctx, txn_descriptor, &raw_txn );
145145
ctx->txn_ctx->capture_ctx = ctx->capture_ctx;
146146

147-
int err = fd_executor_setup_accessed_accounts_for_txn( ctx->txn_ctx );
148-
if( FD_UNLIKELY( err ) ) {
149-
task_info.txn->flags = 0U;
150-
task_info.exec_res = err;
151-
return;
152-
}
147+
/* Set up the core account keys. These are the account keys directly
148+
passed in via the serialized transaction, represented as an array.
149+
Note that this does not include additional keys referenced in
150+
address lookup tables. */
151+
fd_executor_setup_txn_account_keys( ctx->txn_ctx );
153152

154153
if( FD_UNLIKELY( fd_executor_txn_verify( ctx->txn_ctx )!=0 ) ) {
155154
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 ) ));
@@ -158,8 +157,7 @@ execute_txn( fd_exec_tile_ctx_t * ctx ) {
158157
return;
159158
}
160159

161-
uchar dump_txn = !!( ctx->txn_ctx->capture_ctx && ctx->txn_ctx->slot >= ctx->txn_ctx->capture_ctx->dump_proto_start_slot && ctx->txn_ctx->capture_ctx->dump_txn_to_pb );
162-
fd_runtime_pre_execute_check( &task_info, dump_txn );
160+
fd_runtime_pre_execute_check( &task_info );
163161
if( FD_UNLIKELY( !( task_info.txn->flags & FD_TXN_P_FLAGS_SANITIZE_SUCCESS ) ) ) {
164162
return;
165163
}
@@ -540,6 +538,8 @@ unprivileged_init( fd_topo_t * topo,
540538
ctx->capture_ctx->dump_instr_to_pb = tile->exec.dump_instr_to_pb;
541539
ctx->capture_ctx->dump_txn_to_pb = tile->exec.dump_txn_to_pb;
542540
ctx->capture_ctx->dump_syscall_to_pb = tile->exec.dump_syscall_to_pb;
541+
} else {
542+
ctx->capture_ctx = NULL;
543543
}
544544
}
545545

src/discof/replay/fd_replay_tile.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,6 +2204,8 @@ unprivileged_init( fd_topo_t * topo,
22042204

22052205
if ( strlen(tile->replay.solcap_capture) > 0 || strlen(tile->replay.dump_proto_dir) > 0 ) {
22062206
ctx->capture_ctx = fd_capture_ctx_new( capture_ctx_mem );
2207+
} else {
2208+
ctx->capture_ctx = NULL;
22072209
}
22082210

22092211
if( strlen(tile->replay.solcap_capture) > 0 ) {

0 commit comments

Comments
 (0)