Merge pull request #19 from Zondax/main

New Release
LedgerHQ · Aug 21, 2024 · 25faa56 · 25faa56
2 parents 7d36a10 + 0030210
commit 25faa56
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
diff --git 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()
     }