Skip to content

Commit

Permalink
Update Satochip plugin hardware wallet to support latest firmware v0.11
Browse files Browse the repository at this point in the history
This allows to support the latest Satochip firmware v0.11 with improved performances and support for secure channel (encrypted and authenticated communication between the EC wallet and the card for improved security).
The plugin has been simplified by using the pysatochip library for communication with the card. Also, the Satochip_2FA plugin (used for optional 2-Factor-Authentication) has been merged with the Satochip plugin.
Seed generation: use BIP39 by default for better compatibility (instead of electrum seeds)
User interface improvements: 2FA can be activated from the option menu

See:
Electron-Cash#1915
Electron-Cash#2127
  • Loading branch information
Toporin committed Feb 15, 2021
1 parent f7bf6f5 commit 22b6514
Show file tree
Hide file tree
Showing 15 changed files with 401 additions and 2,455 deletions.
2 changes: 1 addition & 1 deletion contrib/build-linux/appimage/_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ mkdir -p "$CACHEDIR/pip_cache"
"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-hw.txt"
"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-satochip.txt"
#"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-satochip.txt"
"$python" -m pip install --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" "$PROJECT_ROOT"


Expand Down
15 changes: 12 additions & 3 deletions contrib/deterministic-build/requirements-hw.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ click==7.0 \
--hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7
construct==2.9.45 \
--hash=sha256:2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
ecdsa==0.13.2 \
--hash=sha256:20c17e527e75acad8f402290e158a6ac178b91b881f941fc6ea305bfdfb9657c \
--hash=sha256:5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884
ecdsa==0.15 \
--hash=sha256:867ec9cf6df0b03addc8ef66b56359643cb5d0c1dc329df76ba7ecfe256c8061 \
--hash=sha256:8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277
hidapi==0.7.99.post21 \
--hash=sha256:1ac170f4d601c340f2cd52fd06e85c5e77bad7ceac811a7bb54b529f7dc28c24 \
--hash=sha256:6424ad75da0021ce8c1bcd78056a04adada303eff3c561f8d132b85d0a914cb3 \
Expand Down Expand Up @@ -69,6 +69,15 @@ pyblake2==1.1.2 \
--hash=sha256:baa2190bfe549e36163aa44664d4ee3a9080b236fc5d42f50dc6fd36bbdc749e \
--hash=sha256:c53417ee0bbe77db852d5fd1036749f03696ebc2265de359fe17418d800196c4 \
--hash=sha256:fbc9fcde75713930bc2a91b149e97be2401f7c9c56d735b46a109210f58d7358
pysatochip==0.11.2 \
--hash=sha256:52317953c4d4968a6184c2da7a802d8aa50977ba85f39475ba360e4e78063e17 \
--hash=sha256:c9b21b2bf9c001e9cb6e78aae3d242f1db72907d8cf7377aa818688d7d436ed1
pyscard==1.9.9 \
--hash=sha256:6620a74f58d5fa9076544263bb4e42c946eb20f315c896d14a7e5743d5431469 \
--hash=sha256:a047738c58d05b4dab15aa9c99fbd92f8d0670900de89c68bec247a422f8d8c7 \
--hash=sha256:c213a94585a48f8f1ff3c36c06fa3a162d2fd7f2c89240ac632bd38a3fa5df9b \
--hash=sha256:e6bde541990183858740793806b1c7f4e798670519ae4c96145f35d5d7944c20 \
--hash=sha256:99d2b450f322f9ed9682fd2a99d95ce781527e371006cded38327efca8158fe7
requests==2.21.0 \
--hash=sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e \
--hash=sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b
Expand Down
2 changes: 2 additions & 0 deletions contrib/requirements/requirements-hw.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ trezor[hidapi]>=0.12.0
keepkey>=6.1
btchip-python
hidapi
pyscard==1.9.9
pysatochip==0.11.2
688 changes: 0 additions & 688 deletions plugins/satochip/CardConnector.py

This file was deleted.

236 changes: 0 additions & 236 deletions plugins/satochip/CardDataParser.py

This file was deleted.

Loading

0 comments on commit 22b6514

Please sign in to comment.