Merge pull request #227 from LedgerHQ/y333_20122024/appflags_device_m…

…etadata appflags shall be set in hex value and could be set at device level
LedgerHQ · Jan 3, 2025 · 6a607b4 · 6a607b4
2 parents 52bec2a + 72c22a9
commit 6a607b4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cargo-ledger/Cargo.toml b/cargo-ledger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cargo-ledger"
-version = "1.5.1"
-authors = ["yhql", "agrojean-ledger"]
+version = "1.6.0"
+authors = ["yhql", "agrojean-ledger", "y333"]
 description = "Build and sideload Ledger devices apps"
 categories = ["development-tools::cargo-plugins"]
 repository = "https://github.com/LedgerHQ/cargo-ledger"

diff --git a/cargo-ledger/src/main.rs b/cargo-ledger/src/main.rs
@@ -16,29 +16,18 @@ use utils::*;
 mod setup;
 mod utils;
 
-/// Structure for retrocompatibility, when the cargo manifest file
-/// contains a single `[package.metadata.nanos]` section
-#[derive(Debug, Deserialize)]
-struct NanosMetadata {
-    curve: Vec<String>,
-    path: Vec<String>,
-    flags: String,
-    icon: String,
-    icon_small: String,
-    name: Option<String>,
-}
-
 #[derive(Debug, Deserialize)]
 struct LedgerMetadata {
     curve: Vec<String>,
     path: Vec<String>,
-    flags: String,
+    flags: Option<String>,
     name: Option<String>,
 }
 
 #[derive(Debug, Deserialize)]
 struct DeviceMetadata {
     icon: String,
+    flags: Option<String>,
 }
 
 #[derive(Parser, Debug)]
@@ -123,7 +112,7 @@ fn main() {
 fn retrieve_metadata(
     device: Device,
     manifest_path: Option<&str>,
-) -> (Package, LedgerMetadata, DeviceMetadata) {
+) -> Result<(Package, LedgerMetadata, DeviceMetadata), ()> {
     let mut cmd = cargo_metadata::MetadataCommand::new();
 
     // Only used during tests
@@ -154,31 +143,10 @@ fn retrieve_metadata(
             serde_json::from_value(metadata_device)
                 .expect("Could not deserialize device medatada");
 
-        (this_pkg.clone(), ledger_metadata, device_metadata)
+        Ok((this_pkg.clone(), ledger_metadata, device_metadata))
     } else {
-        println!("WARNING: 'package.metadata.ledger' section is missing in Cargo.toml, trying 'package.metadata.nanos'");
-        let nanos_section = this_pkg.metadata.get("nanos").expect(
-            "No appropriate [package.metadata.<ledger|nanos>] section found.",
-        );
-
-        let nanos_metadata: NanosMetadata =
-            serde_json::from_value(nanos_section.clone())
-                .expect("Could not deserialize medatada.nanos");
-        let ledger_metadata = LedgerMetadata {
-            curve: nanos_metadata.curve,
-            path: nanos_metadata.path,
-            flags: nanos_metadata.flags,
-            name: nanos_metadata.name,
-        };
-
-        let device_metadata = DeviceMetadata {
-            icon: match device {
-                Device::Nanos => nanos_metadata.icon,
-                _ => nanos_metadata.icon_small,
-            },
-        };
-
-        (this_pkg.clone(), ledger_metadata, device_metadata)
+        println!("No metadata found for device: {}", device);
+        Err(())
     }
 }
 
@@ -263,7 +231,7 @@ fn build_app(
     };
 
     let (this_pkg, metadata_ledger, metadata_device) =
-        retrieve_metadata(device, None);
+        retrieve_metadata(device, None).unwrap();
 
     let package_path = this_pkg
         .manifest_path
@@ -291,14 +259,21 @@ fn build_app(
     // Retrieve real data size and SDK infos from ELF
     let infos = retrieve_infos(&exe_path).unwrap();
 
-    // Modify flags to enable BLE if targeting Nano X
-    let flags = match device {
-        Device::Nanos | Device::Nanosplus => metadata_ledger.flags,
-        Device::Nanox | Device::Stax | Device::Flex => {
-            let base = u32::from_str_radix(metadata_ledger.flags.as_str(), 16)
-                .unwrap_or(0);
-            format!("0x{:x}", base | 0x200)
-        }
+    let flags = match metadata_device.flags {
+        Some(flags) => flags,
+        None => match metadata_ledger.flags {
+            Some(flags) => match device {
+                // Modify flags to enable BLE if targeting Nano X
+                Device::Nanos | Device::Nanosplus => flags,
+                Device::Nanox | Device::Stax | Device::Flex => {
+                    let base =
+                        u32::from_str_radix(flags.trim_start_matches("0x"), 16)
+                            .unwrap_or(0);
+                    format!("0x{:x}", base | 0x200)
+                }
+            },
+            None => String::from("0x000"),
+        },
     };
 
     // Target ID according to target, in case it