Fix/bls (#257)

* Fix PIC issue on flex/stax

* Add new line at the end of each page

* Remove any inner ascii-control character or new line

* Testing commit that later must be undonegit add app/rust/src/parser/consent_message/msg.rs tests_zemu/try.mjsgit add app/rust/src/parser/consent_message/msg.rs tests_zemu/try.mjsgst

* Add display impl for HashTree type

* Add pic function

* Add Display impl for HashTree and use pic to adjust Decoder::new function

* Fix clippy and add display impl for LineDisplayIterator

* Remove logging

* Update try script

* Enable Bls test and its snappshots

* Bump version and update snapshots

* Remove conversion recursion and enhance conditional compilation of pic pointers

* Add cfg-if dep and update insta snappshots

* Fix more clippy warnings

* Update zxlib

* Try with cargo test directly

* Fix clippy warnings

* Revert concurrent testing due to bottelneck and disable pb test for add/remove keys

* Remove duplicated line

* Remove thread builder in test and make rustflags simple to avoid weird issues when compiling the app that was causing pic

* Update snapshots

* Silence warnings for custom cfg comming from ledger-rust dependencies

* Optimize iterator

* Do not remove inner ascii control and null terminators

* Error if generic display message is received and ensure new line is added

* Uppdate rust test and snapshots insta

* Update zemu test and snapshots

Author: neithanmo

.github/workflows/main.yml

@@ -89,7 +89,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ github.sha }}
       - name: run rust tests
-        run: make rust_test
+        run: cd ./app/rust
+          cargo test
 
   size_nano_s:
     needs: build_ledger

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=3
 # This is the minor version of this release
 APPVERSION_N=2
 # This is the patch version of this release
-APPVERSION_P=2
+APPVERSION_P=3

app/rust/.cargo/config.toml

@@ -6,7 +6,7 @@ target-applies-to-host = true
 host-config = true
 
 [host]
