Use sync NbglHomeAndSettings and stop redraw screen for each received APDU

Author: yogh333

Cargo.lock

@@ -5,7 +5,7 @@ authors = ["yhql", "agrojean-ledger"]
 edition = "2021"
 
 [dependencies]
-ledger_device_sdk = { version="1.15.2" }
+ledger_device_sdk = { version="1.15.6" }
 include_gif = "1.2.0"
 serde = {version="1.0.192", default_features = false, features = ["derive"]}
 serde-json-core = { git = "https://github.com/rust-embedded-community/serde-json-core"}
@@ -36,4 +36,8 @@ icon = "crab_14x14.gif"
 icon = "crab_32x32.gif"
 
 [package.metadata.ledger.flex]
-icon = "crab_40x40.gif"
+icon = "crab_40x40.gif"
+
+[patch.crates-io]
+ledger_device_sdk = { git = "https://github.com/LedgerHQ/ledger-device-rust-sdk.git", branch = "y333/new_nbgl" }
+include_gif = { git = "https://github.com/LedgerHQ/ledger-device-rust-sdk.git", branch = "y333/new_nbgl" }

Cargo.toml

@@ -29,6 +29,7 @@ use crate::settings::Settings;
 #[cfg(any(target_os = "stax", target_os = "flex"))]
 use ledger_device_sdk::nbgl::{NbglGlyph, NbglHomeAndSettings};
 
+#[cfg(not(any(target_os = "stax", target_os = "flex")))]
 use crate::Instruction;
 
 // use ledger_device_sdk::nvm::*;
@@ -70,20 +71,20 @@ pub fn ui_menu_main(comm: &mut Comm) -> Event<Instruction> {
 }
 
 #[cfg(any(target_os = "stax", target_os = "flex"))]
-pub fn ui_menu_main(_: &mut Comm) -> Event<Instruction> {
+pub fn ui_menu_main(_: &mut Comm) -> NbglHomeAndSettings {
     // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
     const FERRIS: NbglGlyph = NbglGlyph::from_include(include_gif!("crab_64x64.gif", NBGL));
 
     let settings_strings = [["Display Memo", "Allow display of transaction memo."]];
     let mut settings: Settings = Default::default();
     // Display the home screen.
-    NbglHomeAndSettings::new()
+    let home = NbglHomeAndSettings::new()
         .glyph(&FERRIS)
         .settings(settings.get_mut_ref(), &settings_strings)
         .infos(
             "Boilerplate",
             env!("CARGO_PKG_VERSION"),
             env!("CARGO_PKG_AUTHORS"),
-        )
-        .show()
+        );
+    home
 }

src/app_ui/menu.rs

@@ -22,6 +22,9 @@ use ledger_device_sdk::ecc::{Secp256k1, SeedDerive};
 use ledger_device_sdk::hash::{sha3::Keccak256, HashInit};
 use ledger_device_sdk::io::Comm;
 
+#[cfg(any(target_os = "stax", target_os = "flex"))]
+use ledger_device_sdk::nbgl::NbglHomeAndSettings;
+
 use serde::Deserialize;
 use serde_json_core::from_slice;
 
@@ -42,6 +45,8 @@ pub struct TxContext {
     raw_tx: Vec<u8>,
     path: Bip32Path,
     review_finished: bool,
+    #[cfg(any(target_os = "stax", target_os = "flex"))]
+    pub home: NbglHomeAndSettings,
 }
 
 // Implement constructor for TxInfo with default values
@@ -52,6 +57,8 @@ impl TxContext {
             raw_tx: Vec::new(),
             path: Default::default(),
             review_finished: false,
+            #[cfg(any(target_os = "stax", target_os = "flex"))]
+            home: NbglHomeAndSettings::new(),
         }
     }
     // Get review status

src/handlers/sign_tx.rs

@@ -129,7 +129,7 @@ impl TryFrom<ApduHeader> for Instruction {
 }
 
 #[cfg(any(target_os = "stax", target_os = "flex"))]
-fn show_status_if_needed(ins: &Instruction, tx_ctx: &TxContext, status: &AppSW) {
+fn show_status_if_needed(ins: &Instruction, tx_ctx: &mut TxContext, status: &AppSW) {
     let (show_status, status_type) = match (ins, status) {
         (Instruction::GetPubkey { display: true }, AppSW::Deny | AppSW::Ok) => {
             (true, StatusType::Address)
@@ -145,6 +145,9 @@ fn show_status_if_needed(ins: &Instruction, tx_ctx: &TxContext, status: &AppSW)
         NbglReviewStatus::new()
             .status_type(status_type)
             .show(success);
+
+        // call display() to show home and setting screen
+        tx_ctx.home.show_and_return();
     }
 }
 
@@ -155,25 +158,19 @@ extern "C" fn sample_main() {
     // BadCla status word.
     let mut comm = Comm::new().set_expected_cla(0xe0);
 
-    // Initialize reference to Comm instance for NBGL
-    // API calls.
-    #[cfg(any(target_os = "stax", target_os = "flex"))]
-    init_comm(&mut comm);
-
-    // Developer mode / pending review popup
-    // must be cleared with user interaction
-    #[cfg(feature = "pending_review_screen")]
-    #[cfg(not(any(target_os = "stax", target_os = "flex")))]
-    display_pending_review(&mut comm);
-
     let mut tx_ctx = TxContext::new();
 
-    loop {
-        // Wait for either a specific button push to exit the app
-        // or an APDU command
-        if let Event::Command(ins) = ui_menu_main(&mut comm) {
-            let result = handle_apdu(&mut comm, &ins, &mut tx_ctx);
-            let _status: AppSW = match result {
+    #[cfg(any(target_os = "stax", target_os = "flex"))]
+    {
+        // Initialize reference to Comm instance for NBGL
+        // API calls.
+        init_comm(&mut comm);
+        tx_ctx.home = ui_menu_main(&mut comm);
+        tx_ctx.home.show_and_return();
+
+        loop {
+            let ins: Instruction = comm.next_command();
+            let status = match handle_apdu(&mut comm, &ins, &mut tx_ctx) {
                 Ok(()) => {
                     comm.reply_ok();
                     AppSW::Ok
@@ -183,9 +180,33 @@ extern "C" fn sample_main() {
                     sw
                 }
             };
+            show_status_if_needed(&ins, &mut tx_ctx, &status);
+        }
+    }
 
-            #[cfg(any(target_os = "stax", target_os = "flex"))]
-            show_status_if_needed(&ins, &tx_ctx, &_status);
+    #[cfg(not(any(target_os = "stax", target_os = "flex")))]
+    {
+        // Developer mode / pending review popup
+        // must be cleared with user interaction
+        #[cfg(feature = "pending_review_screen")]
+        display_pending_review(&mut comm);
+
+        loop {
+            // Wait for either a specific button push to exit the app
+            // or an APDU command
+            if let Event::Command(ins) = ui_menu_main(&mut comm) {
+                let result = handle_apdu(&mut comm, &ins, &mut tx_ctx);
+                let _status: AppSW = match result {
+                    Ok(()) => {
+                        comm.reply_ok();
+                        AppSW::Ok
+                    }
+                    Err(sw) => {
+                        comm.reply(sw);
+                        sw
+                    }
+                };
+            }
         }
     }
 }