Merge pull request #76 from Zondax/dev

Support for v5.30.x

.circleci/config.yml

@@ -52,24 +52,24 @@ jobs:
       # Docker entrypoint is not considered
       - run: git submodule update --init --recursive
       - run:
-          name: Build Standard app
+          name: Build Standard light parser app
           command: |
             source /home/zondax/.cargo/env
             make
       - run:
-          name: Build SR25519 app
+          name: Build Standard full parser app
           command: |
             source /home/zondax/.cargo/env
-            SUPPORT_SR25519=1 make
+            SUBSTRATE_PARSER_FULL=1 make
       - run:
-          name: Build Ledgeracio
+          name: Build SR25519 app
           command: |
             source /home/zondax/.cargo/env
-            COIN=Ledgeracio make
+            SUPPORT_SR25519=1 make
 
   test_zemu:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     resource_class: large
     working_directory: ~/repo
     environment:
@@ -94,9 +94,9 @@ jobs:
       - run:
           name: Build Ledger app
           command: |
-            make buildS
+            SUBSTRATE_PARSER_FULL=1 make buildS
             make clean
-            make buildX
+            SUBSTRATE_PARSER_FULL=1 make buildX
       - run:
           name: Build/Install build js deps
           command: |
@@ -112,7 +112,7 @@ jobs:
 
   test_zemu_ledgeracio:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     resource_class: large
     working_directory: ~/repo
     environment:
@@ -153,7 +153,7 @@ jobs:
 
   test_zemu_sr25519:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     resource_class: large
     working_directory: ~/repo
     environment:
@@ -243,14 +243,14 @@ workflows:
       - build_ledger
       - test_zemu
       - test_zemu_ledgeracio
-#      - test_zemu_sr25519
+      - test_zemu_sr25519
       - build_package:
           requires:
             - build
             - build_ledger
             - test_zemu
             - test_zemu_ledgeracio
-#            - test_zemu_sr25519
+            - test_zemu_sr25519
           filters:
             branches:
               only:
@@ -261,7 +261,7 @@ workflows:
             - build_ledger
             - test_zemu
             - test_zemu_ledgeracio
-#            - test_zemu_sr25519
+            - test_zemu_sr25519
           filters:
             branches:
               only:

CMakeLists.txt

@@ -29,6 +29,7 @@ string(APPEND CMAKE_CXX_FLAGS " -fno-omit-frame-pointer -g")
 string(APPEND CMAKE_LINKER_FLAGS " -fno-omit-frame-pointer -g")
 
 add_definitions(-DAPP_STANDARD)
+add_definitions(-DSUBSTRATE_PARSER_FULL)
 
 if(ENABLE_FUZZING)
     add_definitions(-DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION=1)
@@ -90,7 +91,6 @@ message(STATUS "LEDGER_MAJOR_VERSION [${MAJOR_RESULT}]: ${MAJOR_VERSION}" )
 message(STATUS "LEDGER_MINOR_VERSION [${MINOR_RESULT}]: ${MINOR_VERSION}" )
 
 add_definitions(
-    -DAPP_STANDARD
     -DLEDGER_MAJOR_VERSION=${MAJOR_VERSION}
     -DLEDGER_MINOR_VERSION=${MINOR_VERSION}
 )
@@ -113,7 +113,6 @@ file(GLOB_RECURSE LIB_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_impl.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/parser_txdef.c
         ${CMAKE_CURRENT_SOURCE_DIR}/app/src/substrate*.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/app/src/substrate*.h
         )
 
 add_library(app_lib STATIC ${LIB_SRC})
@@ -147,6 +146,7 @@ target_link_libraries(unittests PRIVATE
         CONAN_PKG::fmt
         CONAN_PKG::jsoncpp)
 
+add_compile_definitions(TESTVECTORS_DIR="${CMAKE_CURRENT_SOURCE_DIR}/tests/")
 add_test(unittests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittests)
 set_tests_properties(unittests PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests)
 

app/Makefile

@@ -53,6 +53,11 @@ DEFINES += SUPPORT_SR25519
 $(info ************  SR25519 ENABLED ************)
 endif
 
+ifeq ($(SUBSTRATE_PARSER_FULL),1)
+DEFINES += SUBSTRATE_PARSER_FULL
+$(info ************ FULL PARSER ENABLED ************)
+endif
+
 ifndef COIN
 COIN=KSM
 endif
@@ -205,6 +210,12 @@ rust:
 # Before linking, we need to be sure rust lib is there
 bin/app.elf: rust
 
+build_full_parser_s: SUBSTRATE_PARSER_FULL=1
+build_full_parser_s: buildS
+
+build_full_parser_x: SUBSTRATE_PARSER_FULL=1
+build_full_parser_x: buildX
+
 .PHONY: rust_clean
 rust_clean:
 	cd rust && CARGO_HOME="$(CURDIR)/rust/.cargo" cargo clean

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the `transaction_version` field of `Runtime`
-APPVERSION_M=4
+APPVERSION_M=5
 # This is the `spec_version` field of `Runtime`
-APPVERSION_N=28
-# This is the `impl_version` field of `Runtime`
-APPVERSION_P=3
+APPVERSION_N=30
+# This is the patch version of this release
+APPVERSION_P=0