spesmilo · SomberNight · May 20, 2022 · Nov 17, 2021
diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec
@@ -22,6 +22,8 @@ hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 hiddenimports += collect_submodules('ckcc')
 hiddenimports += collect_submodules('bitbox02')
+hiddenimports += ['electrum.plugins.jade.jade']
+hiddenimports += ['electrum.plugins.jade.jadepy.jade']
 hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
 
 
@@ -69,6 +71,7 @@ a = Analysis([home+'run_electrum',
               home+'electrum/plugins/keepkey/qt.py',
               home+'electrum/plugins/ledger/qt.py',
               home+'electrum/plugins/coldcard/qt.py',
+              home+'electrum/plugins/jade/qt.py',
               #home+'packages/requests/utils.py'
               ],
              binaries=binaries,

diff --git a/contrib/deterministic-build/requirements-hw.txt b/contrib/deterministic-build/requirements-hw.txt
@@ -211,3 +211,8 @@ wheel==0.37.1 \
 colorama==0.4.4 \
     --hash=sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b \
     --hash=sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2
+cbor==1.0.0 \
+    --hash=sha256:13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6
+pyserial==3.5.0 \
+    --hash=sha256:c4451db6ba391ca6ca299fb3ec7bae67a5c55dde170964c7a14ceefec02f2cf0 \
+    --hash=sha256:3c77e014170dfffbd816e6ffc205e9842efb10be9f58ec16d3e8675b4925cddb
diff --git a/contrib/osx/osx.spec b/contrib/osx/osx.spec
@@ -30,6 +30,8 @@ hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 hiddenimports += collect_submodules('ckcc')
 hiddenimports += collect_submodules('bitbox02')
+hiddenimports += ['electrum.plugins.jade.jade']
+hiddenimports += ['electrum.plugins.jade.jadepy.jade']
 hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
 
 datas = [
@@ -75,6 +77,7 @@ a = Analysis([electrum+ MAIN_SCRIPT,
               electrum+'electrum/plugins/keepkey/qt.py',
               electrum+'electrum/plugins/ledger/qt.py',
               electrum+'electrum/plugins/coldcard/qt.py',
+              electrum+'electrum/plugins/jade/qt.py',
               ],
              binaries=binaries,
              datas=datas,

diff --git a/contrib/requirements/requirements-hw.txt b/contrib/requirements/requirements-hw.txt
@@ -5,3 +5,5 @@ keepkey>=6.3.1
 btchip-python>=0.1.32
 ckcc-protocol>=0.7.7
 bitbox02>=6.0.0
+cbor>=1.0.0,<2.0.0
+pyserial>=3.5.0,<4.0.0
diff --git a/contrib/udev/55-usb-jade.rules b/contrib/udev/55-usb-jade.rules
@@ -0,0 +1,2 @@
+KERNEL=="ttyUSB*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="jade%n"
+KERNEL=="ttyACM*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55d4", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="jade%n"
diff --git a/contrib/udev/README.md b/contrib/udev/README.md
@@ -11,6 +11,7 @@ These are necessary for the devices to be usable on Linux environments.
  - `51-trezor.rules` (Trezor): https://github.com/trezor/trezor-common/blob/master/udev/51-trezor.rules
  - `51-usb-keepkey.rules` (Keepkey): https://github.com/keepkey/udev-rules/blob/master/51-usb-keepkey.rules
  - `51-safe-t.rules` (Archos): https://github.com/archos-safe-t/safe-t-common/blob/master/udev/51-safe-t.rules
+ - `55-usb-jade.rules` (Blockstream Jade): https://github.com/Blockstream/Jade
 
 # Usage
 

diff --git a/electrum/gui/icons/jade.png b/electrum/gui/icons/jade.png
diff --git a/electrum/gui/icons/jade_unpaired.png b/electrum/gui/icons/jade_unpaired.png
diff --git a/electrum/plugins/jade/__init__.py b/electrum/plugins/jade/__init__.py
@@ -0,0 +1,7 @@
+from electrum.i18n import _
+
+fullname = 'Blockstream Jade Wallet'
+description = 'Provides support for the Blockstream Jade hardware wallet'
+#requires = [('', 'github.com/')]
+registers_keystore = ('hardware', 'jade', _("Jade wallet"))
+available_for = ['qt', 'cmdline']
diff --git a/electrum/plugins/jade/cmdline.py b/electrum/plugins/jade/cmdline.py
@@ -0,0 +1,14 @@
+from electrum.plugin import hook
+from .jade import JadePlugin
+from ..hw_wallet import CmdLineHandler
+
+class Plugin(JadePlugin):
+    handler = CmdLineHandler()
+    @hook
+    def init_keystore(self, keystore):
+        if not isinstance(keystore, self.keystore_class):
+            return
+        keystore.handler = self.handler
+
+    def create_handler(self, window):
+        return self.handler
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		KERNEL=="ttyUSB*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="jade%n"
		KERNEL=="ttyACM*", SUBSYSTEMS=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="55d4", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="jade%n"