Parser

.circleci/config.yml

@@ -1,4 +1,21 @@
-version: 2
+version: 2.1
+
+commands:
+  restore-sccache-cache:
+    steps:
+      - restore_cache:
+          name: Restore sccache cache
+          key: sccache-cache-stable-{{ arch }}
+#          key: sccache-cache-stable-{{ arch }}-{{ .Environment.CIRCLE_JOB }}
+  save-sccache-cache:
+    steps:
+      - save_cache:
+          name: Save sccache cache
+#          key: sccache-cache-stable-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ epoch }}
+          key: sccache-cache-stable-{{ arch }}-{{ epoch }}
+          paths:
+            - "~/.cache/sccache"
+
 jobs:
   build:
     docker:
@@ -27,7 +44,34 @@ jobs:
             source /home/zondax/.cargo/env
             cd /home/zondax/project
             make
-
+  build_rust:
+    docker:
+      - image: zondax/rust-ci:latest
+    steps:
+      - checkout
+      - run:
+          name: rustfmt
+          command: |
+            cd ~/project/app/rust
+            cargo fmt --version
+            cargo fmt -- --check
+      - run:
+          name: clippy
+          command: |
+            cd ~/project/app/rust
+            cargo clippy --version
+            cargo clippy --all-features --all-targets || true
+      - run:
+          name: audit
+          command: |
+            cd ~/project/app/rust
+            cargo audit --version
+            cargo audit
+      - run:
+          name: run tests
+          command: |
+            cd ~/project/app/rust
+            cargo test
   test_zemu:
     machine:
       image: ubuntu-1604:201903-01
@@ -57,7 +101,6 @@ jobs:
           command: |
             nvm use 13.12.0
             make zemu_test
-
   build_package:
     docker:
       - image: zondax/builder-bolos:latest
@@ -83,14 +126,15 @@ workflows:
   default:
     jobs:
       - build
+      - build_rust
       - build_ledger
       - test_zemu
       - build_package:
           requires:
             - build
+            - build_rust
             - build_ledger
             - test_zemu
           filters:
             branches:
               only:
-                - master

.gitignore

@@ -86,3 +86,7 @@ cmake-build-fuzz/
 yarn.lock
 !/tests_zemu/yarn.lock
 !/tests_zemu/yarn-error.log
+
+app/tmp.gif
+
+app/tmp.gif~

CMakeLists.txt

@@ -25,58 +25,3 @@ 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")
-
-add_definitions(-DAPP_STANDARD)
-
-##############################################################
-##############################################################
-#  static libs
-file(GLOB_RECURSE OTHERLIBS_SRC
-        )
-
-file(GLOB_RECURSE LIB_SRC
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/BLAKE2/ref/blake2b-ref.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/hexutils.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/bignum.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/src/zxmacros.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/hexutils.c
-        #########
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
-        )
-
-add_library(app_lib STATIC
-        ${LIB_SRC}
-        ${OTHERLIBS_SRC}
-        )
-
-target_include_directories(app_lib PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/BLAKE2/ref
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/ledger-zxlib/include
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/lib
-        )
-
-##############################################################
-##############################################################
-#  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}
-        ${CMAKE_CURRENT_SOURCE_DIR}/deps/BLAKE2/ref
-        )
-
-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)

Makefile

@@ -22,7 +22,7 @@ TESTS_ZEMU_JS_PACKAGE = "@zondax/ledger-blockstack"
 TESTS_ZEMU_JS_DIR = $(CURDIR)/js
 
 ifeq ($(BOLOS_SDK),)
-include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk
+	include $(CURDIR)/deps/ledger-zxlib/dockerized_build.mk
 else
 default:
 	$(MAKE) -C app

app/Makefile

@@ -22,6 +22,24 @@ endif
 
 MY_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 
+ifeq ($(APP_TESTING),1)
+DEFINES += APP_TESTING
+DEFINES += ZEMU_LOGGING
+endif
+
+all: bin/app.elf
+	@echo "#!/usr/bin/env bash" > $(CURDIR)/pkg/zxtool.sh
+	@echo "APPNAME=\"${APPNAME}\"" >> $(CURDIR)/pkg/zxtool.sh
+	@echo "APPVERSION=\"${APPVERSION}\"" >> $(CURDIR)/pkg/zxtool.sh
+	@echo "APPPATH=\""${APPPATH}"\"" >> $(CURDIR)/pkg/zxtool.sh
+	@echo "LOAD_PARAMS=\"${COMMON_LOAD_PARAMS}\"" >> $(CURDIR)/pkg/zxtool.sh
+	@echo "DELETE_PARAMS=\"${COMMON_DELETE_PARAMS}\"" >> $(CURDIR)/pkg/zxtool.sh
+	@echo "APPHEX=\"" >> $(CURDIR)/pkg/zxtool.sh
+	@cat $(CURDIR)/bin/app.hex >> $(CURDIR)/pkg/zxtool.sh
+	@echo "\"" >> $(CURDIR)/pkg/zxtool.sh
+	@cat $(CURDIR)/../deps/ledger-zxlib/scripts/template.sh >> $(CURDIR)/pkg/zxtool.sh
+	@chmod +x $(CURDIR)/pkg/zxtool.sh
+
 include $(BOLOS_SDK)/Makefile.defines
 
 ifndef COIN
