diff --git a/contrib/udev/20-hw1.rules b/contrib/udev/20-hw1.rules index cba158d12b..b583388f1a 100644 --- a/contrib/udev/20-hw1.rules +++ b/contrib/udev/20-hw1.rules @@ -1,14 +1,8 @@ -# HW.1 / Nano +# HW.1, Nano SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="1b7c|2b7c|3b7c|4b7c", TAG+="uaccess", TAG+="udev-acl" -# Blue -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0000|0000|0001|0002|0003|0004|0005|0006|0007|0008|0009|000a|000b|000c|000d|000e|000f|0010|0011|0012|0013|0014|0015|0016|0017|0018|0019|001a|001b|001c|001d|001e|001f", TAG+="uaccess", TAG+="udev-acl" -# Nano S -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0001|1000|1001|1002|1003|1004|1005|1006|1007|1008|1009|100a|100b|100c|100d|100e|100f|1010|1011|1012|1013|1014|1015|1016|1017|1018|1019|101a|101b|101c|101d|101e|101f", TAG+="uaccess", TAG+="udev-acl" -# Aramis -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0002|2000|2001|2002|2003|2004|2005|2006|2007|2008|2009|200a|200b|200c|200d|200e|200f|2010|2011|2012|2013|2014|2015|2016|2017|2018|2019|201a|201b|201c|201d|201e|201f", TAG+="uaccess", TAG+="udev-acl" -# HW2 -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0003|3000|3001|3002|3003|3004|3005|3006|3007|3008|3009|300a|300b|300c|300d|300e|300f|3010|3011|3012|3013|3014|3015|3016|3017|3018|3019|301a|301b|301c|301d|301e|301f", TAG+="uaccess", TAG+="udev-acl" -# Nano X -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0004|4000|4001|4002|4003|4004|4005|4006|4007|4008|4009|400a|400b|400c|400d|400e|400f|4010|4011|4012|4013|4014|4015|4016|4017|4018|4019|401a|401b|401c|401d|401e|401f", TAG+="uaccess", TAG+="udev-acl" -# Nano S Plus -SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0005|5000|5001|5002|5003|5004|5005|5006|5007|5008|5009|500a|500b|500c|500d|500e|500f|5010|5011|5012|5013|5014|5015|5016|5017|5018|5019|501a|501b|501c|501d|501e|501f", TAG+="uaccess", TAG+="udev-acl" + +# Blue, NanoS, Aramis, HW.2, Nano X, NanoSP, Stax, Ledger Test, +SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", TAG+="uaccess", TAG+="udev-acl" + +# Same, but with hidraw-based library (instead of libusb) +KERNEL=="hidraw*", ATTRS{idVendor}=="2c97", MODE="0666" \ No newline at end of file diff --git a/electrum_dash/plugins/ledger/ledger.py b/electrum_dash/plugins/ledger/ledger.py index 8e324efcd0..8c98575518 100644 --- a/electrum_dash/plugins/ledger/ledger.py +++ b/electrum_dash/plugins/ledger/ledger.py @@ -664,8 +664,8 @@ class LedgerPlugin(HW_PluginBase): (0x2c97, 0x4011), # Nano-X app-bitcoin >= 1.5.1 (0x2c97, 0x4015), # Nano-X app-bitcoin >= 1.5.1 (0x2c97, 0x0005), # Nano-S Plus - (0x2c97, 0x0006), # RFU - (0x2c97, 0x0007), # RFU + (0x2c97, 0x0006), # Stax + (0x2c97, 0x0007), # Flex (0x2c97, 0x0008), # RFU (0x2c97, 0x0009), # RFU (0x2c97, 0x000a) # RFU @@ -675,6 +675,8 @@ class LedgerPlugin(HW_PluginBase): 0x10: "Ledger Nano S", 0x40: "Ledger Nano X", 0x50: "Ledger Nano S Plus", + 0x60: "Ledger Stax", + 0x70: "Ledger Flex", } SUPPORTED_XTYPES = ('standard', ) @@ -716,6 +718,10 @@ def _recognize_device(cls, product_key) -> Tuple[bool, Optional[str]]: return True, "Ledger Nano X" if product_key == (0x2c97, 0x0005): return True, "Ledger Nano S Plus" + if product_key == (0x2c97, 0x0006): + return True, "Ledger Stax" + if product_key == (0x2c97, 0x0007): + return True, "Ledger Flex" return True, None # modern product_keys if product_key[0] == 0x2c97: