Bring changes from upstream

.circleci/config.yml

@@ -0,0 +1,100 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: zondax/circleci:latest
+    steps:
+      - checkout
+      - run: git submodule update --init --recursive
+      - run: cmake -DDISABLE_DOCKER_BUILDS=ON -DCMAKE_BUILD_TYPE=Debug . && make
+      # Unfortunately need to disable leak sanitizer https://github.com/google/sanitizers/issues/916
+      # Still run all other ASAN components
+      - run: GTEST_COLOR=1 ASAN_OPTIONS=detect_leaks=0 ctest -VV
+
+  build_ledger:
+    docker:
+      - image: zondax/builder-bolos:latest
+    environment:
+      - BOLOS_SDK=/home/zondax/project/deps/nanos-secure-sdk
+      - BOLOS_ENV=/opt/bolos
+    steps:
+      - checkout
+      # Docker entrypoint is not considered
+      - run: git submodule update --init --recursive
+      - run:
+          name: Build
+          command: |
+            source /home/zondax/.cargo/env
+            cd /home/zondax/project
+            make
+
+  test_zemu:
+    machine:
+      image: ubuntu-1604:201903-01
+    working_directory: ~/repo
+    environment:
+      BASH_ENV: "/opt/circleci/.nvm/nvm.sh"
+    steps:
+      - checkout
+      - run: git submodule update --init --recursive
+      - run:
+          name: Build Ledger app
+          command: |
+            make
+      - run:
+          name: Install node + yarn
+          command: |
+            nvm install 13.12.0
+            nvm use 13.12.0
+            npm install -g yarn
+      - run:
+          name: Build/Install build js deps
+          command: |
+            nvm use 13.12.0
+            make zemu_install
+      - run:
+          name: Workaround/Pull docker
+          command: |
+            docker pull zondax/builder-zemu
+      - run:
+          name: Run zemu tests
+          command: |
+            nvm use 13.12.0
+            make zemu_test
+
+  build_package:
+    docker:
+      - image: zondax/builder-bolos:latest
+    environment:
+      - BOLOS_SDK=/home/zondax/project/deps/nanos-secure-sdk
+      - BOLOS_ENV=/opt/bolos
+    steps:
+      - checkout
+      - run: git submodule update --init --recursive
+      - run:
+          name: Build
+          command: |
+            source /home/zondax/.cargo/env
+            cd /home/zondax/project
+            make
+      - store_artifacts:
+          path: /home/zondax/project/app/pkg/zxtool.sh
+      - run: /home/zondax/go/bin/ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete $(/home/zondax/project/app/pkg/zxtool.sh version) /home/zondax/project/app/pkg/zxtool.sh
+
+workflows:
+  version: 2
+
+  default:
+    jobs:
+      - build
+      - build_ledger
+      - test_zemu
+#      - build_package:
+#          requires:
+#            - build
+#            - build_ledger
+#            - test_zemu
+#          filters:
+#            branches:
+#              only:
+#                - master

.editorconfig

@@ -0,0 +1,16 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+trim_trailing_whitespace = true
+end_of_line = lf
+insert_final_newline = true
+
+[*.{c,h,cpp,hpp}]
+indent_style = space
+indent_size = 4
+
+[*.{yml,sh}]
+indent_style = space
+indent_size = 2

.gdbinit

@@ -0,0 +1,11 @@
+# https://www.jetbrains.com/help/clion/configuring-debugger-options.html#gdbinit-lldbinit
+#
+# You need to create `$HOME/.gdbinit` with the following content:
+# set auto-load local-gdbinit on
+# add-auto-load-safe-path /
+
+set architecture arm
+handle SIGILL nostop pass noprint
+add-symbol-file app/bin/app.elf 0x40000000
+set backtrace limit 20
+b *0x40000000

.gitignore

@@ -1,64 +1,90 @@
+# Created by .ignore support plugin (hsz.mobi)
+### C template
 # Prerequisites
 *.d
 
-# Compiled Object files
-*.slo
-*.lo
+# Object files
 *.o
+*.ko
 *.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
 
 # Precompiled Headers
 *.gch
 *.pch
 
-# Compiled Dynamic libraries
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
 *.so
+*.so.*
 *.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
 
 # Executables
 *.exe
 *.out
 *.app
-
-# OS related files
-.DS_Store
-
-# Others
-cmake-build-debug/
-\.idea/workspace\.xml
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+\cmake-build-debug
 \.idea/
