Merge pull request #253 from LedgerHQ/y333/fix_ux_event_id

yogh333 · web-flow · commit 13ede06b1c28 · 2025-03-18T11:00:23.000+01:00
Panic if unknown UX event is set
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ledger_device_sdk/Cargo.toml b/ledger_device_sdk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ledger_device_sdk"
-version = "1.22.0"
+version = "1.22.1"
 authors = ["yhql", "yogh333", "agrojean-ledger", "kingofpayne"]
 edition = "2021"
 license.workspace = true
diff --git a/ledger_device_sdk/src/uxapp.rs b/ledger_device_sdk/src/uxapp.rs
@@ -21,7 +21,7 @@ pub enum UxEvent {
     Keyboard = BOLOS_UX_KEYBOARD,
     WakeUp = BOLOS_UX_WAKE_UP,
     ValidatePIN = BOLOS_UX_VALIDATE_PIN,
-    LastID = BOLOS_UX_LAST_ID,
+    LastID = BOLOS_UX_VALIDATE_PIN + 1,
 }
 
 impl UxEvent {
@@ -38,7 +38,7 @@ impl UxEvent {
 
                 Self::ValidatePIN as u8
             }
-            Self::LastID => Self::LastID as u8,
+            Self::LastID => panic!("Unknown UX Event"),
         };
 
         os_ux_rs(&params);

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ pub enum UxEvent {`
`21`	`21`	`Keyboard = BOLOS_UX_KEYBOARD,`
`22`	`22`	`WakeUp = BOLOS_UX_WAKE_UP,`
`23`	`23`	`ValidatePIN = BOLOS_UX_VALIDATE_PIN,`
`24`		`- LastID = BOLOS_UX_LAST_ID,`
	`24`	`+ LastID = BOLOS_UX_VALIDATE_PIN + 1,`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`impl UxEvent {`
`@@ -38,7 +38,7 @@ impl UxEvent {`
`38`	`38`
`39`	`39`	`Self::ValidatePIN as u8`
`40`	`40`	`}`
`41`		`- Self::LastID => Self::LastID as u8,`
	`41`	`+ Self::LastID => panic!("Unknown UX Event"),`
`42`	`42`	`};`
`43`	`43`
`44`	`44`	`os_ux_rs(&params);`