diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1516c58..ef49535 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,6 +118,12 @@ jobs: - name: Build and run zemu tests run: | make test_all + - name: Upload Snapshots (only failure) + if: ${{ failure() }} + uses: actions/upload-artifact@v3 + with: + name: snapshots-tmp + path: tests_zemu/snapshots-tmp/ build_package_nanos: needs: [configure, build, build_ledger, test_zemu] diff --git a/app/Makefile.version b/app/Makefile.version index 0d048e4..415703d 100644 --- a/app/Makefile.version +++ b/app/Makefile.version @@ -1,6 +1,6 @@ # This is the `transaction_version` field of `Runtime` -APPVERSION_M=4 +APPVERSION_M=104 # This is the `spec_version` field of `Runtime` APPVERSION_N=63001 # This is the patch version of this release -APPVERSION_P=3 +APPVERSION_P=0 diff --git a/app/src/substrate/substrate_coin.h b/app/src/substrate/substrate_coin.h index e2748bd..20a7b03 100644 --- a/app/src/substrate/substrate_coin.h +++ b/app/src/substrate/substrate_coin.h @@ -50,9 +50,13 @@ typedef enum { } key_kind_e; +// Zondax major delta to fit chain tx version into the major value. +// Major - this delta -> results on the chain tx version +#define ZX_MAJOR_VERSION_DELTA 100 + // Coin Specific #define PK_ADDRESS_TYPE COIN_ADDR_TYPE -#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION +#define SUPPORTED_TX_VERSION_CURRENT LEDGER_MAJOR_VERSION - ZX_MAJOR_VERSION_DELTA #define SUPPORTED_TX_VERSION_PREVIOUS (LEDGER_MAJOR_VERSION - 1) #define SUPPORTED_SPEC_VERSION (LEDGER_MINOR_VERSION + 0) #define SUPPORTED_MINIMUM_SPEC_VERSION 6003001 diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png index b968f20..13c23e0 100644 Binary files a/tests_zemu/snapshots/fl-mainmenu/00004.png and b/tests_zemu/snapshots/fl-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index f01a0f5..a59ecc0 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png index f01a0f5..a59ecc0 100644 Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png index ef9b955..9a2e324 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png index ef9b955..9a2e324 100644 Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png index b0ece64..c608b6d 100644 Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and b/tests_zemu/snapshots/st-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index ef9b955..9a2e324 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png index ef9b955..9a2e324 100644 Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ diff --git a/tests_zemu/tests/standard.test.ts b/tests_zemu/tests/standard.test.ts index 7bc81c7..ecb74fc 100644 --- a/tests_zemu/tests/standard.test.ts +++ b/tests_zemu/tests/standard.test.ts @@ -62,10 +62,16 @@ describe('Standard', function () { expect(resp.return_code).toEqual(0x9000) expect(resp.error_message).toEqual('No errors') + expect(resp).toHaveProperty('test_mode') + expect(resp).toHaveProperty('major') expect(resp).toHaveProperty('minor') expect(resp).toHaveProperty('patch') + + expect(resp.major).toEqual(104) + expect(resp.minor).toEqual(63001) + expect(resp.patch).toEqual(0) } finally { await sim.close() }