-src/ledger/bin/
-src/ledger/debug/
-src/ledger/obj/
-src/goclient/vendor
-pkg/
-src/goclient/goclient
-
-src/ledger/pkgdemo/loaddemo\.sh
-
-src/ledger/pkgdemo/app\.hex
-
-obj/app\.elf
+/tmp/
+/deps/nano2-sdk/
+
+# Created by cmake
+googletest-download/
+googletest-src/
+googletest-build/
+CMakeFiles/
+CMakeCache.txt
+unittests
+*.cmake
+Testing/
+cmake-build-fuzz/
 
-debug/app\.map
-
-debug/app\.asm
-
-bin/app\.hex
-
-bin/app\.elf
-
-src/glyphs\.h
-
-src/glyphs\.c
+# Others
+/cmake-build-debug/
+/cmake-build-fuzz/
+\.idea
+/app/bin/
+/app/debug/
+/app/obj/
+
+\deps/*
+!\deps/nanos-secure-sdk
+\deps/nano2-sdk
+!\deps/ledger-zxlib
+!\deps/tinycbor
+!\deps/BLAKE
+
+app/src/glyphs.c
+
+app/src/glyphs.h
+/build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "deps/nanos-secure-sdk"]
+	path = deps/nanos-secure-sdk
+	url = https://github.com/LedgerHQ/nanos-secure-sdk.git

CMakeLists.txt

@@ -0,0 +1,93 @@
+#*******************************************************************************
+#*   (c) 2018 Zondax GmbH
+#*
+#*  Licensed under the Apache License, Version 2.0 (the "License");
+#*  you may not use this file except in compliance with the License.
+#*  You may obtain a copy of the License at
+#*
+#*      http://www.apache.org/licenses/LICENSE-2.0
+#*
+#*  Unless required by applicable law or agreed to in writing, software
+#*  distributed under the License is distributed on an "AS IS" BASIS,
+#*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#*  See the License for the specific language governing permissions and
+#*  limitations under the License.
+#********************************************************************************
+cmake_minimum_required(VERSION 3.0)
+project(ledger-cosmos VERSION 0.0.0)
+enable_testing()
+
+cmake_policy(SET CMP0025 NEW)
+set(CMAKE_CXX_STANDARD 11)
+
+include(cmake/conan/CMakeLists.txt)
+add_subdirectory(cmake/gtest)
+
+string(APPEND CMAKE_CXX_FLAGS " -fsanitize=address -fno-omit-frame-pointer")
+string(APPEND CMAKE_LINKER_FLAGS " -fsanitize=address -fno-omit-frame-pointer")
+
+##############################################################
+##############################################################
+#  static libs
+file(GLOB_RECURSE JSMN_SRC
+        deps/jsmn/src/jsmn.c
+        )
+
+file(GLOB_RECURSE LIB_SRC
+        app/src/json/json_parser.c
+        app/src/tx_parser.c
+        app/src/tx_display.c
+        app/src/tx_validate.c
+        app/src/parser.c
+        app/src/parser_impl.c
+        deps/ledger-zxlib/app/common/app_mode.c
+        )
+
+add_library(app_lib STATIC
+        ${LIB_SRC}
+        ${JSMN_SRC}
+        )
+
+target_include_directories(app_lib PUBLIC
+        deps/ledger-zxlib/include
+        deps/jsmn/src
+        app/src
+        app/src/common
+        deps/ledger-zxlib/app/common
+        )
+
+##############################################################
+##############################################################
+#  Tests
+file(GLOB_RECURSE TESTS_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/tests/*.cpp)
+
+add_executable(unittests ${TESTS_SRC})
+target_include_directories(unittests PUBLIC
+        ${gtest_SOURCE_DIR}/include
+        ${gmock_SOURCE_DIR}/include
+        ${CONAN_INCLUDE_DIRS_FMT}
+        ${CONAN_INCLUDE_DIRS_JSONCPP}
+        deps/jsmn/src
+        )
+
+target_link_libraries(unittests PRIVATE
+        gtest_main
+        app_lib
+        CONAN_PKG::fmt
+        CONAN_PKG::jsoncpp)
+
+add_test(unittests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittests)
+set_tests_properties(unittests PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
+
+file(GLOB_RECURSE FUZZING_SRC
+        ${CMAKE_CURRENT_SOURCE_DIR}/fuzzing/fuzzingMain.cpp
+        tests/util/common.cpp
+        )
+
+add_executable(fuzzing_stub ${FUZZING_SRC})
+target_include_directories(fuzzing_stub PUBLIC
+        app/src
+        deps/jsmn/src
+        )
+target_link_libraries(fuzzing_stub app_lib)

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2018 ZondaX GmbH
+   Copyright 2018-2020 Zondax GmbH
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.