remove 1-indexed instruction accounts

Author: cali-jumptrading

src/flamenco/runtime/context/fd_exec_instr_ctx.c

@@ -126,12 +126,8 @@ fd_exec_instr_ctx_try_borrow_instr_account( fd_exec_instr_ctx_t const * ctx,
 
   fd_txn_account_t * instr_account = ctx->instr->accounts[idx];
 
-  /* Calculate the index_in_instruction by adding the number of program accounts to the instruction account index.
-     https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L654-L655 */
-  ulong idx_in_instr = fd_ulong_sat_add(idx, fd_exec_instr_ctx_get_number_of_program_accounts( ctx ) );
-
   return fd_exec_instr_ctx_try_borrow_account( ctx,
-                                               idx_in_instr,
+                                               idx,
                                                instr_account,
                                                account );
 }
@@ -161,8 +157,10 @@ fd_exec_instr_ctx_try_borrow_last_program_account( fd_exec_instr_ctx_t const * c
                                         &program_account,
                                         NULL );
 
+  /* The index_in_instruction for a borrowed program account is invalid,
+     so it is set to a sentinel value of USHORT_MAX. */
   return fd_exec_instr_ctx_try_borrow_account( ctx,
-                                               0UL,
+                                               USHORT_MAX,
                                                program_account,
                                                account );
 }

src/flamenco/runtime/context/fd_exec_instr_ctx.h

@@ -93,7 +93,7 @@ fd_exec_instr_ctx_find_idx_of_instr_account( fd_exec_instr_ctx_t const * ctx,
 
 /* Mirrors Agave function solana_sdk::transaction_context::InstructionContext::get_number_of_program_accounts.
 
-   Strictly returns 1, as we only support one program account per instruction for now.
+   Strictly returns 1, as we only support one program account per instruction.
 
    https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L480-L482 */
 

src/flamenco/runtime/fd_borrowed_account.h

@@ -20,9 +20,8 @@ struct fd_borrowed_account {
   fd_txn_account_t *          acct;
   fd_exec_instr_ctx_t const * instr_ctx;
 
-  /* Agave's index_in_instruction includes program and instruction accounts,
-     with the program account occupying index 0,
-     so the value for instruction accounts will be off by one. */
+  /* index_in_instruction will be USHORT_MAX for borrowed program accounts because
+     they are not stored in the list of instruction accounts in the instruction context */
   ushort                      index_in_instruction;
 };
 typedef struct fd_borrowed_account fd_borrowed_account_t;
@@ -294,7 +293,7 @@ fd_borrowed_account_is_executable_internal( fd_borrowed_account_t const * borrow
           fd_borrowed_account_is_executable( borrowed_acct );
 }
 
-/* fd_borrowed_account_is_signer mirror the Agave functions
+/* fd_borrowed_account_is_signer mirrors the Agave function
    solana_sdk::transaction_context::BorrowedAccount::is_signer.
    Returns 1 if the account is a signer or is writable and 0 otherwise.
 
@@ -305,27 +304,14 @@ fd_borrowed_account_is_signer( fd_borrowed_account_t const * borrowed_acct ) {
   fd_exec_instr_ctx_t const * instr_ctx = borrowed_acct->instr_ctx;
   fd_instr_info_t     const * instr     = instr_ctx->instr;
 
-  /* The index in instruction is 1-indexed for instruction accounts, with the program account
-     occupying index 0. */
-  if( FD_UNLIKELY( borrowed_acct->index_in_instruction > instr_ctx->instr->acct_cnt ) ) {
+  if( FD_UNLIKELY( borrowed_acct->index_in_instruction>=instr_ctx->instr->acct_cnt ) ) {
     return 0;
   }
 
-  /* Check if account is a program account
-     https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L1053 */
-  if( FD_UNLIKELY( borrowed_acct->index_in_instruction <
-                   fd_exec_instr_ctx_get_number_of_program_accounts( instr_ctx ) ) ) {
-    return 0;
-  }
-
-  /* Converts the index_in_instruction
-     into an instruction account index by subtracting the number of program accounts.
-     https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L1045-L1046 */
-  ulong idx = fd_ulong_sat_sub( (ulong)borrowed_acct->index_in_instruction, fd_exec_instr_ctx_get_number_of_program_accounts( instr_ctx ) );
-  return fd_instr_acc_is_signer_idx( instr, idx );
+  return fd_instr_acc_is_signer_idx( instr, borrowed_acct->index_in_instruction );
 }
 
-/* fd_borrowed_account_is_writer mirror the Agave functions
+/* fd_borrowed_account_is_writer mirrors the Agave function
    solana_sdk::transaction_context::BorrowedAccount::is_writer.
    Returns 1 if the account is a signer or is writable and 0 otherwise.
 
@@ -336,24 +322,11 @@ fd_borrowed_account_is_writable( fd_borrowed_account_t const * borrowed_acct ) {
   fd_exec_instr_ctx_t const * instr_ctx = borrowed_acct->instr_ctx;
   fd_instr_info_t     const * instr     = instr_ctx->instr;
 
-  /* The index in instruction is 1-indexed for instruction accounts, with the program account
-     occupying index 0. */
-  if( FD_UNLIKELY( borrowed_acct->index_in_instruction > instr_ctx->instr->acct_cnt ) ) {
-    return 0;
-  }
-
-  /* Check if account is a program account
-     https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L1053 */
-  if( FD_UNLIKELY( borrowed_acct->index_in_instruction <
-                   fd_exec_instr_ctx_get_number_of_program_accounts( instr_ctx ) ) ) {
+  if( FD_UNLIKELY( borrowed_acct->index_in_instruction>=instr_ctx->instr->acct_cnt ) ) {
     return 0;
   }
 
-  /* Converts the index_in_instruction
-     into an instruction account index by subtracting the number of program accounts.
-     https://github.com/anza-xyz/agave/blob/v2.1.14/sdk/src/transaction_context.rs#L1058-L1059 */
-  ulong idx = fd_ulong_sat_sub( (ulong)borrowed_acct->index_in_instruction, fd_exec_instr_ctx_get_number_of_program_accounts( instr_ctx ) );
-  return fd_instr_acc_is_writable_idx( instr, idx );
+  return fd_instr_acc_is_writable_idx( instr, borrowed_acct->index_in_instruction );
 }
 
 /* fd_borrowed_account_is_owned_by_current_program mirrors Agave's