Merge pull request #19 from Zondax/dev

Display amounts in AXL for testnet

.github/workflows/main.yml

@@ -25,8 +25,6 @@ jobs:
         run: |
           sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
           make deps
-          brew install conan
-          conan config install https://github.com/conan-io/conanclientcert.git
       - run: cmake -DCMAKE_BUILD_TYPE=Debug . && make
       - run: GTEST_COLOR=1 ASAN_OPTIONS=detect_leaks=0 ctest -VV
 
@@ -209,4 +207,4 @@ jobs:
           files: ./app/pkg/installer_nanos_plus.sh
           tag_name: ${{ steps.nanosp.outputs.tag_name }}
           draft: false
-          prerelease: false
+          prerelease: false

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=3
+APPVERSION_P=4

app/src/coin.h

@@ -43,6 +43,7 @@ typedef enum {
 #define APPVERSION_LINE2                   ("v" APPVERSION)
 
 #define COIN_DEFAULT_CHAINID                "axelar-dojo-1"
+#define COIN_DEFAULT_TESTNETID              "axelar-testnet-lisbon-3"
 
 #define COIN_DEFAULT_DENOM_BASE             "uaxl"
 #define COIN_DEFAULT_DENOM_REPR             "AXL"

app/src/tx_display.c

@@ -90,7 +90,7 @@ __Z_INLINE parser_error_t calculate_is_default_chainid() {
 
     // get chain_id
     char outKey[2];
-    char outVal[20];
+    char outVal[25];
     uint8_t pageCount;
     INIT_QUERY_CONTEXT(outKey, sizeof(outKey),
                        outVal, sizeof(outVal),
@@ -111,10 +111,14 @@ __Z_INLINE parser_error_t calculate_is_default_chainid() {
     zemu_log_stack(outVal);
     zemu_log_stack(COIN_DEFAULT_CHAINID);
 
-    if (strcmp(outVal, COIN_DEFAULT_CHAINID) == 0) {
+    if (strncmp(outVal, COIN_DEFAULT_CHAINID, sizeof(COIN_DEFAULT_CHAINID) -1) == 0) {
         // If we don't match the default chainid, switch to expert mode
         display_cache.is_default_chain = true;
         zemu_log_stack("DEFAULT Chain ");
+    } else if (strncmp(outVal, COIN_DEFAULT_TESTNETID, sizeof(COIN_DEFAULT_TESTNETID) -1) == 0) {
+        // If we don't match the testnet chainid, switch to expert mode
+        display_cache.is_default_chain = true;
+        zemu_log_stack("TESTNET Chain ");
     } else {
         zemu_log_stack("Chain is NOT DEFAULT");
     }