Merge pull request #3 from Zondax/master

Upgrade to 1.46.3

.github/workflows/ledger.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  scan-build:
+    name: Clang Static Analyzer
+    runs-on: ubuntu-latest
+
+    container:
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build with Clang Static Analyzer
+        run: |
+          scan-build --use-cc=clang -analyze-headers -enable-checker security -enable-checker unix -enable-checker valist -o scan-build --status-bugs make default
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: scan-build
+          path: scan-build

.github/workflows/main.yml

@@ -22,6 +22,7 @@ jobs:
           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
 
@@ -45,11 +46,11 @@ jobs:
           cd ./app/rust
           cargo clippy --version
           cargo clippy --all-features --all-targets || true
-      - name: audit
-        run: |
-          cd ./app/rust
-          cargo audit --version
-          cargo audit
+      # - name: audit
+      #   run: |
+      #     cd ./app/rust
+      #     cargo audit --version
+      #     cargo audit
       - name: run tests
         run: |
           cd ./app/rust
@@ -102,7 +103,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v2
         with:
-          node-version: '14.4.0'
+          node-version: '14.17.0'
       - name: Install yarn
         run: |
           npm install -g yarn
@@ -134,7 +135,7 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v2
         with:
-          node-version: '14.4.0'
+          node-version: '14.17.0'
       - name: Install yarn
         run: |
           npm install -g yarn
@@ -149,3 +150,60 @@ jobs:
         run: |
           export PATH=~/.cargo/bin:$PATH
           cd tests_zemu && yarn testSR25519
+
+  build_package:
+    needs: [ configure, build, build_ledger, test_zemu, test_zemu_sr25519 ]
+    if: ${{ github.ref == 'refs/heads/master' }}
+    runs-on: ubuntu-latest
+    container:
+      image: zondax/builder-bolos:latest
+      options: --user ${{ needs.configure.outputs.uid_gid }}
+    env:
+      BOLOS_SDK: ${{ github.workspace }}/deps/nanos-secure-sdk
+      BOLOS_ENV: /opt/bolos
+      HOME: /home/zondax_circle
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Install deps
+        run: pip install ledgerblue
+      - name: Build
+        shell: bash -l {0}
+        run: |
+          source $HOME/.cargo/env
+          make SUBSTRATE_PARSER_FULL=0
+      - name: Set tag name var (1)
+        id: vars_1
+        run: echo ::set-output name=tag_name::$(./app/pkg/installer_s.sh version)
+      - name: Create or Update Release (1)
+        id: create_release_1
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          files: ./app/pkg/installer_s.sh
+          tag_name: ${{ steps.vars_1.outputs.tag_name }}
+          draft: false
+          prerelease: false
+      - name: Clear and rebuild XL version
+        shell: bash -l {0}
+        run: |
+          source $HOME/.cargo/env
+          make SUBSTRATE_PARSER_FULL=1
+          cp rust/app/pkg/installer_s.sh rust/app/pkg/installer_baking_s.sh
+          cp app/pkg/installer_s.sh app/pkg/installer_XL_s.sh
+      - name: Set tag name var (2)
+        id: vars_2
+        run: echo ::set-output name=tag_name::$(./app/pkg/installer_XL_s.sh version)
+      - name: Create or Update Release (2)
+        id: create_release_2
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          files: ./app/pkg/installer_XL_s.sh
+          tag_name: ${{ steps.vars_2.outputs.tag_name }}
+          draft: false
+          prerelease: false          

README.md

@@ -1,6 +1,6 @@
 # Ledger Edgeware app
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
-[![CircleCI](https://circleci.com/gh/Zondax/ledger-edgeware.svg?style=shield&circle-token=1347836eec60736c630e1785834c4b3b0e8db221)](https://circleci.com/gh/Zondax/ledger-edgeware)
+[![GithubActions](https://github.com/zondax/ledger-edgeware/actions/workflows/main.yml/badge.svg)](https://github.com/Zondax/ledger-edgeware/blob/main/.github/workflows/main.yaml)
 
 -------------------
 

app/Makefile

@@ -103,7 +103,7 @@ DEFINES += HAVE_PENDING_REVIEW_SCREEN
 
 
 ifeq ($(TARGET_NAME),TARGET_NANOS)
-APP_STACK_SIZE:=3472
+APP_STACK_SIZE:=3216
 ICONNAME:=$(CURDIR)/nanos_icon.gif
 OUTPUT_ELF ?= $(CURDIR)/output/app_s.elf
 OUTPUT_INSTALLER := $(CURDIR)/pkg/installer_s.sh

app/Makefile.version

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

app/src/addr.c

@@ -18,9 +18,11 @@
 #include "coin.h"
 #include "zxerror.h"
 #include "zxmacros.h"
+#include "zxformat.h"
 #include "app_mode.h"
 #include "crypto.h"
 
+
 zxerr_t addr_getNumItems(uint8_t *num_items) {
     zemu_log_stack("addr_getNumItems");
     *num_items = 1;

app/src/coin.h

@@ -53,7 +53,7 @@ typedef enum {
 
 #define COIN_GENESIS_HASH                   "742a2ca70c2fda6cee4f8df98d64c4c670a052d9568058982dad9d5a7a135c5b"
 #define COIN_NAME                           "Edgeware"
-#define COIN_TICKER                         "EDG"
+#define COIN_TICKER                         "EDG "
 
 #define COIN_SECRET_REQUIRED_CLICKS         0
 

app/src/common/actions.h

@@ -88,17 +88,16 @@ __Z_INLINE zxerr_t app_fill_address(key_kind_e addressKind) {
 }
 
 __Z_INLINE key_kind_e get_key_type(uint8_t num) {
-#ifdef SUPPORT_SR25519
     switch (num) {
         case 0x00:
             return key_ed25519;
+#ifdef SUPPORT_SR25519
         case 0x01:
             return key_sr25519;
-    }
-    return 0xff;
-#else
-    return key_ed25519;
 #endif
+        default:
+            return 0xff;
+    }
 }
 
 __Z_INLINE void app_reply_error() {