diff --git a/app/Makefile.version b/app/Makefile.version index 0264b20f..aef1a2c8 100644 --- 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 index 484da16d..ec510be4 100644 --- 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 index cdd5f8e3..644f72e9 100644 --- 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 index f7f0a8bc..8d609375 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/fl-show_address_shielded/00001.png b/tests_zemu/snapshots/fl-show_address_shielded/00001.png index 933d176f..ac2dcd72 100644 Binary files a/tests_zemu/snapshots/fl-show_address_shielded/00001.png and b/tests_zemu/snapshots/fl-show_address_shielded/00001.png differ diff --git a/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png index 933d176f..ac2dcd72 100644 Binary files a/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png and b/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png differ diff --git a/tests_zemu/snapshots/fl-show_viewkey/00001.png b/tests_zemu/snapshots/fl-show_viewkey/00001.png index 315e21bd..1e64c1a1 100644 Binary files a/tests_zemu/snapshots/fl-show_viewkey/00001.png and b/tests_zemu/snapshots/fl-show_viewkey/00001.png differ diff --git a/tests_zemu/snapshots/fl-show_viewkey/00002.png b/tests_zemu/snapshots/fl-show_viewkey/00002.png index 053afac6..94031658 100644 Binary files a/tests_zemu/snapshots/fl-show_viewkey/00002.png and b/tests_zemu/snapshots/fl-show_viewkey/00002.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00000.png b/tests_zemu/snapshots/fl-sign_masp_spends/00000.png index ce222be2..d7fc6a84 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00000.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00000.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00001.png b/tests_zemu/snapshots/fl-sign_masp_spends/00001.png index bdf9cf74..4987448c 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00001.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00001.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00002.png b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png index 9db45ffc..ea7e77f4 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00002.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00003.png b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png index 7f632e61..443e6aed 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00003.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00004.png b/tests_zemu/snapshots/fl-sign_masp_spends/00004.png index ccaac837..3d384a4e 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00004.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00004.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00005.png b/tests_zemu/snapshots/fl-sign_masp_spends/00005.png index eeeb9ce3..3ff16cee 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00005.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00005.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00006.png b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png index ac17a9a6..219be6a2 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00006.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00007.png b/tests_zemu/snapshots/fl-sign_masp_spends/00007.png index 54690788..1eea8b83 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00007.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00007.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00008.png b/tests_zemu/snapshots/fl-sign_masp_spends/00008.png index 6afdc1eb..85a93ba3 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00008.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00008.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00009.png b/tests_zemu/snapshots/fl-sign_masp_spends/00009.png index 583b94c3..dc74e2ef 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00009.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00009.png differ diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00010.png b/tests_zemu/snapshots/fl-sign_masp_spends/00010.png index 43d7e415..583b94c3 100644 Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00010.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00010.png differ diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png index 9a311b8f..73cae8f4 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 9a311b8f..73cae8f4 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 92778dc3..5c0957a2 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 92778dc3..5c0957a2 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/sp-show_address_shielded/00001.png b/tests_zemu/snapshots/sp-show_address_shielded/00001.png index 659827da..c1a70de6 100644 Binary files a/tests_zemu/snapshots/sp-show_address_shielded/00001.png and b/tests_zemu/snapshots/sp-show_address_shielded/00001.png differ diff --git a/tests_zemu/snapshots/sp-show_address_shielded/00002.png b/tests_zemu/snapshots/sp-show_address_shielded/00002.png index 44281b2e..b49d4110 100644 Binary files a/tests_zemu/snapshots/sp-show_address_shielded/00002.png and b/tests_zemu/snapshots/sp-show_address_shielded/00002.png differ diff --git a/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png index 659827da..c1a70de6 100644 Binary files a/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png and b/tests_zemu/snapshots/sp-show_address_shielded_reject/00001.png differ diff --git a/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png b/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png index 44281b2e..b49d4110 100644 Binary files a/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png and b/tests_zemu/snapshots/sp-show_address_shielded_reject/00002.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00001.png b/tests_zemu/snapshots/sp-show_viewkey/00001.png index 6bb31687..7e4051d5 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00001.png and b/tests_zemu/snapshots/sp-show_viewkey/00001.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00002.png b/tests_zemu/snapshots/sp-show_viewkey/00002.png index f40c4ce4..d9b0987b 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00002.png and b/tests_zemu/snapshots/sp-show_viewkey/00002.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00003.png b/tests_zemu/snapshots/sp-show_viewkey/00003.png index 09d4ebba..7bd543e7 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00003.png and b/tests_zemu/snapshots/sp-show_viewkey/00003.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00004.png b/tests_zemu/snapshots/sp-show_viewkey/00004.png index 068d05ab..1b917cf3 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00004.png and b/tests_zemu/snapshots/sp-show_viewkey/00004.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00005.png b/tests_zemu/snapshots/sp-show_viewkey/00005.png index ef86cf2f..3d0ddcd5 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00005.png and b/tests_zemu/snapshots/sp-show_viewkey/00005.png differ diff --git a/tests_zemu/snapshots/sp-show_viewkey/00006.png b/tests_zemu/snapshots/sp-show_viewkey/00006.png index 1f15f3db..0ec46c09 100644 Binary files a/tests_zemu/snapshots/sp-show_viewkey/00006.png and b/tests_zemu/snapshots/sp-show_viewkey/00006.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00014.png b/tests_zemu/snapshots/sp-sign_masp_spends/00014.png index 57008930..60b74b87 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00014.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00014.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00015.png b/tests_zemu/snapshots/sp-sign_masp_spends/00015.png index 4a5554ea..c4578010 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00015.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00015.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00016.png b/tests_zemu/snapshots/sp-sign_masp_spends/00016.png index 853fb92f..4a5554ea 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00016.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00016.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00017.png b/tests_zemu/snapshots/sp-sign_masp_spends/00017.png index b5253c30..853fb92f 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00017.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00017.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00018.png b/tests_zemu/snapshots/sp-sign_masp_spends/00018.png index 2d424b51..b5253c30 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00018.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00018.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00019.png b/tests_zemu/snapshots/sp-sign_masp_spends/00019.png index 1e4be699..2d424b51 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00019.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00019.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00020.png b/tests_zemu/snapshots/sp-sign_masp_spends/00020.png index af4b8664..1e4be699 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00020.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00020.png differ diff --git a/tests_zemu/snapshots/sp-sign_masp_spends/00021.png b/tests_zemu/snapshots/sp-sign_masp_spends/00021.png index 0488d593..af4b8664 100644 Binary files a/tests_zemu/snapshots/sp-sign_masp_spends/00021.png and b/tests_zemu/snapshots/sp-sign_masp_spends/00021.png differ diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png index 04ffc94f..34926379 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/st-show_address_shielded/00001.png b/tests_zemu/snapshots/st-show_address_shielded/00001.png index df66a218..5d606053 100644 Binary files a/tests_zemu/snapshots/st-show_address_shielded/00001.png and b/tests_zemu/snapshots/st-show_address_shielded/00001.png differ diff --git a/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png index df66a218..5d606053 100644 Binary files a/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png and b/tests_zemu/snapshots/st-show_address_shielded_reject/00001.png differ diff --git a/tests_zemu/snapshots/st-show_viewkey/00001.png b/tests_zemu/snapshots/st-show_viewkey/00001.png index 42305643..83b2243d 100644 Binary files a/tests_zemu/snapshots/st-show_viewkey/00001.png and b/tests_zemu/snapshots/st-show_viewkey/00001.png differ diff --git a/tests_zemu/snapshots/st-show_viewkey/00002.png b/tests_zemu/snapshots/st-show_viewkey/00002.png index 105b7827..51156a26 100644 Binary files a/tests_zemu/snapshots/st-show_viewkey/00002.png and b/tests_zemu/snapshots/st-show_viewkey/00002.png differ diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00005.png b/tests_zemu/snapshots/st-sign_masp_spends/00005.png index 8d8ff6fa..1b26c92c 100644 Binary files a/tests_zemu/snapshots/st-sign_masp_spends/00005.png and b/tests_zemu/snapshots/st-sign_masp_spends/00005.png differ diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00006.png b/tests_zemu/snapshots/st-sign_masp_spends/00006.png index dc0b0d19..0ae1c033 100644 Binary files a/tests_zemu/snapshots/st-sign_masp_spends/00006.png and b/tests_zemu/snapshots/st-sign_masp_spends/00006.png differ diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png index 92778dc3..5c0957a2 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 92778dc3..5c0957a2 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/snapshots/x-show_address_shielded/00001.png b/tests_zemu/snapshots/x-show_address_shielded/00001.png index 659827da..c1a70de6 100644 Binary files a/tests_zemu/snapshots/x-show_address_shielded/00001.png and b/tests_zemu/snapshots/x-show_address_shielded/00001.png differ diff --git a/tests_zemu/snapshots/x-show_address_shielded/00002.png b/tests_zemu/snapshots/x-show_address_shielded/00002.png index 44281b2e..b49d4110 100644 Binary files a/tests_zemu/snapshots/x-show_address_shielded/00002.png and b/tests_zemu/snapshots/x-show_address_shielded/00002.png differ diff --git a/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png index 659827da..c1a70de6 100644 Binary files a/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png and b/tests_zemu/snapshots/x-show_address_shielded_reject/00001.png differ diff --git a/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png b/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png index 44281b2e..b49d4110 100644 Binary files a/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png and b/tests_zemu/snapshots/x-show_address_shielded_reject/00002.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00001.png b/tests_zemu/snapshots/x-show_viewkey/00001.png index 6bb31687..7e4051d5 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00001.png and b/tests_zemu/snapshots/x-show_viewkey/00001.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00002.png b/tests_zemu/snapshots/x-show_viewkey/00002.png index f40c4ce4..d9b0987b 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00002.png and b/tests_zemu/snapshots/x-show_viewkey/00002.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00003.png b/tests_zemu/snapshots/x-show_viewkey/00003.png index 09d4ebba..7bd543e7 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00003.png and b/tests_zemu/snapshots/x-show_viewkey/00003.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00004.png b/tests_zemu/snapshots/x-show_viewkey/00004.png index 068d05ab..1b917cf3 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00004.png and b/tests_zemu/snapshots/x-show_viewkey/00004.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00005.png b/tests_zemu/snapshots/x-show_viewkey/00005.png index ef86cf2f..3d0ddcd5 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00005.png and b/tests_zemu/snapshots/x-show_viewkey/00005.png differ diff --git a/tests_zemu/snapshots/x-show_viewkey/00006.png b/tests_zemu/snapshots/x-show_viewkey/00006.png index 1f15f3db..0ec46c09 100644 Binary files a/tests_zemu/snapshots/x-show_viewkey/00006.png and b/tests_zemu/snapshots/x-show_viewkey/00006.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00014.png b/tests_zemu/snapshots/x-sign_masp_spends/00014.png index 57008930..60b74b87 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00014.png and b/tests_zemu/snapshots/x-sign_masp_spends/00014.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00015.png b/tests_zemu/snapshots/x-sign_masp_spends/00015.png index 4a5554ea..c4578010 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00015.png and b/tests_zemu/snapshots/x-sign_masp_spends/00015.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00016.png b/tests_zemu/snapshots/x-sign_masp_spends/00016.png index 853fb92f..4a5554ea 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00016.png and b/tests_zemu/snapshots/x-sign_masp_spends/00016.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00017.png b/tests_zemu/snapshots/x-sign_masp_spends/00017.png index b5253c30..853fb92f 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00017.png and b/tests_zemu/snapshots/x-sign_masp_spends/00017.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00018.png b/tests_zemu/snapshots/x-sign_masp_spends/00018.png index 2d424b51..b5253c30 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00018.png and b/tests_zemu/snapshots/x-sign_masp_spends/00018.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00019.png b/tests_zemu/snapshots/x-sign_masp_spends/00019.png index 1e4be699..2d424b51 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00019.png and b/tests_zemu/snapshots/x-sign_masp_spends/00019.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00020.png b/tests_zemu/snapshots/x-sign_masp_spends/00020.png index af4b8664..1e4be699 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00020.png and b/tests_zemu/snapshots/x-sign_masp_spends/00020.png differ diff --git a/tests_zemu/snapshots/x-sign_masp_spends/00021.png b/tests_zemu/snapshots/x-sign_masp_spends/00021.png index 0488d593..af4b8664 100644 Binary files a/tests_zemu/snapshots/x-sign_masp_spends/00021.png and b/tests_zemu/snapshots/x-sign_masp_spends/00021.png differ diff --git a/tests_zemu/tests/common.ts b/tests_zemu/tests/common.ts index 2bd7854a..52249cce 100644 --- 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 =