wip

Author: ibhatt-jumptrading

src/flamenco/runtime/fd_executor.c

@@ -1562,7 +1562,7 @@ fd_executor_setup_executable_account( fd_runtime_t *           runtime,
       account will not exist within the executable accounts list. */
   fd_pubkey_t *     programdata_acc = &program_loader_state->inner.program.programdata_address;
   fd_funk_txn_xid_t xid             = { .ul = { fd_bank_slot_get( bank ), bank->idx } };
-  if( FD_LIKELY( fd_txn_account_init_from_funk_readonly( &runtime->executable.accounts[ *executable_idx ],
+  if( FD_LIKELY( fd_txn_account_init_from_funk_readonly( &runtime->accounts.executables[ *executable_idx ],
                                                          programdata_acc,
                                                          runtime->funk,
                                                          &xid )==0 ) ) {
@@ -1601,7 +1601,7 @@ fd_executor_setup_accounts_for_txn( fd_runtime_t *      runtime,
 # endif
 
   txn_out->accounts.nonce_idx_in_txn = ULONG_MAX;
-  runtime->executable.cnt            = executable_idx;
+  runtime->accounts.executable_cnt   = executable_idx;
 
   /* Set up instr infos from the txn descriptor. No Agave equivalent to this function. */
   fd_executor_setup_instr_infos_from_txn_instrs( runtime, bank, txn_in, txn_out );

src/flamenco/runtime/fd_runtime.c

@@ -1334,7 +1334,7 @@ fd_runtime_prepare_and_execute_txn( fd_runtime_t *       runtime,
   memset( txn_out->details.return_data.program_id.key, 0, sizeof(fd_pubkey_t) );
   fd_compute_budget_details_new( &txn_out->details.compute_budget );
 
-  runtime->executable.cnt = 0UL;
+  runtime->accounts.executable_cnt = 0UL;
   runtime->log.enable_log_collector = 0;
   runtime->instr.info_cnt     = 0UL;
   runtime->instr.trace_length = 0UL;
@@ -1794,9 +1794,9 @@ fd_runtime_get_executable_account( fd_runtime_t *                  runtime,
     return FD_ACC_MGR_SUCCESS;
   }
 
-  for( ushort i=0; i<runtime->executable.cnt; i++ ) {
-    if( memcmp( pubkey->uc, runtime->executable.accounts[i].pubkey->uc, sizeof(fd_pubkey_t) )==0 ) {
-      fd_txn_account_t * txn_account = &runtime->executable.accounts[i];
+  for( ushort i=0; i<runtime->accounts.executable_cnt; i++ ) {
+    if( memcmp( pubkey->uc, runtime->accounts.executables[i].pubkey->uc, sizeof(fd_pubkey_t) )==0 ) {
+      fd_txn_account_t * txn_account = &runtime->accounts.executables[i];
       *account = txn_account;
 
       if( FD_LIKELY( condition != NULL ) ) {

src/flamenco/runtime/fd_runtime.h

@@ -127,9 +127,9 @@ struct fd_runtime {
   } stake_program;
 
   struct {
-    ulong            cnt;                              /* Number of BPF upgradeable loader accounts. */
-    fd_txn_account_t accounts[ MAX_TX_ACCOUNT_LOCKS ]; /* Array of BPF upgradeable loader program data accounts */
-  } executable;
+    ulong            executable_cnt;                      /* Number of BPF upgradeable loader accounts. */
+    fd_txn_account_t executables[ MAX_TX_ACCOUNT_LOCKS ]; /* Array of BPF upgradeable loader program data accounts */
+  } accounts;
 };
 typedef struct fd_runtime fd_runtime_t;
 

src/flamenco/runtime/tests/fd_dump_pb.c

@@ -901,7 +901,7 @@ create_instr_context_protobuf_from_instructions( fd_exec_test_instr_context_t *
 
   /* Accounts */
   instr_context->accounts_count = (pb_size_t) txn_out->accounts.accounts_cnt;
-  instr_context->accounts = fd_spad_alloc( spad, alignof(fd_exec_test_acct_state_t), (instr_context->accounts_count + num_sysvar_entries + runtime->executable.cnt) * sizeof(fd_exec_test_acct_state_t));
+  instr_context->accounts = fd_spad_alloc( spad, alignof(fd_exec_test_acct_state_t), (instr_context->accounts_count + num_sysvar_entries + runtime->accounts.executable_cnt) * sizeof(fd_exec_test_acct_state_t));
   for( ulong i = 0; i < txn_out->accounts.accounts_cnt; i++ ) {
     // Copy account information over
     fd_txn_account_t const *    txn_account    = &txn_out->accounts.accounts[i];
@@ -933,16 +933,16 @@ create_instr_context_protobuf_from_instructions( fd_exec_test_instr_context_t *
   }
 
   /* Add executable accounts */
-  for( ulong i = 0; i < runtime->executable.cnt; i++ ) {
+  for( ulong i = 0; i < runtime->accounts.executable_cnt; i++ ) {
     fd_txn_account_t txn_account[1];
-    int ret = fd_txn_account_init_from_funk_readonly( txn_account, runtime->executable.accounts[i].pubkey, runtime->funk, &xid );
+    int ret = fd_txn_account_init_from_funk_readonly( txn_account, runtime->accounts.executables[i].pubkey, runtime->funk, &xid );
     if( ret != FD_ACC_MGR_SUCCESS ) {
       continue;
     }
     // Make sure the account doesn't exist in the output accounts yet
     bool account_exists = false;
     for( ulong j = 0; j < instr_context->accounts_count; j++ ) {
-      if( 0 == memcmp( instr_context->accounts[j].address, runtime->executable.accounts[i].pubkey->uc, sizeof(fd_pubkey_t) ) ) {
+      if( 0 == memcmp( instr_context->accounts[j].address, runtime->accounts.executables[i].pubkey->uc, sizeof(fd_pubkey_t) ) ) {
         account_exists = true;
         break;
       }

src/flamenco/runtime/tests/fd_instr_harness.c

@@ -104,7 +104,7 @@ fd_solfuzz_pb_instr_ctx_create( fd_solfuzz_runner_t *                runner,
   fd_compute_budget_details_new( &txn_out->details.compute_budget );
   runtime->instr.stack_sz            = 0;
   txn_out->accounts.accounts_cnt     = 0UL;
-  runtime->executable.cnt            = 0UL;
+  runtime->accounts.executable_cnt   = 0UL;
 
   txn_out->details.programs_to_reverify_cnt       = 0UL;
   txn_out->details.loaded_accounts_data_size      = 0UL;
@@ -243,13 +243,13 @@ fd_solfuzz_pb_instr_ctx_create( fd_solfuzz_runner_t *                runner,
       }
 
       fd_pubkey_t * programdata_acc = &program_loader_state->inner.program.programdata_address;
-      if( FD_UNLIKELY( fd_txn_account_init_from_funk_readonly( &runtime->executable.accounts[runtime->executable.cnt],
+      if( FD_UNLIKELY( fd_txn_account_init_from_funk_readonly( &runtime->accounts.executables[runtime->accounts.executable_cnt],
                                                                programdata_acc,
                                                                runtime->funk,
                                                                xid ) ) ) {
         continue;
       }
-      runtime->executable.cnt++;
+      runtime->accounts.executable_cnt++;
     }
   }