Zip32 hd (#118)

* change zip32 seed derivation path * update snapshots
Zondax · Feb 5, 2025 · 35227d8 · 35227d8
1 parent 4a69cbe
commit 35227d8
Show file tree

Hide file tree

Showing 69 changed files with 8 additions and 7 deletions.
diff --git a/app/Makefile.version b/app/Makefile.version
@@ -1,6 +1,6 @@
 # This is the `transaction_version` field of `Runtime`
-APPVERSION_M=2
+APPVERSION_M=3
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=6
+APPVERSION_P=0
diff --git a/app/src/coin.h b/app/src/coin.h
@@ -34,6 +34,7 @@ extern "C" {
 #define HDPATH_4_DEFAULT     (0u)
 
 #define MASK_HARDENED 0x80000000
+#define MASK_HARDENED_ZIP32 (0x80000000u | 0x7FFFFFFF) // 2147483647
 
 #define SECP256K1_PK_LEN            65u
 #define COMPRESSED_SECP256K1_PK_LEN 33u

diff --git a/app/src/crypto.c b/app/src/crypto.c
@@ -566,7 +566,7 @@ zxerr_t crypto_fillDeviceSeed(uint8_t *device_seed) {
 
     // Generate randomness using a fixed path related to the device mnemonic
     const uint32_t path[HDPATH_LEN_DEFAULT] = {
-        HDPATH_0_DEFAULT, HDPATH_1_DEFAULT, MASK_HARDENED, MASK_HARDENED, MASK_HARDENED,
+        HDPATH_0_DEFAULT, HDPATH_1_DEFAULT, MASK_HARDENED, MASK_HARDENED, MASK_HARDENED_ZIP32,
     };
 
     MEMZERO(device_seed, KEY_LENGTH);

diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
diff --git a/tests_zemu/snapshots/fl-show_address_shielded/00001.png b/tests_zemu/snapshots/fl-show_address_shielded/00001.png
diff --git a/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00001.png b/tests_zemu/snapshots/fl-show_viewkey/00001.png
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00002.png b/tests_zemu/snapshots/fl-show_viewkey/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00000.png b/tests_zemu/snapshots/fl-sign_masp_spends/00000.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00001.png b/tests_zemu/snapshots/fl-sign_masp_spends/00001.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00002.png b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00003.png b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00004.png b/tests_zemu/snapshots/fl-sign_masp_spends/00004.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00005.png b/tests_zemu/snapshots/fl-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00006.png b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00007.png b/tests_zemu/snapshots/fl-sign_masp_spends/00007.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00008.png b/tests_zemu/snapshots/fl-sign_masp_spends/00008.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00009.png b/tests_zemu/snapshots/fl-sign_masp_spends/00009.png
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00010.png b/tests_zemu/snapshots/fl-sign_masp_spends/00010.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/sp-show_address_shielded/00001.png b/tests_zemu/snapshots/sp-show_address_shielded/00001.png
diff --git a/tests_zemu/snapshots/sp-show_address_shielded/00002.png b/tests_zemu/snapshots/sp-show_address_shielded/00002.png
diff --git a/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png
diff --git a/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png b/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00001.png b/tests_zemu/snapshots/sp-show_viewkey/00001.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00002.png b/tests_zemu/snapshots/sp-show_viewkey/00002.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00003.png b/tests_zemu/snapshots/sp-show_viewkey/00003.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00004.png b/tests_zemu/snapshots/sp-show_viewkey/00004.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00005.png b/tests_zemu/snapshots/sp-show_viewkey/00005.png
diff --git a/tests_zemu/snapshots/sp-show_viewkey/00006.png b/tests_zemu/snapshots/sp-show_viewkey/00006.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00014.png b/tests_zemu/snapshots/sp-sign_masp_spends/00014.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00015.png b/tests_zemu/snapshots/sp-sign_masp_spends/00015.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00016.png b/tests_zemu/snapshots/sp-sign_masp_spends/00016.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00017.png b/tests_zemu/snapshots/sp-sign_masp_spends/00017.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00018.png b/tests_zemu/snapshots/sp-sign_masp_spends/00018.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00019.png b/tests_zemu/snapshots/sp-sign_masp_spends/00019.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00020.png b/tests_zemu/snapshots/sp-sign_masp_spends/00020.png
diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00021.png b/tests_zemu/snapshots/sp-sign_masp_spends/00021.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/st-show_address_shielded/00001.png b/tests_zemu/snapshots/st-show_address_shielded/00001.png
diff --git a/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png
diff --git a/tests_zemu/snapshots/st-show_viewkey/00001.png b/tests_zemu/snapshots/st-show_viewkey/00001.png
diff --git a/tests_zemu/snapshots/st-show_viewkey/00002.png b/tests_zemu/snapshots/st-show_viewkey/00002.png
diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00005.png b/tests_zemu/snapshots/st-sign_masp_spends/00005.png
diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00006.png b/tests_zemu/snapshots/st-sign_masp_spends/00006.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/snapshots/x-show_address_shielded/00001.png b/tests_zemu/snapshots/x-show_address_shielded/00001.png
diff --git a/tests_zemu/snapshots/x-show_address_shielded/00002.png b/tests_zemu/snapshots/x-show_address_shielded/00002.png
diff --git a/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png
diff --git a/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png b/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00001.png b/tests_zemu/snapshots/x-show_viewkey/00001.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00002.png b/tests_zemu/snapshots/x-show_viewkey/00002.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00003.png b/tests_zemu/snapshots/x-show_viewkey/00003.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00004.png b/tests_zemu/snapshots/x-show_viewkey/00004.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00005.png b/tests_zemu/snapshots/x-show_viewkey/00005.png
diff --git a/tests_zemu/snapshots/x-show_viewkey/00006.png b/tests_zemu/snapshots/x-show_viewkey/00006.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00014.png b/tests_zemu/snapshots/x-sign_masp_spends/00014.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00015.png b/tests_zemu/snapshots/x-sign_masp_spends/00015.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00016.png b/tests_zemu/snapshots/x-sign_masp_spends/00016.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00017.png b/tests_zemu/snapshots/x-sign_masp_spends/00017.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00018.png b/tests_zemu/snapshots/x-sign_masp_spends/00018.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00019.png b/tests_zemu/snapshots/x-sign_masp_spends/00019.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00020.png b/tests_zemu/snapshots/x-sign_masp_spends/00020.png
diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00021.png b/tests_zemu/snapshots/x-sign_masp_spends/00021.png
diff --git a/tests_zemu/tests/common.ts b/tests_zemu/tests/common.ts
@@ -26,10 +26,10 @@ type ExpectedValues = {
 }
 
 export const expectedKeys: ExpectedValues = {
-  publicAddress: '6a7f03e2c2987f9478d2c9b7609e27fa70a6a0f3575d451054df6d58dc1e3552df5992af900897263937f2',
-  ak: '031b9d3d838fb0343ac264aeb78ba909e5a731cd7a3b4d601af55bfde40e2b6d',
-  nsk: 'a1a8f2975e2d21edeac47b57f70ade8fff6ede55049d5be4a1c95dcbec47ed0c',
-  xfvk: '03bc4834ed00000080fe5f31e2d3bd521177e96903bafaeea1ff38afbfc87bc92ffd8bafa9f8f939c7031b9d3d838fb0343ac264aeb78ba909e5a731cd7a3b4d601af55bfde40e2b6df0c1485f8201ab1675c00d1201cb18f0eea8c9e92d26189fc9738544c2e4143d90790db1d8232c742fa3c4437e958276951958bb2392c9debd325f306582daa6ad0a2591b6c6ad459fa2d181005eeef982e378b807eb109275ae89f288f86697',
+  publicAddress: '86eb4cf34d9241ca9a759ceea71d31e1c3f987c5570f2399174ff6f0581d892d0e85638ed447c0f0b679b0',
+  ak: 'd160d4576492622852e5b44f4a8ead12add8b5c4db5b02136c961d67d9132851',
+  nsk: '65d93039d48b100fd0d8f9b47097da903b4f766ac5868372a0ea235123534d09',
+  xfvk: '03cefb5c8a000000803106c9b1d5aa3d91b711e9185872e2080b5fd173375373ce6965f604b239178ed160d4576492622852e5b44f4a8ead12add8b5c4db5b02136c961d67d9132851ecf8175837482e7b40bdec1af8d3360e54f02012299f1b3c8b6dd115963a1081fef61a5e0988f209cf844b5717883630a4db00ab8b7c512b0e378852b56d58c753cca0f3837bb806417e69f610ace52d31e5954fd5b6a5b265439732a0ecf406',
 }
 
 export const MASP_TRANSFER_TX =