Page MenuHomePhabricator
Files F13711154

D17785.id53148.diff
No OneTemporary
Actions

D17785.id53148.diff
View Options

diff --git a/electrum/contrib/build-linux/appimage/_build.sh b/electrum/contrib/build-linux/appimage/_build.sh
--- a/electrum/contrib/build-linux/appimage/_build.sh
+++ b/electrum/contrib/build-linux/appimage/_build.sh
@@ -197,8 +197,9 @@
# these are deleted as they were not deterministic; and are not needed anyway
find "$APPDIR" -path '*/__pycache__*' -delete
-rm -rf "$PYDIR"/site-packages/*.dist-info/
rm -rf "$PYDIR"/site-packages/*.egg-info/
+# Remove the .dist-info directories but keep slip10-*.dist-info because this library needs its metadata.
+find "$PYDIR/site-packages" -maxdepth 1 -mindepth 1 -type d -name "*.dist-info" ! -name "slip10*" -exec rm -rf {} +
# set timestamps in dist, in order to make the installer reproducible
find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
diff --git a/electrum/contrib/deterministic-build/requirements-hw.txt b/electrum/contrib/deterministic-build/requirements-hw.txt
--- a/electrum/contrib/deterministic-build/requirements-hw.txt
+++ b/electrum/contrib/deterministic-build/requirements-hw.txt
@@ -1,6 +1,9 @@
attrs==21.4.0 \
--hash=sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4 \
--hash=sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd
+base58==2.1.1 \
+ --hash=sha256:c5d0cb3f5b6e81e8e35da5754388ddcc6d0d14b6c6a132cb93d69ed580a7278c \
+ --hash=sha256:11a36f4d3ce51dfc1043f3218591ac4eb1ceb172919cebe05b52a5bcc8d245c2
btchip-python @ https://github.com/EchterAgo/btchip-python/archive/f65cca5dea1cae6031accc961b5754d02c52a106.tar.gz \
--hash=sha256:586f8ea4d48287c4b744b47dee031dbdaa3a7a2483ba49d3e87efc340177f52d
certifi==2024.7.4 \
@@ -351,9 +354,12 @@
six==1.16.0 \
--hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
--hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
-trezor==0.13.9 \
- --hash=sha256:30ffcbefb5f9300fe1ac34754a593ff10ae400bce22e2a062c45870ed4949fd5 \
- --hash=sha256:9450bd7bb9d23e5e33a3c9e58e18f058b44c9d9c34ca664b4981a795aa9fb1ef
+slip10==1.0.1 \
+ --hash=sha256:02b350ae557b591791428b17551f95d7ac57e9211f37debdc814c90b4a123a54 \
+ --hash=sha256:4aa764369db0a261e468160ec1afeeb2b22d26392dd118c49b9daa91f642947b
+trezor[hidapi] @ \
+ https://github.com/Bitcoin-ABC/ecash-trezor-firmware/archive/bea24410b4f3b7a7327bb934a78cf9cba482572a.tar.gz#subdirectory=python \
+ --hash=sha256:fd880ad60b4ec99e97265cbeeb54bfd85cb414ce3a50ef0825b014253a4166ae
typing-extensions==4.9.0 \
--hash=sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783 \
--hash=sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd
diff --git a/electrum/contrib/requirements/requirements-hw.txt b/electrum/contrib/requirements/requirements-hw.txt
--- a/electrum/contrib/requirements/requirements-hw.txt
+++ b/electrum/contrib/requirements/requirements-hw.txt
@@ -1,5 +1,6 @@
Cython>=0.27
-trezor[hidapi]>=0.13.8,<0.14
+# trezorlib with support for eCash stake signatures (if a custom firmware is used)
+trezor[hidapi] @ https://github.com/Bitcoin-ABC/ecash-trezor-firmware/archive/bea24410b4f3b7a7327bb934a78cf9cba482572a.tar.gz#subdirectory=python
keepkey>=6.1
# btchip-python 0.1.32 with a patch to fix a malformed dependency
# See https://github.com/LedgerHQ/btchip-python/pull/54

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 10:37 (3 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5571499
Default Alt Text
D17785.id53148.diff (3 KB)

Event Timeline