Merge pull request #140 from Zondax/dev

New Release

Author: emmanuelm41

.github/workflows/main.yml

@@ -123,7 +123,7 @@ jobs:
           make test_all
       - name: Upload Snapshots (only failure)
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: snapshots-tmp
           path: tests_zemu/snapshots-tmp/

app/Makefile.version

@@ -1,6 +1,6 @@
 # This is the major version
 APPVERSION_M=4
 # This is the minor version
-APPVERSION_N=2
+APPVERSION_N=3
 # This is the patch version
-APPVERSION_P=5
+APPVERSION_P=1

app/rust/src/sapling.rs

@@ -1,5 +1,6 @@
 use crate::bolos::blake2b::blake2b32_with_personalization;
 use crate::bolos::jubjub::scalarmult_spending_base;
+use crate::bolos::c_zemu_log_stack;
 use crate::constants::PROVING_KEY_BASE;
 use crate::cryptoops::niels_multbits;
 use crate::cryptoops::{bytes_to_extended, extended_to_bytes, mul_by_cofactor};
@@ -23,9 +24,11 @@ pub fn sapling_nsk_to_nk(nsk: &NskBytes) -> NkBytes {
 
 #[inline(never)]
 pub fn sapling_asknsk_to_ivk(ask: &AskBytes, nsk: &NskBytes) -> IvkBytes {
+    crate::bolos::heartbeat();
     let ak = sapling_ask_to_ak(ask);
+    crate::bolos::heartbeat();
     let nk = sapling_nsk_to_nk(nsk);
-
+    crate::bolos::heartbeat();
     let h = Blake2sParams::new()
         .hash_length(32)
         .personal(CRH_IVK_PERSONALIZATION)

app/rust/src/zip32.rs

@@ -5,6 +5,7 @@ use byteorder::{ByteOrder, LittleEndian};
 use jubjub::{AffinePoint, ExtendedPoint, Fr};
 use log::debug;
 
+use crate::bolos::c_zemu_log_stack;
 use crate::bolos::aes::AesBOLOS;
 use crate::bolos::blake2b;
 use crate::bolos::blake2b::{
@@ -313,14 +314,18 @@ fn zip32_sapling_derive_child(
 
     // https://zips.z.cash/zip-0032#deriving-a-child-extended-spending-key
     zip32_sapling_ask_i_update(&ik.spending_key(), key_bundle_i.ask_mut());
+    crate::bolos::heartbeat();
     zip32_sapling_nsk_i_update(&ik.spending_key(), key_bundle_i.nsk_mut());
+    crate::bolos::heartbeat();
     zip32_sapling_ovk_i_update(&ik.spending_key(), key_bundle_i.ovk_mut());
+    crate::bolos::heartbeat();
     zip32_sapling_dk_i_update(&ik.spending_key(), key_bundle_i.dk_mut());
 }
 
 #[inline(never)]
 pub fn zip32_sapling_derive(path: &Zip32Path) -> SaplingKeyBundle {
     // ik as in capital I (https://zips.z.cash/zip-0032#sapling-child-key-derivation)
+    crate::bolos::heartbeat();
     let mut ik = zip32_master_key_i();
     crate::bolos::heartbeat();
 
@@ -335,6 +340,7 @@ pub fn zip32_sapling_derive(path: &Zip32Path) -> SaplingKeyBundle {
         zip32_sapling_derive_child(&mut ik, path_i, &mut key_bundle_i);
         c_check_app_canary();
     }
+    crate::bolos::heartbeat();
 
     key_bundle_i
 }

deps/ledger-zxlib

@@ -27,7 +27,7 @@
     "@zondax/ledger-js": "^0.10.0",
     "@zondax/ledger-zcash": "link:../js",
     "@zondax/zcashtools": "link:../zcashtools/neon",
-    "@zondax/zemu": "^0.50.2"
+    "@zondax/zemu": "^0.54.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.29.1",