flamenco: clean up instr info + trace

mjain-jump · mjain-jump · commit f2aae140e2f7 · 2025-11-26T20:20:02.000Z
diff --git a/src/flamenco/runtime/fd_executor.c b/src/flamenco/runtime/fd_executor.c
@@ -472,7 +472,7 @@ load_transaction_account( fd_runtime_t *      runtime,
        constructed by the SVM and modified within each transaction's
        instruction execution only, so it incurs a loaded size cost
        of 0. */
-    fd_sysvar_instructions_serialize_account( txn_in, txn_out, (fd_instr_info_t const *)runtime->instr.infos, TXN( txn_in->txn )->instr_cnt, txn_idx );
+    fd_sysvar_instructions_serialize_account( bank, txn_in, txn_out, txn_idx );
     return 0UL;
   }
 
diff --git a/src/flamenco/runtime/info/fd_instr_info.c b/src/flamenco/runtime/info/fd_instr_info.c
@@ -38,7 +38,7 @@ fd_instr_info_init_from_txn_instr( fd_instr_info_t *      instr,
      the instr info. */
   instr->acct_cnt = fd_ushort_min( txn_instr->acct_cnt, FD_INSTR_ACCT_MAX );
   instr->data_sz  = txn_instr->data_sz;
-  instr->data     = (uchar *)txn_in->txn->payload + txn_instr->data_off;
+  memcpy( instr->dogtor, txn_in->txn->payload+txn_instr->data_off, instr->data_sz );
 
   uchar acc_idx_seen[ FD_INSTR_ACCT_MAX ] = {0};
 
diff --git a/src/flamenco/runtime/info/fd_instr_info.h b/src/flamenco/runtime/info/fd_instr_info.h
@@ -36,10 +36,10 @@ typedef struct fd_instruction_account fd_instruction_account_t;
 
 struct fd_instr_info {
   uchar                    program_id;
-  ushort                   data_sz;
   ushort                   acct_cnt;
 
-  uchar *                  data;
+  uchar                    dogtor[ FD_TXN_MTU ];
+  ushort                   data_sz;
 
   fd_instruction_account_t accounts[ FD_INSTR_ACCT_MAX ];
   uchar                    is_duplicate[ FD_INSTR_ACCT_MAX ];
@@ -157,20 +157,6 @@ fd_instr_info_sum_account_lamports( fd_instr_info_t const * instr,
                                     ulong *                 total_lamports_h,
                                     ulong *                 total_lamports_l );
 
-static inline uchar
-fd_instr_get_acc_flags( fd_instr_info_t const * instr,
-                        ushort                  idx ) {
-  if( FD_UNLIKELY( idx>=instr->acct_cnt ) ) {
-    return 0;
-  }
-
-  uchar flags = 0;
-  if( instr->accounts[idx].is_signer )   flags |= FD_INSTR_ACCT_FLAGS_IS_SIGNER;
-  if( instr->accounts[idx].is_writable ) flags |= FD_INSTR_ACCT_FLAGS_IS_WRITABLE;
-
-  return flags;
-}
-
 FD_PROTOTYPES_END
 
 #endif /* HEADER_fd_src_flamenco_runtime_info_fd_instr_info_h */
diff --git a/src/flamenco/runtime/program/fd_address_lookup_table_program.c b/src/flamenco/runtime/program/fd_address_lookup_table_program.c
@@ -1070,7 +1070,7 @@ fd_address_lookup_table_program_execute( fd_exec_instr_ctx_t * ctx ) {
 
   FD_EXEC_CU_UPDATE( ctx, DEFAULT_COMPUTE_UNITS );
 
-  uchar const * instr_data    = ctx->instr->data;
+  uchar const * instr_data    = ctx->instr->dogtor;
   ulong         instr_data_sz = ctx->instr->data_sz;
   if( FD_UNLIKELY( instr_data==NULL ) ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
diff --git a/src/flamenco/runtime/program/fd_bpf_loader_program.c b/src/flamenco/runtime/program/fd_bpf_loader_program.c
@@ -901,13 +901,11 @@ common_extend_program( fd_exec_instr_ctx_t * instr_ctx,
 /* https://github.com/anza-xyz/agave/blob/77daab497df191ef485a7ad36ed291c1874596e5/programs/bpf_loader/src/lib.rs#L566-L1444 */
 static int
 process_loader_upgradeable_instruction( fd_exec_instr_ctx_t * instr_ctx ) {
-  uchar const * data = instr_ctx->instr->data;
-
   uchar __attribute__((aligned(FD_BPF_UPGRADEABLE_LOADER_PROGRAM_INSTRUCTION_ALIGN))) instruction_mem[ FD_BPF_UPGRADEABLE_LOADER_PROGRAM_INSTRUCTION_FOOTPRINT ] = {0};
   fd_bpf_upgradeable_loader_program_instruction_t * instruction = fd_bincode_decode_static_limited_deserialize(
       bpf_upgradeable_loader_program_instruction,
       instruction_mem,
-      data,
+      instr_ctx->instr->dogtor,
       instr_ctx->instr->data_sz,
       FD_TXN_MTU,
       NULL );
diff --git a/src/flamenco/runtime/program/fd_bpf_loader_serialization.c b/src/flamenco/runtime/program/fd_bpf_loader_serialization.c
@@ -382,8 +382,7 @@ fd_bpf_loader_input_serialize_aligned( fd_exec_instr_ctx_t *     ctx,
   serialized_params += sizeof(ulong);
 
   /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L559 */
-  uchar * instr_data = ctx->instr->data;
-  fd_memcpy( serialized_params, instr_data, instr_data_len );
+  fd_memcpy( serialized_params, ctx->instr->dogtor, instr_data_len );
   serialized_params += instr_data_len;
 
   /* https://github.com/anza-xyz/agave/blob/v3.0.0/program-runtime/src/serialization.rs#L560 */
@@ -623,8 +622,7 @@ fd_bpf_loader_input_serialize_unaligned( fd_exec_instr_ctx_t *     ctx,
   FD_STORE( ulong, serialized_params, instr_data_len );
   serialized_params += sizeof(ulong);
 
-  uchar * instr_data = (uchar *)ctx->instr->data;
-  fd_memcpy( serialized_params, instr_data, instr_data_len );
+  fd_memcpy( serialized_params, ctx->instr->dogtor, instr_data_len );
   serialized_params += instr_data_len;
 
   FD_STORE( fd_pubkey_t, serialized_params, txn_accs[ctx->instr->program_id] );
diff --git a/src/flamenco/runtime/program/fd_config_program.c b/src/flamenco/runtime/program/fd_config_program.c
@@ -30,9 +30,6 @@ _process_config_instr( fd_exec_instr_ctx_t * ctx ) {
 
   /* Deserialize the Config Program instruction data, which consists only of the ConfigKeys
      https://github.com/solana-labs/solana/blob/v1.17.17/programs/config/src/config_processor.rs#L21 */
-  if( FD_UNLIKELY( ctx->instr->data==NULL ) ) {
-    return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
-  }
   if( FD_UNLIKELY( ctx->instr->data_sz>FD_TXN_MTU ) ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
   }
@@ -41,7 +38,7 @@ _process_config_instr( fd_exec_instr_ctx_t * ctx ) {
   uchar key_list_mem[ CONFIG_INSTRUCTION_KEYS_FOOTPRINT ] __attribute__((aligned(FD_CONFIG_KEYS_ALIGN)));
   fd_config_keys_t * key_list = fd_bincode_decode_static(
       config_keys, key_list_mem,
-      ctx->instr->data,
+      ctx->instr->dogtor,
       ctx->instr->data_sz,
       &decode_result );
   if( FD_UNLIKELY( decode_result != FD_BINCODE_SUCCESS ) ) {
@@ -233,7 +230,7 @@ _process_config_instr( fd_exec_instr_ctx_t * ctx ) {
   }
 
   /* copy_from_slice */
-  fd_memcpy( data, ctx->instr->data, ctx->instr->data_sz );
+  fd_memcpy( data, ctx->instr->dogtor, ctx->instr->data_sz );
 
   /* Implicitly dropped */
 
diff --git a/src/flamenco/runtime/program/fd_loader_v4_program.c b/src/flamenco/runtime/program/fd_loader_v4_program.c
@@ -825,7 +825,7 @@ fd_loader_v4_program_execute( fd_exec_instr_ctx_t * instr_ctx ) {
     fd_loader_v4_program_instruction_t * instruction = fd_bincode_decode_static_limited_deserialize(
         loader_v4_program_instruction,
         instruction_mem,
-        instr_ctx->instr->data,
+        instr_ctx->instr->dogtor,
         instr_ctx->instr->data_sz,
         FD_TXN_MTU,
         &rc );
diff --git a/src/flamenco/runtime/program/fd_native_cpi.c b/src/flamenco/runtime/program/fd_native_cpi.c
@@ -47,7 +47,7 @@ fd_native_cpi_native_invoke( fd_exec_instr_ctx_t *             ctx,
                                        acct_meta->is_signer );
   }
 
-  instr_info->data    = instr_data;
+  fd_memcpy( instr_info->dogtor, instr_data, instr_data_len );
   instr_info->data_sz = (ushort)instr_data_len;
 
   /* https://github.com/anza-xyz/agave/blob/v2.2.6/program-runtime/src/invoke_context.rs#L312-L313 */
diff --git a/src/flamenco/runtime/program/fd_precompiles.c b/src/flamenco/runtime/program/fd_precompiles.c
@@ -92,7 +92,7 @@ fd_precompile_get_instr_data( fd_exec_instr_ctx_t * ctx,
   if( index==USHORT_MAX ) {
 
     /* Use current instruction data */
-    data    = ctx->instr->data;
+    data    = ctx->instr->dogtor;
     data_sz = ctx->instr->data_sz;
 
   } else {
@@ -101,7 +101,7 @@ fd_precompile_get_instr_data( fd_exec_instr_ctx_t * ctx,
       return FD_EXECUTOR_PRECOMPILE_ERR_DATA_OFFSET;
 
     fd_instr_info_t const * instr = &ctx->runtime->instr.infos[ index ];
-    data    = instr->data;
+    data    = instr->dogtor;
     data_sz = instr->data_sz;
 
   }
@@ -120,7 +120,7 @@ fd_precompile_get_instr_data( fd_exec_instr_ctx_t * ctx,
 int
 fd_precompile_ed25519_verify( fd_exec_instr_ctx_t * ctx ) {
 
-  uchar const * data    = ctx->instr->data;
+  uchar const * data    = ctx->instr->dogtor;
   ulong         data_sz = ctx->instr->data_sz;
 
   /* https://github.com/anza-xyz/agave/blob/v1.18.12/sdk/src/ed25519_instruction.rs#L90-L96
@@ -224,7 +224,7 @@ fd_precompile_ed25519_verify( fd_exec_instr_ctx_t * ctx ) {
 int
 fd_precompile_secp256k1_verify( fd_exec_instr_ctx_t * ctx ) {
 
-  uchar const * data    = ctx->instr->data;
+  uchar const * data    = ctx->instr->dogtor;
   ulong         data_sz = ctx->instr->data_sz;
 
   /* https://github.com/anza-xyz/agave/blob/v1.18.12/sdk/src/secp256k1_instruction.rs#L934-L947
@@ -338,7 +338,7 @@ fd_precompile_secp256r1_verify( fd_exec_instr_ctx_t * ctx ) {
     return FD_EXECUTOR_INSTR_ERR_UNSUPPORTED_PROGRAM_ID;
   }
 
-  uchar const * data    = ctx->instr->data;
+  uchar const * data    = ctx->instr->dogtor;
   ulong         data_sz = ctx->instr->data_sz;
 
   /* ... */
diff --git a/src/flamenco/runtime/program/fd_stake_program.c b/src/flamenco/runtime/program/fd_stake_program.c
@@ -2557,9 +2557,6 @@ fd_stake_program_execute( fd_exec_instr_ctx_t * ctx ) {
   fd_pubkey_t const * signers[FD_TXN_SIG_MAX] = {0};
   fd_exec_instr_ctx_get_signers( ctx, signers );
 
-  if( FD_UNLIKELY( ctx->instr->data==NULL ) ) {
-    return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
-  }
   if( FD_UNLIKELY( ctx->instr->data_sz>FD_STAKE_INSTR_FOOTPRINT ) ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
   }
@@ -2568,7 +2565,7 @@ fd_stake_program_execute( fd_exec_instr_ctx_t * ctx ) {
   uchar instr_mem[ FD_STAKE_INSTR_FOOTPRINT ] __attribute__((aligned(alignof(fd_stake_instruction_t))));
   fd_stake_instruction_t * instruction = fd_bincode_decode_static(
       stake_instruction, instr_mem,
-      ctx->instr->data,
+      ctx->instr->dogtor,
       ctx->instr->data_sz,
       NULL );
   if( FD_UNLIKELY( !instruction ) ) {
diff --git a/src/flamenco/runtime/program/fd_system_program.c b/src/flamenco/runtime/program/fd_system_program.c
@@ -623,12 +623,6 @@ int
 fd_system_program_execute( fd_exec_instr_ctx_t * ctx ) {
   FD_EXEC_CU_UPDATE( ctx, 150UL );
 
-  /* Deserialize the SystemInstruction enum */
-  uchar * data = ctx->instr->data;
-  if( FD_UNLIKELY( data==NULL ) ) {
-    return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
-  }
-
   if( FD_UNLIKELY( ctx->instr->data_sz>FD_SYSTEM_PROGRAM_INSTR_FOOTPRINT ) ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
   }
@@ -637,10 +631,13 @@ fd_system_program_execute( fd_exec_instr_ctx_t * ctx ) {
 
   int decode_err;
   fd_system_program_instruction_t * instruction = fd_bincode_decode_static_limited_deserialize(
-      system_program_instruction, instr_mem,
-      data, ctx->instr->data_sz,
+      system_program_instruction,
+      instr_mem,
+      ctx->instr->dogtor,
+      ctx->instr->data_sz,
       FD_TXN_MTU,
-      &decode_err );
+      &decode_err
+  );
   if( FD_UNLIKELY( decode_err ) ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
   }
diff --git a/src/flamenco/runtime/program/fd_vote_program.c b/src/flamenco/runtime/program/fd_vote_program.c
@@ -2211,16 +2211,11 @@ fd_vote_program_execute( fd_exec_instr_ctx_t * ctx ) {
   fd_pubkey_t const * signers[FD_TXN_SIG_MAX] = { 0 };
   fd_exec_instr_ctx_get_signers( ctx, signers );
 
-  // https://github.com/anza-xyz/agave/blob/v2.0.1/programs/vote/src/vote_processor.rs#L70
-  if( FD_UNLIKELY( ctx->instr->data==NULL ) ) {
-    return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
-  }
-
   uchar __attribute__((aligned(alignof(fd_vote_instruction_t)))) vote_instruction_mem[ FD_VOTE_INSTRUCTION_FOOTPRINT ];
   fd_vote_instruction_t * instruction = fd_bincode_decode_static_limited_deserialize(
       vote_instruction,
       vote_instruction_mem,
-      ctx->instr->data,
+      ctx->instr->dogtor,
       ctx->instr->data_sz,
       FD_TXN_MTU,
       NULL );
diff --git a/src/flamenco/runtime/program/fd_zk_elgamal_proof_program.c b/src/flamenco/runtime/program/fd_zk_elgamal_proof_program.c
@@ -23,7 +23,7 @@ fd_executor_zk_elgamal_proof_program_execute( fd_exec_instr_ctx_t * ctx ) {
     return FD_EXECUTOR_INSTR_ERR_INVALID_INSTR_DATA;
   }
 
-  uchar const * instr_data    = ctx->instr->data;
+  uchar const * instr_data    = ctx->instr->dogtor;
   ulong         instr_data_sz = ctx->instr->data_sz;
 
   /* https://github.com/anza-xyz/agave/blob/v2.0.1/programs/zk-elgamal-proof/src/lib.rs#L172-L176 */
diff --git a/src/flamenco/runtime/program/zksdk/fd_zksdk.c b/src/flamenco/runtime/program/zksdk/fd_zksdk.c
@@ -115,9 +115,9 @@ fd_zksdk_process_close_context_state( fd_exec_instr_ctx_t * ctx ) {
 int
 fd_zksdk_process_verify_proof( fd_exec_instr_ctx_t * ctx ) {
   int err;
-  uchar const * instr_data = ctx->instr->data;
-  ulong instr_acc_cnt      = ctx->instr->acct_cnt;
-  uchar instr_id = instr_data[0]; /* instr_data_sz already checked by the caller */
+  uchar const * instr_data    = ctx->instr->dogtor;
+  ulong         instr_acc_cnt = ctx->instr->acct_cnt;
+  uchar         instr_id      = instr_data[0]; /* instr_data_sz already checked by the caller */
 
   /* ProofContextState "header" size, ie. 1 authority pubkey + 1 proof_type byte */
 #define CTX_HEAD_SZ 33UL
diff --git a/src/flamenco/runtime/program/zksdk/test_zksdk.c b/src/flamenco/runtime/program/zksdk/test_zksdk.c
@@ -47,9 +47,9 @@ create_test_ctx( fd_exec_instr_ctx_t * ctx,
   ctx->txn_out->details.compute_budget.compute_meter = compute_meter;
   ctx->instr = instr;
   ctx->runtime = runtime;
-  instr->data = &tx[instr_off];
   instr->data_sz = (ushort)(tx_len - instr_off); //TODO: this only works if the instruction is the last one
   instr->acct_cnt = 0; // TODO: hack to avoid filling proof context account (it requires to create the account first)
+  memcpy( instr->dogtor, &tx[instr_off], instr->data_sz );
   fd_log_collector_init( ctx->runtime->log.log_collector, 1 );
 }
 
diff --git a/src/flamenco/runtime/sysvar/fd_sysvar_instructions.c b/src/flamenco/runtime/sysvar/fd_sysvar_instructions.c
diff --git a/src/flamenco/runtime/sysvar/fd_sysvar_instructions.h b/src/flamenco/runtime/sysvar/fd_sysvar_instructions.h
diff --git a/src/flamenco/runtime/tests/fd_dump_pb.c b/src/flamenco/runtime/tests/fd_dump_pb.c
diff --git a/src/flamenco/runtime/tests/fd_instr_harness.c b/src/flamenco/runtime/tests/fd_instr_harness.c
diff --git a/src/flamenco/vm/syscall/fd_vm_syscall_cpi_common.c b/src/flamenco/vm/syscall/fd_vm_syscall_cpi_common.c
diff --git a/src/flamenco/vm/syscall/fd_vm_syscall_runtime.c b/src/flamenco/vm/syscall/fd_vm_syscall_runtime.c

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ load_transaction_account( fd_runtime_t * runtime,`
`472`	`472`	`constructed by the SVM and modified within each transaction's`
`473`	`473`	`instruction execution only, so it incurs a loaded size cost`
`474`	`474`	`of 0. */`
`475`		`- fd_sysvar_instructions_serialize_account( txn_in, txn_out, (fd_instr_info_t const *)runtime->instr.infos, TXN( txn_in->txn )->instr_cnt, txn_idx );`
	`475`	`+ fd_sysvar_instructions_serialize_account( bank, txn_in, txn_out, txn_idx );`
`476`	`476`	`return 0UL;`
`477`	`477`	`}`
`478`	`478`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ fd_native_cpi_native_invoke( fd_exec_instr_ctx_t * ctx,`
`47`	`47`	`acct_meta->is_signer );`
`48`	`48`	`}`
`49`	`49`
`50`		`- instr_info->data = instr_data;`
	`50`	`+ fd_memcpy( instr_info->dogtor, instr_data, instr_data_len );`
`51`	`51`	`instr_info->data_sz = (ushort)instr_data_len;`
`52`	`52`
`53`	`53`	`/* https://github.com/anza-xyz/agave/blob/v2.2.6/program-runtime/src/invoke_context.rs#L312-L313 */`