fix: Parse create account instruction

Author: muzaffarbhat07

apps/solana_app/solana_sign_txn.c

@@ -595,8 +595,9 @@ static bool verify_solana_transfer_token_transaction() {
   const uint8_t *token_mint = solana_txn_context->transaction_info
                                   .instruction[transfer_instruction_index]
                                   .program.transfer_checked.token_mint;
-  const solana_token_program_t *contract = NULL;
-  if (!is_token_whitelisted(token_mint, &contract)) {
+  solana_token_program_t contract = {0};
+  const solana_token_program_t* contract_pointer = &contract;
+  if (!is_token_whitelisted(token_mint, &contract_pointer)) {
     // Contract Unverifed, Display warning
     delay_scr_init(ui_text_unverified_token, DELAY_TIME);
 
@@ -625,13 +626,16 @@ static bool verify_solana_transfer_token_transaction() {
         .decimal = token_decimals,
     };
 
-    contract = &empty_contract;
+    memcpy(&contract, &empty_contract, sizeof(empty_contract));
+    
   } else {
+    memcpy(&contract, contract_pointer, sizeof(contract));
+
     char msg[100] = "";
     snprintf(msg,
              sizeof(msg),
              UI_TEXT_SEND_TOKEN_PROMPT,
-             contract->symbol,
+             contract.symbol,
              SOLANA_NAME);
     if (!core_confirmation(msg, solana_send_error)) {
       return false;
@@ -687,7 +691,7 @@ static bool verify_solana_transfer_token_transaction() {
 
   byte_array_to_hex_string(be_units, 8, amount_string, sizeof(amount_string));
   if (!convert_byte_array_to_decimal_string(16,
-                                            contract->decimal,
+                                            contract.decimal,
                                             amount_string,
                                             amount_decimal_string,
                                             sizeof(amount_decimal_string))) {
@@ -699,7 +703,7 @@ static bool verify_solana_transfer_token_transaction() {
            sizeof(display),
            UI_TEXT_VERIFY_AMOUNT,
            amount_decimal_string,
-           contract->symbol);
+           contract.symbol);
   if (!core_confirmation(display, solana_send_error)) {
     return false;
   }

apps/solana_app/solana_txn_helpers.c

@@ -148,8 +148,8 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
   utxn->blockhash = byte_array + offset;
   offset += SOLANA_BLOCKHASH_LENGTH;
 
-  // Instructions: Currently expecting count to be 3 or 4. TODO: Handle batch
-  // instructions
+  // Instructions: Currently expecting count to be 1 to 4, with only 1 transfer instruction. 
+  // TODO: Handle batch instructions
   offset += get_compact_array_size(
       byte_array + offset, &(utxn->instructions_count), &error);
   if (error != SOL_OK)
@@ -167,6 +167,10 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
   hex_string_to_byte_array(SOLANA_TOKEN_PROGRAM_ADDRESS,
                            SOLANA_ACCOUNT_ADDRESS_LENGTH * 2,
                            system_program_id[SOLANA_TOKEN_PROGRAM_ID_INDEX]);
+  // Set Associated Token Program address
+  hex_string_to_byte_array(SOLANA_ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+                           SOLANA_ACCOUNT_ADDRESS_LENGTH * 2,
+                           system_program_id[SOLANA_ASSOCIATED_TOKEN_PROGRAM_ID_INDEX]);
   // Set Compute Budget Program address
   hex_string_to_byte_array(
       SOLANA_COMPUTE_BUDGET_PROGRAM_ADDRESS,
@@ -200,10 +204,8 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
                                              SOLANA_ACCOUNT_ADDRESS_LENGTH,
                system_program_id[SOLANA_SOL_TRANSFER_PROGRAM_ID_INDEX],
                SOLANA_ACCOUNT_ADDRESS_LENGTH) == 0) {
-      if (utxn->instruction[i].account_addresses_index_count == 0)
-        return SOL_D_MIN_LENGTH;
-
-      if (utxn->instruction[i].opaque_data_length == 0)
+      if (utxn->instruction[i].account_addresses_index_count == 0
+          || utxn->instruction[i].opaque_data_length == 0)
         return SOL_D_MIN_LENGTH;
 
       utxn->transfer_instruction_index = i;
@@ -233,7 +235,8 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
                               SOLANA_ACCOUNT_ADDRESS_LENGTH,
                       system_program_id[SOLANA_TOKEN_PROGRAM_ID_INDEX],
                       SOLANA_ACCOUNT_ADDRESS_LENGTH) == 0) {
-      if (utxn->instruction[i].account_addresses_index_count == 0)
+      if (utxn->instruction[i].account_addresses_index_count == 0
+          || utxn->instruction[i].opaque_data_length == 0)
         return SOL_D_MIN_LENGTH;
 
       utxn->transfer_instruction_index = i;
@@ -268,6 +271,14 @@ int solana_byte_array_to_unsigned_txn(uint8_t *byte_array,
         default:
           break;
       }
+    } else if (memcmp(utxn->account_addresses +
+                          utxn->instruction[i].program_id_index *
+                              SOLANA_ACCOUNT_ADDRESS_LENGTH,
+                      system_program_id[SOLANA_ASSOCIATED_TOKEN_PROGRAM_ID_INDEX],
+                      SOLANA_ACCOUNT_ADDRESS_LENGTH) == 0) {
+      if (utxn->instruction[i].account_addresses_index_count == 0)
+        return SOL_D_MIN_LENGTH;
+
     } else if (memcmp(utxn->account_addresses +
                           utxn->instruction[i].program_id_index *
                               SOLANA_ACCOUNT_ADDRESS_LENGTH,
@@ -316,6 +327,10 @@ int solana_validate_unsigned_txn(const solana_unsigned_txn *utxn) {
   hex_string_to_byte_array(SOLANA_TOKEN_PROGRAM_ADDRESS,
                            SOLANA_ACCOUNT_ADDRESS_LENGTH * 2,
                            system_program_id[SOLANA_TOKEN_PROGRAM_ID_INDEX]);
+  // Set Associated Token Program address
+  hex_string_to_byte_array(SOLANA_ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+                           SOLANA_ACCOUNT_ADDRESS_LENGTH * 2,
+                           system_program_id[SOLANA_ASSOCIATED_TOKEN_PROGRAM_ID_INDEX]);
   // Set Compute Budget Program address
   hex_string_to_byte_array(
       SOLANA_COMPUTE_BUDGET_PROGRAM_ADDRESS,
@@ -364,6 +379,14 @@ int solana_validate_unsigned_txn(const solana_unsigned_txn *utxn) {
           return SOL_V_UNSUPPORTED_INSTRUCTION;
           break;
       }
+    } else if (memcmp(utxn->account_addresses +
+                          utxn->instruction[i].program_id_index *
+                              SOLANA_ACCOUNT_ADDRESS_LENGTH,
+                      system_program_id[SOLANA_ASSOCIATED_TOKEN_PROGRAM_ID_INDEX],
+                      SOLANA_ACCOUNT_ADDRESS_LENGTH) == 0) {
+      // no opaque data or instruction enum to validate
+      // do nothing
+
     } else if (memcmp(utxn->account_addresses +
                           utxn->instruction[i].program_id_index *
                               SOLANA_ACCOUNT_ADDRESS_LENGTH,

apps/solana_app/solana_txn_helpers.h

@@ -28,10 +28,11 @@
 #define SOLANA_ACCOUNT_ADDRESS_LENGTH 32
 #define SOLANA_BLOCKHASH_LENGTH 32
 
-#define SOLANA_PROGRAM_ID_COUNT 3    ///< Number of supported program ids
+#define SOLANA_PROGRAM_ID_COUNT 4    ///< Number of supported program ids
 #define SOLANA_SOL_TRANSFER_PROGRAM_ID_INDEX 0
 #define SOLANA_TOKEN_PROGRAM_ID_INDEX 1
-#define SOLANA_COMPUTE_BUDGET_PROGRAM_ID_INDEX 2
+#define SOLANA_ASSOCIATED_TOKEN_PROGRAM_ID_INDEX 2
+#define SOLANA_COMPUTE_BUDGET_PROGRAM_ID_INDEX 3
 
 #define SOLANA_TOKEN_PROGRAM_ADDRESS                                           \
   "06ddf6e1d765a193d9cbe146ceeb79ac1cb485ed5f5b37913a8cf5857eff00a9"    ///< "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
@@ -91,6 +92,8 @@ enum SOLANA_TOKEN_PROGRAM_INSTRUCTION {
   STPI_UI_AMOUNT_TO_AMOUNT
 };
 
+/// Ref :
+/// https://docs.rs/solana-sdk/latest/solana_sdk/compute_budget/enum.ComputeBudgetInstruction.html
 enum SOLANA_COMPUTE_BUDGET_INSTRUCTION {
   SCBI_UNUSED = 0,
   SCBI_REQUEST_HEAP_FRAME,
@@ -172,8 +175,8 @@ typedef struct solana_unsigned_txn {
   uint8_t *blockhash;
 
   uint16_t instructions_count;    // deserialization only supports max 4
-                                  // instructions: create account and transfer
-  solana_instruction instruction[4];     ///< Expects max 4 instructions
+                                  // instructions: compute unit limit, compute unit price, create account and transfer
+  solana_instruction instruction[4];     ///< Expects max 4 instructions: TODO: HANDLE ANY NUMBER/TYPE OF INSTRUCTIONS
   uint8_t transfer_instruction_index;    // Expects only 1 transfer instruction
   uint32_t compute_unit_limit;           // To calculate priority fee
   uint64_t compute_unit_price_micro_lamports;