Merge pull request #251 from LedgerHQ/y333/remove_nanos_support

Remove Nano S support

Author: yogh333

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
         package: [include_gif, testmacro, ledger_secure_sdk_sys, ledger_device_sdk]
     steps:
       - name: Print Environment variables
@@ -66,7 +66,7 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
     steps:
       - name: Clone
         uses: actions/checkout@v4
@@ -95,7 +95,7 @@ jobs:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest
     strategy:
       matrix:
-        target: ["nanos", "nanox", "nanosplus", "stax", "flex"]
+        target: ["nanox", "nanosplus", "stax", "flex"]
     steps:
       - name: Clone
         uses: actions/checkout@v4

.github/workflows/publish.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Test Dry-Run Publish for Each Package
         run: |
           # Iterate through package names retrieved
-          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk"
+          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk cargo-ledger"
           for PACKAGE_NAME in $PACKAGE_NAMES; do
             # Test a dry-run publish for each package within the workspace if required
             last_published_version=$(cargo search -q --limit 1 $PACKAGE_NAME | grep -oP '\d+\.\d+\.\d+')
@@ -60,7 +60,7 @@ jobs:
       - name: Publish Package on crates.io if required
         run: |
           # Iterate through package names retrieved
-          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk"
+          PACKAGE_NAMES="testmacro include_gif ledger_secure_sdk_sys ledger_device_sdk cargo-ledger"
           for PACKAGE_NAME in $PACKAGE_NAMES; do
             # Publish each package within the workspace if required
             last_published_version=$(cargo search -q --limit 1 $PACKAGE_NAME | grep -oP '\d+\.\d+\.\d+')

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-ledger"
-version = "1.7.0"
+version = "1.8.0"
 authors = ["yhql", "agrojean-ledger", "y333"]
 description = "Build and sideload Ledger devices apps"
 categories = ["development-tools::cargo-plugins"]

cargo-ledger/Cargo.toml

@@ -50,10 +50,10 @@ cargo ledger build flex
 
 Loading on device can optionally be performed by appending `--load` or `-l` to the command.
 
-By default, this program will attempt to build the current program with in `release` mode (full command: `cargo build --release --target=nanos --message-format=json`)
+By default, this program will attempt to build the current program with in `release` mode (full command: `cargo build --release --target=nanosplus --message-format=json`)
 
 Arguments can be passed to modify this behaviour after inserting a `--` like so:
 
 ```
-cargo ledger build nanos --load -- --features one -Z unstable-options --out-dir ./output/
+cargo ledger build nanosplus --load -- --features one -Z unstable-options --out-dir ./output/
 ```

cargo-ledger/README.md

