Fixes (#13)

* fix overwrite issue * update tests and snapshots * add extra condition for signing * reset indice context offset * allow output dummy notes * remove this check as it can happens in different sessions * return payment address * update rs lib * update tests * update deps * update snapshots * print self for change address * update js * update rs lib * update snapshots * size fixes * improve cargo * improve cargo for cpp_test feature * small fixes
Zondax · Dec 23, 2024 · c02740d · c02740d
1 parent 99bfb87
commit c02740d
Show file tree

Hide file tree

Showing 65 changed files with 214 additions and 81 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,15 +196,15 @@ else()
 endif()
 
 # Use debug mode for debugging tests
-set(RUST_TARGET_DIR "${RUST_LIB_DIR}/target/${RUST_TARGET_TRIPLE}/debug")
+set(RUST_TARGET_DIR "${RUST_LIB_DIR}/target/${RUST_TARGET_TRIPLE}/release")
 
 # Custom target for the Rust library
 add_custom_target(RustLibClean
     COMMAND cargo clean
     WORKING_DIRECTORY ${RUST_LIB_DIR}
 )
 add_custom_target(RustLibBuild
-    COMMAND cargo build --target ${RUST_TARGET_TRIPLE} --features cpp_tests
+    COMMAND cargo build --release --target ${RUST_TARGET_TRIPLE} --features cpp_tests
     WORKING_DIRECTORY ${RUST_LIB_DIR}
     DEPENDS RustLibClean
 )

diff --git a/app/rust/.cargo/config b/app/rust/.cargo/config
@@ -6,7 +6,18 @@ rustflags = [
 	"-C", "relocation-model=ropi",
     "-C", "link-arg=-nostartfiles",
     "-C", "link-arg=-Tlink.ld",
+    "-C", "panic=abort",
 ]
 [unstable]
 build-std=["core"]
 build-std-features=["panic_immediate_abort"]
+
+[target.'cfg(target_os = "linux")']
+rustflags = [
+    "-C",
+    "link-arg=-Wl,--gc-sections",
+    "-C",
+    "link-arg=-Wl,--as-needed",
+    "-C",
+    "panic=abort",                # Add this line to disable unwinding
+]
diff --git a/app/rust/Cargo.toml b/app/rust/Cargo.toml
@@ -25,20 +25,28 @@ log = "0.4"
 panic-halt = "0.2.0"
 
 [profile.release]
-lto = false
 codegen-units = 1
 debug = false
 opt-level = "z"
+panic = "abort"
+# lto = false
+# Settings below aimed to reduce
+# binary size due to code
+lto = "fat"
+overflow-checks = false
+strip = "symbols"
 
 [profile.dev]
-lto = true
+lto = false
 codegen-units = 1
 debug=true
 opt-level = "z"
 panic = "abort"
-strip = true 
+strip = true
 
 [features]
 default = []
+clippy = []
+fuzzing = []
 # use when compiling this crate as a lib for the cpp_tests suite
 cpp_tests = []
diff --git a/app/rust/src/bolos/blake2b.rs b/app/rust/src/bolos/blake2b.rs
@@ -5,6 +5,12 @@ use crate::personalization::{
 use blake2b_simd::Params as Blake2bParams;
 use blake2s_simd::Params as Blake2sParams;
 
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 extern "C" {
     fn c_zcash_blake2b_expand_seed(
         input_a: *const u8,
@@ -45,7 +51,7 @@ extern "C" {
     fn c_zcash_blake2b_redjubjub(a: *const u8, a_len: u32, b: *const u8, b_len: u32, out: *mut u8);
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b32_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 32] {
     let h = Blake2bParams::new()
         .hash_length(32)
@@ -56,7 +62,12 @@ pub fn blake2b32_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 32
     hash
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b32_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 32] {
     let mut hash = [0; 32];
     unsafe {
@@ -70,7 +81,7 @@ pub fn blake2b32_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 32
     hash
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b64_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 64] {
     let h = Blake2bParams::new()
         .hash_length(64)
@@ -81,7 +92,12 @@ pub fn blake2b64_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 64
     hash
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b64_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 64] {
     let mut hash = [0; 64];
     unsafe {
@@ -95,7 +111,7 @@ pub fn blake2b64_with_personalization(person: &[u8; 16], data: &[u8]) -> [u8; 64
     hash
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b_redjubjub(a: &[u8], b: &[u8]) -> [u8; 64] {
     let h = Blake2bParams::new()
         .hash_length(64)
@@ -109,7 +125,12 @@ pub fn blake2b_redjubjub(a: &[u8], b: &[u8]) -> [u8; 64] {
     result
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b_redjubjub(a: &[u8], b: &[u8]) -> [u8; 64] {
     let mut hash = [0; 64];
     unsafe {
@@ -124,7 +145,12 @@ pub fn blake2b_redjubjub(a: &[u8], b: &[u8]) -> [u8; 64] {
     hash
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b_expand_seed(a: &[u8], b: &[u8]) -> [u8; 64] {
     let mut hash = [0; 64];
     unsafe {
@@ -139,7 +165,12 @@ pub fn blake2b_expand_seed(a: &[u8], b: &[u8]) -> [u8; 64] {
     hash
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b_expand_vec_two(in_a: &[u8], in_b: &[u8], in_c: &[u8]) -> [u8; 64] {
     let mut hash = [0; 64];
     unsafe {
@@ -156,7 +187,12 @@ pub fn blake2b_expand_vec_two(in_a: &[u8], in_b: &[u8], in_c: &[u8]) -> [u8; 64]
     hash
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn blake2b_expand_v4(
     in_a: &[u8],
     in_b: &[u8],
@@ -183,7 +219,7 @@ pub fn blake2b_expand_v4(
     hash
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b_expand_seed(a: &[u8], b: &[u8]) -> [u8; 64] {
     let h = Blake2bParams::new()
         .hash_length(64)
@@ -214,7 +250,7 @@ pub fn blake2s_diversification(tag: &[u8]) -> [u8; 32] {
     result
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b_expand_vec_two(sk: &[u8], a: &[u8], b: &[u8]) -> [u8; 64] {
     let mut h = Blake2bParams::new()
         .hash_length(64)
@@ -228,7 +264,7 @@ pub fn blake2b_expand_vec_two(sk: &[u8], a: &[u8], b: &[u8]) -> [u8; 64] {
     hash
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn blake2b_expand_v4(
     in_a: &[u8],
     in_b: &[u8],

diff --git a/app/rust/src/bolos/canary.rs b/app/rust/src/bolos/canary.rs
@@ -4,10 +4,15 @@ extern "C" {
     fn check_app_canary();
 }
 
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 pub fn c_check_app_canary() {
     unsafe { check_app_canary() }
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "clippy", feature = "fuzzing", feature = "cpp_tests"))]
 pub fn c_check_app_canary() {}
diff --git a/app/rust/src/bolos/heartbeat.rs b/app/rust/src/bolos/heartbeat.rs
@@ -1,11 +1,21 @@
-#[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
 extern "C" {
     fn io_heartbeat();
 }
 
 // Lets the device breath between computations
 pub(crate) fn heartbeat() {
-    #[cfg(not(test))]
+#[cfg(all(
+    not(test),
+    not(feature = "clippy"),
+    not(feature = "fuzzing"),
+    not(feature = "cpp_tests")
+))]
     unsafe {
         io_heartbeat()
     }

diff --git a/app/rust/src/lib.rs b/app/rust/src/lib.rs
@@ -18,6 +18,7 @@
 #![no_builtins]
 #![allow(dead_code, unused_imports)]
 
+#[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing"),))]
 use core::panic::PanicInfo;
 
 use constants::{DIV_DEFAULT_LIST_LEN, DIV_SIZE, GH_FIRST_BLOCK, SPENDING_KEY_GENERATOR};
@@ -187,7 +188,7 @@ pub extern "C" fn add_points(
     ParserError::ParserOk
 }
 
-#[cfg(not(test))]
+#[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing"),))]
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
     loop {}