blockydevs · 0xMMBD · Dec 12, 2023 · Dec 12, 2023 · Dec 12, 2023 · Dec 14, 2023
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,5 +4,5 @@
 - [ ] Target branch is `develop` <!-- unless you have a very good reason -->
 - [ ] Application version has been bumped <!-- required if your changes are to be deployed -->
 
-<!-- Make sure you followed the process described in https://developers.ledger.com/docs/embedded-app/maintenance/ before opening your Pull Request.
+<!-- Make sure you followed the process described in https://developers.ledger.com/docs/device-app/deliver/maintenance before opening your Pull Request.
 Don't hesitate to contact us directly on Discord if you have any questions ! https://developers.ledger.com/discord -->
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -8,54 +8,37 @@ on:
   pull_request:
 
 jobs:
-  build:
-    name: SonarQube analyze
+  sonarcloud:
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
+
     env:
-      SONAR_SCANNER_VERSION: 4.7.0.2747
-      SONAR_SERVER_URL: "https://sonarcloud.io"
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Download and set up sonar-scanner
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        run: |
-          apt-get update -y
-          apt-get upgrade -y
-          DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
-          curl -sL https://deb.nodesource.com/setup_16.x | bash -
-          apt-get install -y gcovr nodejs unzip lcov
-          mkdir -p $HOME/.sonar
-          curl -sSLo $HOME/.sonar/sonar-scanner.zip ${{ env.SONAR_SCANNER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> $GITHUB_PATH
-      - name: Download and set up build-wrapper
-        env:
-          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
-        run: |
-          curl -sSLo $HOME/.sonar/build-wrapper-linux-x86.zip ${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}
-          unzip -o $HOME/.sonar/build-wrapper-linux-x86.zip -d $HOME/.sonar/
-          echo "$HOME/.sonar/build-wrapper-linux-x86" >> $GITHUB_PATH
-      - name: Generate code coverage
-        working-directory: libsol
-        run: |
-          make COVERAGE=1
-          gcovr --root .. --sonarqube ../coverage.xml
-      - name: Run build-wrapper
-        run: |
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make clean all
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+    - uses: actions/checkout@v3
+      with:
+        # Disabling shallow clone is recommended for improving relevancy of reporting
+        fetch-depth: 0
+    - name: Install dependencies
+      run: |
+        apt-get update -y
+        apt-get upgrade -y
+        DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata
+        apt-get install -y libcmocka-dev gcovr unzip
+    - name:  Install sonar-scanner and build-wrapper
+      uses: sonarsource/sonarcloud-github-c-cpp@v2
+
+    - name: Generate code coverage
+      working-directory: libsol
+      run: |
+        make COVERAGE=1
+        gcovr --root .. --sonarqube ../coverage.xml
+    - name: Run build-wrapper
+      run: |
+        build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make clean all
+    - name: Run sonar-scanner
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      run: sonar-scanner --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" #Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
 APPNAME      = "Solana"
 APPVERSION_M = 1
 APPVERSION_N = 4
-APPVERSION_P = 2
+APPVERSION_P = 3
 APPVERSION   = "$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)"
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
@@ -131,6 +131,9 @@ include $(BOLOS_SDK)/Makefile.glyphs
 APP_SOURCE_PATH += src
 SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
 
+# Allow usage of function from lib_standard_app/crypto_helpers.c
+APP_SOURCE_FILES += ${BOLOS_SDK}/lib_standard_app/crypto_helpers.c
+
 ifneq ($(TARGET_NAME),TARGET_STAX)
 SDK_SOURCE_PATH += lib_ux
 endif

diff --git a/libsol/common_byte_strings.h b/libsol/common_byte_strings.h
@@ -48,6 +48,10 @@
     0x06, 0xdd, 0xf6, 0xe1, 0xd7, 0x65, 0xa1, 0x93, 0xd9, 0xcb, 0xe1, 0x46, 0xce, 0xeb, 0x79,     \
         0xac, 0x1c, 0xb4, 0x85, 0xed, 0x5f, 0x5b, 0x37, 0x91, 0x3a, 0x8c, 0xf5, 0x85, 0x7e, 0xff, \
         0x00, 0xa9
+#define PROGRAM_ID_SPL_TOKEN_2022 /* TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb */ \
+        0x06, 0xdd, 0xf6, 0xe1, 0xee, 0x75, 0x8f, 0xde, 0x18, 0x42, 0x5d, 0xbc, 0xe4, 0x6c, 0xcd, \
+        0xda, 0xb6, 0x1a, 0xfc, 0x4d, 0x83, 0xb9, 0x0d, 0x27, 0xfe, 0xbd, 0xf9, 0x28, 0xd8, 0xa1, \
+        0x8b, 0xfc
 #define PROGRAM_ID_SYSTEM BYTES32_BS58_1
 #define PROGRAM_ID_STAKE  /* "Stake11111111111111111111111111111111111111" */                     \
     0x06, 0xa1, 0xd8, 0x17, 0x91, 0x37, 0x54, 0x2a, 0x98, 0x34, 0x37, 0xbd, 0xfe, 0x2a, 0x7a,     \

diff --git a/libsol/include/spl/token.h b/libsol/include/spl/token.h
@@ -100,6 +100,8 @@ typedef struct Token_COption_Pubkey {
 
 /**
  * Instructions supported by the token program.
+ * List is compliant with the program source code at:
+ * https://github.com/solana-labs/solana-program-library/blob/master/token/program-2022/src/instruction.rs
  */
 typedef enum Token_TokenInstruction_Tag {
     /**
@@ -439,6 +441,85 @@ typedef enum Token_TokenInstruction_Tag {
      *   0. `[writable]`  The native token account to sync with its underlying lamports.
      */
     Token_TokenInstruction_SyncNative,
+
+    /**
+     * The common instruction prefix for Transfer Fee extension instructions.
+     * See `extension::transfer_fee::instruction::TransferFeeInstruction` for
+     * further details about the extended instructions that share this
+     * instruction prefix
+     */
+    Token_TokenExtensionInstruction_TransferFeeExtension = 26,
+
+    /**
+     * The common instruction prefix for Confidential Transfer extension instructions.
+     * See `extension::confidential_transfer::instruction::ConfidentialTransferInstruction` for
+     * further details about the extended instructions that share this
+     * instruction prefix
+     */
+    Token_TokenExtensionInstruction_ConfidentialTransferExtension = 27,
+
+    /**
+     * The common instruction prefix for Default Account State extension instructions.
+     * See `extension::default_account_state::instruction::DefaultAccountStateInstruction` for
+     * further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_DefaultAccountStateExtension = 28,
+
+    /**
+     * The common instruction prefix for Memo Transfer account extension instructions.
+     * See `extension::memo_transfer::instruction::RequiredMemoTransfersInstruction` for
+     * further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_MemoTransferExtension = 30,
+
+    /**
+     * The common instruction prefix for Interest Bearing extension instructions.
+     * See `extension::interest_bearing_mint::instruction::InterestBearingMintInstruction` for
+     * further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_InterestBearingMintExtension = 33,
+
+    /**
+     * The common instruction prefix for CPI Guard account extension instructions.
+     * See `extension::cpi_guard::instruction::CpiGuardInstruction` for
+     * further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_CpiGuardExtension = 34,
+
+    /**
+     * The common instruction prefix for transfer hook extension instructions.
+     * See `extension::transfer_hook::instruction::TransferHookInstruction`
+     * for further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_TransferHookExtension = 36,
+
+    /**
+     * The common instruction prefix for the confidential transfer fee extension instructions.
+     * See `extension::confidential_transfer_fee::instruction::ConfidentialTransferFeeInstruction`
+     * for further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_ConfidentialTransferFeeExtension = 37,
+
+    /**
+     * The common instruction prefix for metadata pointer extension instructions.
+     * See `extension::metadata_pointer::instruction::MetadataPointerInstruction`
+     * for further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_MetadataPointerExtension = 39,
+
+    /**
+     * The common instruction prefix for group pointer extension instructions.
+     * See `extension::group_pointer::instruction::GroupPointerInstruction`
+     * for further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_GroupPointerExtension = 40,
+
+    /**
+     * The common instruction prefix for group member pointer extension instructions.
+     * See `extension::group_member_pointer::instruction::GroupMemberPointerInstruction`
+     * for further details about the extended instructions that share this instruction prefix
+     */
+    Token_TokenExtensionInstruction_GroupMemberPointerExtension = 41
 } Token_TokenInstruction_Tag;
 
 typedef struct Token_TokenInstruction_Token_InitializeMint_Body {

diff --git a/libsol/instruction.c b/libsol/instruction.c
@@ -2,6 +2,7 @@
 #include "serum_assert_owner_instruction.h"
 #include "spl_memo_instruction.h"
 #include "spl_token_instruction.h"
+#include "spl_token2022_instruction.h"
 #include "compute_budget_instruction.h"
 #include "stake_instruction.h"
 #include "system_instruction.h"
@@ -18,6 +19,8 @@ enum ProgramId instruction_program_id(const Instruction* instruction, const Mess
         return ProgramIdVote;
     } else if (memcmp(program_id, &spl_token_program_id, PUBKEY_SIZE) == 0) {
         return ProgramIdSplToken;
+    } else if(memcmp(program_id, &spl_token2022_program_id, PUBKEY_SIZE) == 0) {
+        return ProgramIdSplToken;//Treat the Token2022 exactly the same as the SplToken
     } else if (memcmp(program_id, &spl_associated_token_account_program_id, PUBKEY_SIZE) == 0) {
         return ProgramIdSplAssociatedTokenAccount;
     } else if (is_serum_assert_owner_program_id(program_id)) {

diff --git a/libsol/message.c b/libsol/message.c
@@ -26,6 +26,10 @@ int process_message_body(const uint8_t* message_body,
     InstructionInfo instruction_info[MAX_INSTRUCTIONS];
     explicit_bzero(instruction_info, sizeof(InstructionInfo) * MAX_INSTRUCTIONS);
 
+    //Track if given transaction contains token2022 extensions that are not fully supported
+    //Needed to display user proper warning
+    SplTokenExtensionsMetadata token_extensions_metadata = {false};
+
     size_t display_instruction_count = 0;
     InstructionInfo* display_instruction_info[MAX_INSTRUCTIONS];
 
@@ -36,6 +40,8 @@ int process_message_body(const uint8_t* message_body,
         BAIL_IF(instruction_validate(&instruction, header));
 
         InstructionInfo* info = &instruction_info[instruction_count];
+        bool ignore_instruction_info = false;
+
         enum ProgramId program_id = instruction_program_id(&instruction, header);
         switch (program_id) {
             case ProgramIdSerumAssertOwner: {
@@ -58,7 +64,12 @@ int process_message_body(const uint8_t* message_body,
                 break;
             }
             case ProgramIdSplToken:
-                if (parse_spl_token_instructions(&instruction, header, &info->spl_token) == 0) {
+                if (parse_spl_token_instructions(&instruction,
+                                                 header,
+                                                 &info->spl_token,
+                                                 &token_extensions_metadata,
+                                                 &ignore_instruction_info) == 0) {
+                    info->spl_token.is_token2022_kind = is_token2022_instruction(&instruction, header);
                     info->kind = program_id;
                 }
                 break;
@@ -89,6 +100,9 @@ int process_message_body(const uint8_t* message_body,
             case ProgramIdUnknown:
                 break;
         }
+        if(ignore_instruction_info){
+            continue;
+        }
         switch (info->kind) {
             case ProgramIdSplAssociatedTokenAccount:
             case ProgramIdSplToken:
@@ -120,5 +134,8 @@ int process_message_body(const uint8_t* message_body,
         BAIL_IF(instruction_info[i].kind == ProgramIdUnknown);
     }
 
+    if (token_extensions_metadata.generate_extension_warning) {
+        BAIL_IF(print_spl_token_extension_warning());
+    }
     return print_transaction(print_config, display_instruction_info, display_instruction_count);
 }
diff --git a/libsol/spl_token2022_instruction.c b/libsol/spl_token2022_instruction.c
@@ -0,0 +1,5 @@
+#include "sol/print_config.h"
+#include "common_byte_strings.h"
+
+
+const Pubkey spl_token2022_program_id = {{PROGRAM_ID_SPL_TOKEN_2022}};
diff --git a/libsol/spl_token2022_instruction.h b/libsol/spl_token2022_instruction.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sol/parser.h"
+#include "sol/print_config.h"
+#include "sol/transaction_summary.h"
+#include "spl/token.h"
+#include "instruction.h"
+
+#define SplTokenExtensionKind(b) Token_TokenExtensionInstruction_##b
+
+extern const Pubkey spl_token2022_program_id;
+