@@ -66,38 +84,25 @@ ifndef ICONNAME
 $(error ICONNAME is not set)
 endif
 
-all: default
-	@echo "#!/usr/bin/env bash" > $(CURDIR)/pkg/zxtool.sh
-	@echo "APPNAME=\"${APPNAME}\"" >> $(CURDIR)/pkg/zxtool.sh
-	@echo "APPVERSION=\"${APPVERSION}\"" >> $(CURDIR)/pkg/zxtool.sh
-	@echo "APPPATH=\""${APPPATH}"\"" >> $(CURDIR)/pkg/zxtool.sh
-	@echo "LOAD_PARAMS=\"${COMMON_LOAD_PARAMS}\"" >> $(CURDIR)/pkg/zxtool.sh
-	@echo "DELETE_PARAMS=\"${COMMON_DELETE_PARAMS}\"" >> $(CURDIR)/pkg/zxtool.sh
-	@echo "APPHEX=\"" >> $(CURDIR)/pkg/zxtool.sh
-	@cat $(CURDIR)/bin/app.hex >> $(CURDIR)/pkg/zxtool.sh
-	@echo "\"" >> $(CURDIR)/pkg/zxtool.sh
-	@cat $(CURDIR)/../deps/ledger-zxlib/scripts/template.sh >> $(CURDIR)/pkg/zxtool.sh
-	@chmod +x $(CURDIR)/pkg/zxtool.sh
-
 ############
 # Platform
 
-DEFINES   += UNUSED\(x\)=\(void\)x
-DEFINES   += PRINTF\(...\)=
+DEFINES       += UNUSED\(x\)=\(void\)x
+DEFINES       += PRINTF\(...\)=
 
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
-DEFINES   += APPVERSION=\"$(APPVERSION)\"
+DEFINES       += APPVERSION=\"$(APPVERSION)\"
+
+DEFINES       += OS_IO_SEPROXYHAL
+DEFINES       += HAVE_BAGL HAVE_SPRINTF
+DEFINES       += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
 
-DEFINES += OS_IO_SEPROXYHAL
-DEFINES += HAVE_BAGL HAVE_SPRINTF
-DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=7 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
+DEFINES       += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
 
-DEFINES += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)
-DEFINES   += USB_SEGMENT_SIZE=64
-DEFINES   += HAVE_BOLOS_APP_STACK_CANARY
+DEFINES       += USB_SEGMENT_SIZE=64
+DEFINES       += HAVE_BOLOS_APP_STACK_CANARY
 
-WEBUSB_URL     = www.ledgerwallet.com
-DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=$(shell echo -n $(WEBUSB_URL) | wc -c) WEBUSB_URL=$(shell echo -n $(WEBUSB_URL) | sed -e "s/./\\\'\0\\\',/g")
+DEFINES       += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
 DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=300
@@ -117,7 +122,7 @@ DEFINES       += HAVE_BLE_APDU BLE_COMMAND_TIMEOUT_MS=2000
 SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
 else
 # Assume Nano S
-DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=128
+DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=64
 DEFINES       += COMPLIANCE_UX_160 HAVE_UX_LEGACY HAVE_UX_FLOW
 endif
 
@@ -154,7 +159,8 @@ AFLAGS +=
 
 LD       := $(GCCPATH)arm-none-eabi-gcc
 LDFLAGS  += -O3 -Os -z muldefs
-LDLIBS   += -Lrust/target/thumbv6m-none-eabi/release -lrslib -lm -lgcc -lc
+LDLIBS   += -lm -lgcc -lc
+LDLIBS   += -Lrust/target/thumbv6m-none-eabi/release -lrslib
 
 ##########################
 include $(BOLOS_SDK)/Makefile.glyphs
@@ -168,28 +174,34 @@ APP_SOURCE_PATH += $(MY_DIR)/../deps/ledger-zxlib/app/common
 SDK_SOURCE_PATH += lib_stusb lib_stusb_impl
 SDK_SOURCE_PATH  += lib_ux
 
+.PHONY: rust
 rust:
 	cd rust && CARGO_HOME="$(CURDIR)/rust/.cargo" cargo build --target thumbv6m-none-eabi --release
 
+# Before linking, we need to be sure rust lib is there
+bin/app.elf: rust
+
+.PHONY: rust_clean
 rust_clean:
 	cd rust && CARGO_HOME="$(CURDIR)/rust/.cargo" cargo clean
 
+clean: rust_clean
+
 # load, delete and listvariants are provided to comply with Ledger requirements
+.PHONY: load
 load:
 	python -m ledgerblue.loadApp $(APP_LOAD_PARAMS)
 
+.PHONY: delete
 delete:
 	python -m ledgerblue.deleteApp $(COMMON_DELETE_PARAMS)
 
-.PHONY: rust
-
-all: default rust
-
 # Import generic rules from the SDK
 include $(BOLOS_SDK)/Makefile.rules
 
 #add dependency on custom makefile filename
 dep/%.d: %.c Makefile
 
+.PHONY: listvariants
 listvariants:
 	@echo VARIANTS COIN STX