-rustflags = ["-Ctarget-feature=-crt-static"]
+rustflags = ["-Ctarget-feature=-crt-static", "-Aunexpected_cfgs"]
 
 [target.'cfg(all(target_arch = "arm", target_os = "none"))']
 rustflags = [
@@ -18,6 +18,5 @@ rustflags = [
     "link-arg=-nostartfiles",
     "-C",
     "link-arg=-Tlink.ld",
-    "-C",
-    "inline-threshold=0",
+    "-Aunexpected_cfgs",
 ]

app/rust/Cargo.lock

@@ -19,6 +19,7 @@ arrayref = { version = "0.3.7", default-features = false }
 nom = { version = "7.1.3", default-features = false }
 bolos = { path = "../../deps/ledger-rust/bolos" }
 zemu-sys = { path = "../../deps/ledger-rust/zemu" }
+cfg-if = "1.0.0"
 
 [dev-dependencies]
 no-std-compat = { version = "0.4.1", features = ["std"] }
@@ -36,17 +37,15 @@ serde = { version = "1.0.215", features = ["derive"] }
 no-std-compat = { version = "0.4.1", features = ["std"] }
 
 [profile.release]
+lto = false
 codegen-units = 1
 debug = false
 opt-level = "z"
-lto = "thin"
-overflow-checks = false
-strip = "symbols"
-panic = "abort"
 
 [profile.dev]
 panic = "abort"
 
 [features]
 clippy = []
 derive-debug = []
+fuzzing = ["derive-debug"]

app/rust/Cargo.toml

@@ -20,7 +20,6 @@ use super::resources::UI;
 
 #[no_mangle]
 pub unsafe extern "C" fn rs_getNumItems(num_items: *mut u8) -> u32 {
-    crate::zlog("rs_getNumItems\x00");
     if num_items.is_null() || !UI.is_some() {
         return ParserError::ContextMismatch as u32;
     }
@@ -29,7 +28,6 @@ pub unsafe extern "C" fn rs_getNumItems(num_items: *mut u8) -> u32 {
     let ui = UI.as_ref().unwrap();
 
     let Ok(num) = ui.num_items() else {
-        crate::zlog("no_DATA\x00");
         return ParserError::NoData as _;
     };
 
@@ -48,11 +46,8 @@ pub unsafe extern "C" fn rs_getItem(
     page_idx: u8,
     page_count: *mut u8,
 ) -> u32 {
-    crate::zlog("rs_getItem\x00");
     *page_count = 0u8;
 
-    let page_count = &mut *page_count;
-
     let key = core::slice::from_raw_parts_mut(out_key as *mut u8, key_len as usize);
     let value = core::slice::from_raw_parts_mut(out_value as *mut u8, out_len as usize);
 

app/rust/src/ffi/ui.rs

@@ -111,7 +111,7 @@ pub unsafe extern "C" fn rs_verify_certificate(
     else {
         return ParserError::InvalidCertificate as u32;
     };
-    //
+
     // Verify ingress_expiry aginst certificate timestamp
     if !cert.verify_time(call_request.ingress_expiry) {
         return ParserError::InvalidCertificate as u32;

app/rust/src/ffi/verify_certificate.rs

@@ -3,6 +3,11 @@
 #![macro_use]
 #![allow(dead_code)]
 #![deny(unused_crate_dependencies)]
+// We used different config flags names
+// in order to not possibly colide with other
+// defined in dependencies
+#![allow(unexpected_cfgs)]
+#![allow(static_mut_refs)]
 
 extern crate no_std_compat as std;
 
@@ -35,12 +40,15 @@ fn panic(_info: &PanicInfo) -> ! {
 }
 
 pub fn zlog(_msg: &str) {
-    #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))]
-    unsafe {
-        zemu_log_stack(_msg.as_bytes().as_ptr());
+    cfg_if::cfg_if! {
+        if #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))] {
+            unsafe {
+                zemu_log_stack(_msg.as_bytes().as_ptr());
+            }
+        } else {
+            std::println!("{}", _msg);
+        }
     }
-    #[cfg(test)]
-    std::println!("{}", _msg);
 }
 
 pub fn check_canary() {
@@ -59,6 +67,7 @@ extern "C" {
 #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))]
 extern "C" {
     fn io_heartbeat();
+    fn pic(link_address: u32) -> u32;
 }
 
 // Lets the device breath between computations
@@ -71,10 +80,25 @@ pub(crate) fn heartbeat() {
 
 // Lets the device breath between computations
 pub(crate) fn log_num(s: &str, number: u32) {
-    #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))]
-    unsafe {
-        log_number(s.as_bytes().as_ptr(), number);
+    cfg_if::cfg_if! {
+        if #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))] {
+            unsafe {
+                log_number(s.as_bytes().as_ptr(), number);
+            }
+        } else {
+            std::println!("{s}: {number}");
+        }
+    }
+}
+
+pub fn pic_addr(addr: u32) -> u32 {
+    cfg_if::cfg_if! {
+        if #[cfg(all(not(test), not(feature = "clippy"), not(feature = "fuzzing")))] {
+        unsafe {
+            pic(addr)
+        }
+        } else {
+            addr
+        }
     }
-    #[cfg(test)]
-    std::println!("{s}: {number}");
 }

app/rust/src/lib.rs

@@ -27,7 +27,7 @@ impl<'a> FromBytes<'a> for RawArg<'a> {
     }
 }
 
-impl<'a> RawArg<'a> {
+impl RawArg<'_> {
     pub fn raw_data(&self) -> &[u8] {
         self.0
     }

app/rust/src/parser/call_request/arg.rs

@@ -24,7 +24,7 @@ pub struct CanisterCall<'a> {
     pub ingress_expiry: u64,
 }
 
-impl<'a> CanisterCall<'a> {
+impl CanisterCall<'_> {
     // this sums up the nonce although
     // it could be missing
     //