Add support for Satochip hardware wallet

contrib/build-linux/appimage/Dockerfile

@@ -21,6 +21,8 @@ RUN apt-get update -q && \
         gettext=0.19.7-2ubuntu3.1 \
         libzbar0=0.10+doc-10ubuntu1  \
         libdbus-1-3=1.10.6-1ubuntu3.4 \
+        libpcsclite-dev=1.8.14-1ubuntu1.16.04.1 \
+        swig=3.0.8-0ubuntu3 \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \

contrib/build-linux/appimage/build.sh

@@ -137,6 +137,7 @@ mkdir -p "$CACHEDIR/pip_cache"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-hw.txt"
+"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-satochip.txt"
 "$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" "$PROJECT_ROOT"
 
 

contrib/build-wine/deterministic.spec

@@ -21,6 +21,8 @@ hiddenimports += collect_submodules('safetlib')
 hiddenimports += collect_submodules('btchip')
 hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
+hiddenimports += collect_submodules('satochip') 
+hiddenimports += collect_submodules('smartcard') 
 hiddenimports += collect_submodules('ckcc')
 hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
 
@@ -37,13 +39,16 @@ binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]
 binaries += [('C:/tmp/libsecp256k1.dll', '.')]
 binaries += [('C:/tmp/libusb-1.0.dll', '.')]
 
+# pyscard binaries for Satochip
+binaries += [('C:/python*/Lib/site-packages/smartcard/scard/_scard.cp36-win32.pyd', '.')] #satochip
+
 datas = [
     (home+'electrum/*.json', 'electrum'),
     (home+'electrum/wordlist/english.txt', 'electrum/wordlist'),
     (home+'electrum/locale', 'electrum/locale'),
     (home+'electrum/plugins', 'electrum/plugins'),
     ('C:\\Program Files (x86)\\ZBar\\bin\\', '.'),
-    (home+'electrum/gui/icons', 'electrum/gui/icons'),
+    (home+'electrum/gui/icons', 'electrum/gui/icons')
 ]
 datas += collect_data_files('trezorlib')
 datas += collect_data_files('safetlib')
@@ -70,6 +75,7 @@ a = Analysis([home+'run_electrum',
               home+'electrum/plugins/safe_t/qt.py',
               home+'electrum/plugins/keepkey/qt.py',
               home+'electrum/plugins/ledger/qt.py',
+              home+'electrum/plugins/satochip/qt.py',
               home+'electrum/plugins/coldcard/qt.py',
               #home+'packages/requests/utils.py'
               ],

contrib/build-wine/prepare-wine.sh

@@ -17,6 +17,11 @@ PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git"
 PYINSTALLER_COMMIT=e934539374e30d1500fcdbe8e4eb0860413935b2
 # ^ tag 3.6, plus a custom commit that fixes cross-compilation with MinGW
 
+#Satochip pyscard
+PYSCARD_FILENAME=pyscard-1.9.9-cp36-cp36m-win32.whl  # python 3.6, 32-bit
+PYSCARD_URL=https://ci.appveyor.com/api/buildjobs/3uiua5o4llvpegbp/artifacts/dist/pyscard-1.9.9-cp36-cp36m-win32.whl
+PYSCARD_SHA256=99d2b450f322f9ed9682fd2a99d95ce781527e371006cded38327efca8158fe7
+
 PYTHON_VERSION=3.6.8
 
 ## These settings probably don't need change
@@ -68,6 +73,12 @@ download_if_not_exist "$CACHEDIR/$ZBAR_FILENAME" "$ZBAR_URL"
 verify_hash "$CACHEDIR/$ZBAR_FILENAME" "$ZBAR_SHA256"
 wine "$CACHEDIR/$ZBAR_FILENAME" /S
 
+#Satochip install pyscard
+info "Installing pyscard..."
+download_if_not_exist $PYSCARD_FILENAME "$PYSCARD_URL"
+verify_hash $PYSCARD_FILENAME "$PYSCARD_SHA256"
+$PYTHON -m pip install "$CACHEDIR/$PYSCARD_FILENAME"
+
 info "Installing NSIS."
 download_if_not_exist "$CACHEDIR/$NSIS_FILENAME" "$NSIS_URL"
 verify_hash "$CACHEDIR/$NSIS_FILENAME" "$NSIS_SHA256"

contrib/deterministic-build/requirements-satochip.txt

@@ -0,0 +1,4 @@
+pyscard==1.9.9 \
+    --hash=sha256:6620a74f58d5fa9076544263bb4e42c946eb20f315c896d14a7e5743d5431469 \
+    --hash=sha256:a047738c58d05b4dab15aa9c99fbd92f8d0670900de89c68bec247a422f8d8c7 \
+    --hash=sha256:e6bde541990183858740793806b1c7f4e798670519ae4c96145f35d5d7944c20

contrib/requirements/requirements-hw.txt

@@ -4,3 +4,4 @@ keepkey>=6.3.1
 btchip-python>=0.1.26
 ckcc-protocol>=0.7.7
 hidapi
+pyscard>=1.9.6

electrum/plugins/hw_wallet/qt.py

@@ -185,7 +185,9 @@ def error_dialog(self, msg, blocking):
 
     def clear_dialog(self):
         if self.dialog:
-            self.dialog.accept()
+            try: self.dialog.accept()
+            except RuntimeError: 
+                pass #see https://github.com/Electron-Cash/Electron-Cash/issues/1437
             self.dialog = None
 
     def win_query_choice(self, msg, labels):