@@ -52,7 +52,6 @@ struct CliArgs {
 
 #[derive(ValueEnum, Clone, Copy, Debug, PartialEq)]
 enum Device {
-    Nanos,
     Nanox,
     Nanosplus,
     Stax,
@@ -68,7 +67,6 @@ impl Display for Device {
 impl AsRef<str> for Device {
     fn as_ref(&self) -> &str {
         match self {
-            Device::Nanos => "nanos",
             Device::Nanox => "nanox",
             Device::Nanosplus => "nanosplus",
             Device::Stax => "stax",
@@ -159,7 +157,6 @@ fn build_app(
     let exe_path = match use_prebuilt {
         None => {
             let c_sdk_path = match device {
-                Device::Nanos => std::env::var("NANOS_SDK"),
                 Device::Nanosplus => std::env::var("NANOSP_SDK"),
                 Device::Nanox => std::env::var("NANOX_SDK"),
                 Device::Stax => std::env::var("STAX_SDK"),
@@ -264,7 +261,7 @@ fn build_app(
         None => match metadata_ledger.flags {
             Some(flags) => match device {
                 // Modify flags to enable BLE if targeting Nano X
-                Device::Nanos | Device::Nanosplus => flags,
+                Device::Nanosplus => flags,
                 Device::Nanox | Device::Stax | Device::Flex => {
                     let base =
                         u32::from_str_radix(flags.trim_start_matches("0x"), 16)
@@ -279,7 +276,6 @@ fn build_app(
     // Target ID according to target, in case it
     // is not present in the retrieved ELF infos.
     let backup_targetid: String = match device {
-        Device::Nanos => String::from("0x31100004"),
         Device::Nanox => String::from("0x33000004"),
         Device::Nanosplus => String::from("0x33100004"),
         Device::Stax => String::from("0x33200004"),
@@ -301,13 +297,8 @@ fn build_app(
         "binary": hex_file,
         "dataSize": infos.size
     });
-    // Ignore apiLevel for Nano S as it is unsupported for now
-    match device {
-        Device::Nanos => (),
-        _ => {
-            json["apiLevel"] = infos.api_level.into();
-        }
-    }
+
+    json["apiLevel"] = infos.api_level.into();
     serde_json::to_writer_pretty(file, &json).unwrap();
 
     // Copy icon to the same directory as the app.json
@@ -359,41 +350,37 @@ mod tests {
     #[test]
     fn valid_metadata() {
         let (_, metadata_ledger, metadata_nanos) =
-            retrieve_metadata(Device::Nanos, Some("./tests/valid/Cargo.toml"));
+            retrieve_metadata(Device::Flex, Some("./tests/valid/Cargo.toml"));
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0x38");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
-
-        assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
     }
 
     #[test]
     fn valid_metadata_variant() {
         let (_, metadata_ledger, metadata_nanos) = retrieve_metadata(
-            Device::Nanos,
+            Device::Flex,
             Some("./tests/valid_variant/Cargo.toml"),
         );
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0x38");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
-        assert_eq!(metadata_nanos.icon, "./assets/nanos.gif")
     }
 
     #[test]
     fn valid_outdated_metadata() {
         let (_, metadata_ledger, metadata_nanos) = retrieve_metadata(
-            Device::Nanos,
+            Device::Flex,
             Some("./tests/valid_outdated/Cargo.toml"),
         );
 
         assert_eq!(metadata_ledger.name, Some("TestApp".to_string()));
         assert_eq!(metadata_ledger.curve, ["secp256k1"]);
         assert_eq!(metadata_ledger.flags, "0");
         assert_eq!(metadata_ledger.path, ["'44/123"]);
-        assert_eq!(metadata_nanos.icon, "nanos.gif")
     }
 }

cargo-ledger/src/main.rs

@@ -39,7 +39,7 @@ pub fn install_targets() {
 
     // Retrieve each target file independently
     // TODO: handle target.json modified upstream
-    for target in &["nanos", "nanox", "nanosplus", "stax", "flex"] {
+    for target in &["nanox", "nanosplus", "stax", "flex"] {
         let outfilepath = sysroot.join(target).join("target.json");
         let targetpath =
             outfilepath.clone().into_os_string().into_string().unwrap();

cargo-ledger/src/setup.rs

@@ -12,9 +12,6 @@ curve = ["secp256k1"]
 flags = "0x38"
 path = ["'44/123"]
 
-[package.metadata.ledger.nanos]
-icon = "./assets/nanos.gif"
-
 [package.metadata.ledger.nanox]
 icon = "./assets/nanox.gif"
 

cargo-ledger/tests/valid/Cargo.toml

@@ -6,11 +6,11 @@ version = "0.0.0"
 name = "test"
 path = ""
 
-[package.metadata.nanos]
+[package.metadata.ledger]
 api_level = "1"
 name = "TestApp"
 curve = ["secp256k1"]
 flags = "0"
-icon = "nanos.gif"
-icon_small = "nanox.gif"
+nanosplus.icon = "nanosplus.gif"
+nanox.icon = "nanox.gif"
 path = ["'44/123"]

cargo-ledger/tests/valid_outdated/Cargo.toml

@@ -11,6 +11,5 @@ name = "TestApp"
 curve = ["secp256k1"]
 flags = "0x38"
 path = ["'44/123"]
-nanos.icon = "./assets/nanos.gif"
 nanox.icon = "./assets/nanox.gif"
 nanosplus.icon = "./assets/nanosplus.gif"