Merge pull request #7 from pshenmic/fix/windows-build

Fix windows build

.github/workflows/build_release.yml

@@ -213,14 +213,6 @@ jobs:
           DASH_ELECTRUM_VERSION: ${{ steps.set_vars.outputs.pkg_ver }}
         run: |
           ./contrib/dash/actions/script-wine.sh
-      - name: Upload Win32 Release Asset
-        uses: Bertrand256/[email protected]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag: ${{ inputs.tag }}
-          asset_path: dist/Dash-Electrum-${{ steps.set_vars.outputs.pkg_ver }}-setup-win32.exe
-          asset_name: Dash-Electrum-${{ steps.set_vars.outputs.pkg_ver }}-setup-win32.exe
       - name: Upload Win64 Release Asset
         uses: Bertrand256/[email protected]
         env:

contrib/build-wine/Dockerfile

@@ -1,14 +1,11 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 LABEL description="Dedicated to building Electrum Dash executables for Windows"
 
 ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
 
 USER root
 WORKDIR /root
 
-ENV WKEY_SHA1 c51bcb8cc4a12abfbd7c7660eaf90f49674d15e222c262f27e6c96429111b822
-ENV WKEY_SHA2 78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6
-
 RUN dpkg --add-architecture i386 \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -19,26 +16,21 @@ RUN dpkg --add-architecture i386 \
         dirmngr gettext locales \
         python3-software-properties \
         software-properties-common \
-    && wget -qO - https://dl.winehq.org/wine-builds/winehq.key | apt-key add - \
-    && apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main' \
+    && wget -O /etc/apt/keyrings/winehq-archive.key https://dl.winehq.org/wine-builds/winehq.key \
+    && wget -NP /etc/apt/sources.list.d/ https://dl.winehq.org/wine-builds/ubuntu/dists/$(lsb_release -sc)/winehq-$(lsb_release -sc).sources \
     && apt-get update \
-    && apt-get install -y wine-stable=8.0.1~bionic-1 \
+    && apt-get install -y wine-stable=8.0.2~jammy-1 \
         cabextract xauth xvfb ca-certificates zip unzip p7zip-full  \
     && wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
     && chmod +x winetricks && mv winetricks /usr/local/bin \
     && rm -rf /var/lib/apt/lists/*
 
-ENV WINEPATH c:/git/cmd;c:/Python38;c:/Python38/Scripts
+ENV WINEPATH c:/git/cmd;c:/Python310;c:/Python310/Scripts
 ENV WINEDEBUG -all
-ENV WINEPREFIX /root/.wine-32
-ENV WINEARCH win32
-ENV PYHOME $WINEPREFIX/drive_c/Python38
 
-ENV PY_PATH https://python.org/ftp/python/3.8.8/
-ENV PY32_FILE python-3.8.8.exe
-ENV PY32_SHA 64667d3185c57c493760ce1ce35c8c529ca46ce7188e02fb75fac6fcf72b9510
-ENV PY64_FILE python-3.8.8-amd64.exe
-ENV PY64_SHA 0e4b57099657c2304132d961e6939eed0c7da3cc4f15078008f9d5ba0a30726e
+ENV PY_PATH https://python.org/ftp/python/3.10.11/
+ENV PY64_FILE python-3.10.11-amd64.exe
+ENV PY64_MD5 a55e9c1e6421c84a4bd8b4be41492f51
 
 ENV LIBUSB_PATH https://github.com/libusb/libusb/releases/download/v1.0.24/
 ENV LIBUSB_FILE libusb-1.0.24.7z
@@ -50,14 +42,17 @@ ENV NSIS_SHA 1a3cc9401667547b9b9327a177b13485f7c59c2303d4b6183e7bc9e6c8d6bfdb
 
 ENV PATH=$PATH:/opt/wine-stable/bin
 
-RUN echo 'download and install 32-bit Python/git/NSIS' \
-    && wineboot -i \
-    && xvfb-run -a winetricks -q vcrun2015 && xvfb-run -a winetricks win10 \
+ENV WINEPREFIX /root/.wine-64
+ENV WINEARCH win64
+ENV PYHOME $WINEPREFIX/drive_c/Python310
+
+RUN echo 'download and install 64-bit Python/git/NSIS' \
+    && wineboot -i && xvfb-run -a winetricks win10 \
     \
-    && wget -nv ${PY_PATH}${PY32_FILE} \
-    && echo "${PY32_SHA} ${PY32_FILE}" | sha256sum -c - \
-    && xvfb-run -a wine $PY32_FILE /quiet InstallAllUsers=1 \
-        TargetDir=$PYHOME && rm $PY32_FILE \
+    && wget -nv ${PY_PATH}${PY64_FILE} \
+    && echo "${PY64_MD5} ${PY64_FILE}" | md5sum -c - \
+    && xvfb-run -a wine $PY64_FILE /quiet InstallAllUsers=1 \
+        TargetDir=$PYHOME && rm $PY64_FILE \
     && wine python -m pip install -U pip \
     \
     && wget -nv ${LIBUSB_PATH}${LIBUSB_FILE} \
@@ -69,22 +64,6 @@ RUN echo 'download and install 32-bit Python/git/NSIS' \
     && echo "${NSIS_SHA} ${NSIS_FILE}" | sha256sum -c - \
     && wine $NSIS_FILE /S \
     \
-    && rm -rf /tmp/.wine-0
-
-
-ENV WINEPREFIX /root/.wine-64
-ENV WINEARCH win64
-ENV PYHOME $WINEPREFIX/drive_c/Python38
-
-RUN echo 'download and install 64-bit Python/git/NSIS' \
-    && wineboot -i && xvfb-run -a winetricks win10 \
-    \
-    && wget -nv ${PY_PATH}${PY64_FILE} \
-    && echo "${PY64_SHA} ${PY64_FILE}" | sha256sum -c - \
-    && xvfb-run -a wine $PY64_FILE /quiet InstallAllUsers=1 \
-        TargetDir=$PYHOME && rm $PY64_FILE \
-    && wine python -m pip install -U pip \
-    \
     && cp libusb/VS2019/MS64/dll/libusb-1.0.dll $PYHOME/ && rm -rf libusb \
     \
     && wine $NSIS_FILE /S  && rm $NSIS_FILE \

contrib/build-wine/build.sh

@@ -6,13 +6,7 @@ echo wine build version is $DASH_ELECTRUM_VERSION
 ./contrib/make_locale
 
 export ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD)
-if [ "$WINEARCH" = "win32" ] ; then
-    export GCC_TRIPLET_HOST="i686-w64-mingw32"
-elif [ "$WINEARCH" = "win64" ] ; then
-    export GCC_TRIPLET_HOST="x86_64-w64-mingw32"
-else
-    fail "unexpected WINEARCH: $WINEARCH"
-fi
+export GCC_TRIPLET_HOST="x86_64-w64-mingw32"
 export host_strip="${GCC_TRIPLET_HOST}-strip"
 
 ./contrib/build-wine/build_secp256k1.sh
@@ -42,11 +36,7 @@ wine pyinstaller --clean -y \
     --name electrum-dash-$DASH_ELECTRUM_VERSION.exe \
     deterministic.spec
 
-if [[ $WINEARCH == win32 ]]; then
-    NSIS_EXE="$WINEPREFIX/drive_c/Program Files/NSIS/makensis.exe"
-else
-    NSIS_EXE="$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe"
-fi
+NSIS_EXE="$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe"
 
 wine "$NSIS_EXE" /NOCD -V3 \
     /DPRODUCT_VERSION=$DASH_ELECTRUM_VERSION \

contrib/build-wine/deterministic.spec

@@ -70,7 +70,7 @@ datas += collect_data_files('keepkeylib')
 
 binaries = []
 # Add libusb so Trezor and Safe-T mini will work
-binaries += [('C:/Python38/libusb-1.0.dll', '.')]
+binaries += [('C:/Python310/libusb-1.0.dll', '.')]
 binaries += [('C:/x11_hash/libx11hash-0.dll', '.')]
 binaries += [('C:/libsecp256k1/libsecp256k1-0.dll', '.')]
 binaries += [('C:/zbarw/libzbar-0.dll', '.')]

contrib/dash/actions/script-wine.sh

@@ -6,64 +6,29 @@ source contrib/build-wine/docker_env.sh
 mkdir -p dist
 
 BUILD_DIR=/root/build
-TOR_PROXY_VERSION=0.4.5.7
-TOR_PROXY_PATH=https://github.com/Bertrand256/tor-proxy/releases/download
+TOR_PROXY_VERSION=0.4.5.8
+TOR_PROXY_PATH=https://github.com/pshenmic/tor-proxy/releases/download
 TOR_DIST=dist/tor-proxy-setup.exe
 
-TOR_FILE=${TOR_PROXY_VERSION}/tor-proxy-${TOR_PROXY_VERSION}-win32-setup.exe
-wget -O ${TOR_DIST} ${TOR_PROXY_PATH}/${TOR_FILE}
-TOR_SHA=233ee2c8f4cbab6ffff74479156d91929564e7af8f9ff614e793f59fb51ac0f3
-echo "$TOR_SHA  $TOR_DIST" > sha256.txt
-shasum -a256 -s -c sha256.txt
-
-
-export WINEARCH=win32
-export WINEPREFIX=/root/.wine-32
-export PYHOME=$WINEPREFIX/drive_c/Python38
-
-
-ZBARW_PATH=https://github.com/Bertrand256/zbarw/releases/download/20180620
-ZBARW_FILE=zbarw-zbarcam-0.10-win32.zip
-ZBARW_SHA=eed1af99d68a1f9eab975843071bf088735cb79bf3188d511d06a3f1b4e10243
-wget ${ZBARW_PATH}/${ZBARW_FILE}
-echo "$ZBARW_SHA  $ZBARW_FILE" > sha256.txt
-shasum -a256 -s -c sha256.txt
-unzip ${ZBARW_FILE} && rm ${ZBARW_FILE} sha256.txt
-
-
-docker run --rm \
-    -e WINEARCH=$WINEARCH \
-    -e WINEPREFIX=$WINEPREFIX \
-    -e PYHOME=$PYHOME \
-    -e BUILD_DIR=$BUILD_DIR \
-    -v $(pwd):$BUILD_DIR \
-    -v $(pwd):$WINEPREFIX/drive_c/electrum-dash \
-    -w $BUILD_DIR \
-    -t $DOCKER_IMG_BUILD_WINE \
-    $BUILD_DIR/contrib/build-wine/build.sh
-
-
 export WINEARCH=win64
 export WINEPREFIX=/root/.wine-64
-export PYHOME=$WINEPREFIX/drive_c/Python38
-
+export PYHOME=$WINEPREFIX/drive_c/Python310
 
+ZBARW_PATH=https://github.com/Bertrand256/zbarw/releases/download/20180620
 ZBARW_FILE=zbarw-zbarcam-0.10-win64.zip
 ZBARW_SHA=7705dfd9a1c4b9d07c9ae11502dbe2dc305d08c884f0825b35d21b312316e162
 wget ${ZBARW_PATH}/${ZBARW_FILE}
 echo "$ZBARW_SHA  $ZBARW_FILE" > sha256.txt
 shasum -a256 -s -c sha256.txt
 unzip ${ZBARW_FILE} && rm ${ZBARW_FILE} sha256.txt
 
-rm ${TOR_DIST}
 TOR_FILE=${TOR_PROXY_VERSION}/tor-proxy-${TOR_PROXY_VERSION}-win64-setup.exe
 wget -O ${TOR_DIST} ${TOR_PROXY_PATH}/${TOR_FILE}
-TOR_SHA=514387e3b45eccd9b98e95450ea201ced49886cc4f0980d4f0f6f7a4a51aebe9
+TOR_SHA=62ee4604a788ceffb169c368efc9ccf751dce6ae5c2093858a42e814a1bd3c62
 echo "$TOR_SHA  $TOR_DIST" > sha256.txt
 shasum -a256 -s -c sha256.txt
 rm sha256.txt
 
-
 docker run --rm \
     -e WINEARCH=$WINEARCH \
     -e WINEPREFIX=$WINEPREFIX \

contrib/dash/exsrvmonit/exsrvmonit.py

@@ -26,7 +26,10 @@
 MIN_PROTO_VERSION = '1.4'
 NUM_RECENT_DATA = 1440
 SERVERS_LIST = [
-    'dash-electrum.pshenmic.dev:50002'
+    'dash-electrum.pshenmic.dev:50002',
+    'electrum1.cipig.net:20061'
+    'electrum2.cipig.net:50002'
+    'electrum3.cipig.net:50002'
 ]
 
 

contrib/deterministic-build/requirements-binaries-mac.txt

@@ -95,3 +95,6 @@ setuptools==49.6.0 \
 wheel==0.36.2 \
     --hash=sha256:78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e \
     --hash=sha256:e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e
+dash-hash==1.5.1 \
+    --hash=sha256:062d15505ffc9cdcc6f6883bcc0dc68f8fc869326239df61038592451c474af4 \
+    --hash=sha256:a209697d9faa10ad4ac804d129fdb44ebbb63ff34712de94399d59b537017d47

contrib/deterministic-build/requirements-binaries.txt

@@ -1,41 +1,56 @@
-cffi==1.14.5 \
-    --hash=sha256:005a36f41773e148deac64b08f233873a4d0c18b053d37da83f6af4d9087b813 \
-    --hash=sha256:0857f0ae312d855239a55c81ef453ee8fd24136eaba8e87a2eceba644c0d4c06 \
-    --hash=sha256:1071534bbbf8cbb31b498d5d9db0f274f2f7a865adca4ae429e147ba40f73dea \
-    --hash=sha256:158d0d15119b4b7ff6b926536763dc0714313aa59e320ddf787502c70c4d4bee \
-    --hash=sha256:1f436816fc868b098b0d63b8920de7d208c90a67212546d02f84fe78a9c26396 \
-    --hash=sha256:2894f2df484ff56d717bead0a5c2abb6b9d2bf26d6960c4604d5c48bbc30ee73 \
-    --hash=sha256:29314480e958fd8aab22e4a58b355b629c59bf5f2ac2492b61e3dc06d8c7a315 \
-    --hash=sha256:34eff4b97f3d982fb93e2831e6750127d1355a923ebaeeb565407b3d2f8d41a1 \
-    --hash=sha256:35f27e6eb43380fa080dccf676dece30bef72e4a67617ffda586641cd4508d49 \
-    --hash=sha256:3d3dd4c9e559eb172ecf00a2a7517e97d1e96de2a5e610bd9b68cea3925b4892 \
-    --hash=sha256:43e0b9d9e2c9e5d152946b9c5fe062c151614b262fda2e7b201204de0b99e482 \
-    --hash=sha256:48e1c69bbacfc3d932221851b39d49e81567a4d4aac3b21258d9c24578280058 \
-    --hash=sha256:51182f8927c5af975fece87b1b369f722c570fe169f9880764b1ee3bca8347b5 \
-    --hash=sha256:58e3f59d583d413809d60779492342801d6e82fefb89c86a38e040c16883be53 \
-    --hash=sha256:5de7970188bb46b7bf9858eb6890aad302577a5f6f75091fd7cdd3ef13ef3045 \
-    --hash=sha256:65fa59693c62cf06e45ddbb822165394a288edce9e276647f0046e1ec26920f3 \
-    --hash=sha256:69e395c24fc60aad6bb4fa7e583698ea6cc684648e1ffb7fe85e3c1ca131a7d5 \
-    --hash=sha256:6c97d7350133666fbb5cf4abdc1178c812cb205dc6f41d174a7b0f18fb93337e \
-    --hash=sha256:6e4714cc64f474e4d6e37cfff31a814b509a35cb17de4fb1999907575684479c \
-    --hash=sha256:72d8d3ef52c208ee1c7b2e341f7d71c6fd3157138abf1a95166e6165dd5d4369 \
-    --hash=sha256:8ae6299f6c68de06f136f1f9e69458eae58f1dacf10af5c17353eae03aa0d827 \
-    --hash=sha256:8b198cec6c72df5289c05b05b8b0969819783f9418e0409865dac47288d2a053 \
-    --hash=sha256:99cd03ae7988a93dd00bcd9d0b75e1f6c426063d6f03d2f90b89e29b25b82dfa \
-    --hash=sha256:9cf8022fb8d07a97c178b02327b284521c7708d7c71a9c9c355c178ac4bbd3d4 \
-    --hash=sha256:9de2e279153a443c656f2defd67769e6d1e4163952b3c622dcea5b08a6405322 \
-    --hash=sha256:9e93e79c2551ff263400e1e4be085a1210e12073a31c2011dbbda14bda0c6132 \
-    --hash=sha256:9ff227395193126d82e60319a673a037d5de84633f11279e336f9c0f189ecc62 \
-    --hash=sha256:a465da611f6fa124963b91bf432d960a555563efe4ed1cc403ba5077b15370aa \
-    --hash=sha256:ad17025d226ee5beec591b52800c11680fca3df50b8b29fe51d882576e039ee0 \
-    --hash=sha256:afb29c1ba2e5a3736f1c301d9d0abe3ec8b86957d04ddfa9d7a6a42b9367e396 \
-    --hash=sha256:b85eb46a81787c50650f2392b9b4ef23e1f126313b9e0e9013b35c15e4288e2e \
-    --hash=sha256:bb89f306e5da99f4d922728ddcd6f7fcebb3241fc40edebcb7284d7514741991 \
-    --hash=sha256:cbde590d4faaa07c72bf979734738f328d239913ba3e043b1e98fe9a39f8b2b6 \
-    --hash=sha256:cd2868886d547469123fadc46eac7ea5253ea7fcb139f12e1dfc2bbd406427d1 \
-    --hash=sha256:d42b11d692e11b6634f7613ad8df5d6d5f8875f5d48939520d351007b3c13406 \
-    --hash=sha256:f2d45f97ab6bb54753eab54fffe75aaf3de4ff2341c9daee1987ee1837636f1d \
-    --hash=sha256:fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c
+cffi==1.16.0 \
+    --hash=sha256:0c9ef6ff37e974b73c25eecc13952c55bceed9112be2d9d938ded8e856138bcc \
+    --hash=sha256:131fd094d1065b19540c3d72594260f118b231090295d8c34e19a7bbcf2e860a \
+    --hash=sha256:1b8ebc27c014c59692bb2664c7d13ce7a6e9a629be20e54e7271fa696ff2b417 \
+    --hash=sha256:2c56b361916f390cd758a57f2e16233eb4f64bcbeee88a4881ea90fca14dc6ab \
+    --hash=sha256:2d92b25dbf6cae33f65005baf472d2c245c050b1ce709cc4588cdcdd5495b520 \
+    --hash=sha256:31d13b0f99e0836b7ff893d37af07366ebc90b678b6664c955b54561fc36ef36 \
+    --hash=sha256:32c68ef735dbe5857c810328cb2481e24722a59a2003018885514d4c09af9743 \
+    --hash=sha256:3686dffb02459559c74dd3d81748269ffb0eb027c39a6fc99502de37d501faa8 \
+    --hash=sha256:582215a0e9adbe0e379761260553ba11c58943e4bbe9c36430c4ca6ac74b15ed \
+    --hash=sha256:5b50bf3f55561dac5438f8e70bfcdfd74543fd60df5fa5f62d94e5867deca684 \
+    --hash=sha256:5bf44d66cdf9e893637896c7faa22298baebcd18d1ddb6d2626a6e39793a1d56 \
+    --hash=sha256:6602bc8dc6f3a9e02b6c22c4fc1e47aa50f8f8e6d3f78a5e16ac33ef5fefa324 \
+    --hash=sha256:673739cb539f8cdaa07d92d02efa93c9ccf87e345b9a0b556e3ecc666718468d \
+    --hash=sha256:68678abf380b42ce21a5f2abde8efee05c114c2fdb2e9eef2efdb0257fba1235 \
+    --hash=sha256:68e7c44931cc171c54ccb702482e9fc723192e88d25a0e133edd7aff8fcd1f6e \
+    --hash=sha256:6b3d6606d369fc1da4fd8c357d026317fbb9c9b75d36dc16e90e84c26854b088 \
+    --hash=sha256:748dcd1e3d3d7cd5443ef03ce8685043294ad6bd7c02a38d1bd367cfd968e000 \
+    --hash=sha256:7651c50c8c5ef7bdb41108b7b8c5a83013bfaa8a935590c5d74627c047a583c7 \
+    --hash=sha256:7b78010e7b97fef4bee1e896df8a4bbb6712b7f05b7ef630f9d1da00f6444d2e \
+    --hash=sha256:7e61e3e4fa664a8588aa25c883eab612a188c725755afff6289454d6362b9673 \
+    --hash=sha256:80876338e19c951fdfed6198e70bc88f1c9758b94578d5a7c4c91a87af3cf31c \
+    --hash=sha256:8895613bcc094d4a1b2dbe179d88d7fb4a15cee43c052e8885783fac397d91fe \
+    --hash=sha256:88e2b3c14bdb32e440be531ade29d3c50a1a59cd4e51b1dd8b0865c54ea5d2e2 \
+    --hash=sha256:8f8e709127c6c77446a8c0a8c8bf3c8ee706a06cd44b1e827c3e6a2ee6b8c098 \
+    --hash=sha256:9cb4a35b3642fc5c005a6755a5d17c6c8b6bcb6981baf81cea8bfbc8903e8ba8 \
+    --hash=sha256:9f90389693731ff1f659e55c7d1640e2ec43ff725cc61b04b2f9c6d8d017df6a \
+    --hash=sha256:a09582f178759ee8128d9270cd1344154fd473bb77d94ce0aeb2a93ebf0feaf0 \
+    --hash=sha256:a6a14b17d7e17fa0d207ac08642c8820f84f25ce17a442fd15e27ea18d67c59b \
+    --hash=sha256:a72e8961a86d19bdb45851d8f1f08b041ea37d2bd8d4fd19903bc3083d80c896 \
+    --hash=sha256:abd808f9c129ba2beda4cfc53bde801e5bcf9d6e0f22f095e45327c038bfe68e \
+    --hash=sha256:ac0f5edd2360eea2f1daa9e26a41db02dd4b0451b48f7c318e217ee092a213e9 \
+    --hash=sha256:b29ebffcf550f9da55bec9e02ad430c992a87e5f512cd63388abb76f1036d8d2 \
+    --hash=sha256:b2ca4e77f9f47c55c194982e10f058db063937845bb2b7a86c84a6cfe0aefa8b \
+    --hash=sha256:b7be2d771cdba2942e13215c4e340bfd76398e9227ad10402a8767ab1865d2e6 \
+    --hash=sha256:b84834d0cf97e7d27dd5b7f3aca7b6e9263c56308ab9dc8aae9784abb774d404 \
+    --hash=sha256:b86851a328eedc692acf81fb05444bdf1891747c25af7529e39ddafaf68a4f3f \
+    --hash=sha256:bcb3ef43e58665bbda2fb198698fcae6776483e0c4a631aa5647806c25e02cc0 \
+    --hash=sha256:c0f31130ebc2d37cdd8e44605fb5fa7ad59049298b3f745c74fa74c62fbfcfc4 \
+    --hash=sha256:c6a164aa47843fb1b01e941d385aab7215563bb8816d80ff3a363a9f8448a8dc \
+    --hash=sha256:d8a9d3ebe49f084ad71f9269834ceccbf398253c9fac910c4fd7053ff1386936 \
+    --hash=sha256:db8e577c19c0fda0beb7e0d4e09e0ba74b1e4c092e0e40bfa12fe05b6f6d75ba \
+    --hash=sha256:dc9b18bf40cc75f66f40a7379f6a9513244fe33c0e8aa72e2d56b0196a7ef872 \
+    --hash=sha256:e09f3ff613345df5e8c3667da1d918f9149bd623cd9070c983c013792a9a62eb \
+    --hash=sha256:e4108df7fe9b707191e55f33efbcb2d81928e10cea45527879a4749cbe472614 \
+    --hash=sha256:e6024675e67af929088fda399b2094574609396b1decb609c55fa58b028a32a1 \
+    --hash=sha256:e70f54f1796669ef691ca07d046cd81a29cb4deb1e5f942003f401c0c4a2695d \
+    --hash=sha256:e715596e683d2ce000574bae5d07bd522c781a822866c20495e52520564f0969 \
+    --hash=sha256:e760191dd42581e023a68b758769e2da259b5d52e3103c6060ddc02c9edb8d7b \
+    --hash=sha256:ed86a35631f7bfbb28e108dd96773b9d5a6ce4811cf6ea468bb6a359b256b1e4 \
+    --hash=sha256:ee07e47c12890ef248766a6e55bd38ebfb2bb8edd4142d56db91b21ea68b7627 \
+    --hash=sha256:fa3a0128b152627161ce47201262d3140edb5a5c3da88d73a1b790a959126956 \
+    --hash=sha256:fcc8eb6d5902bb1cf6dc4f187ee3ea80a1eba0a89aba40a5cb20a5087d961357
 cryptography==3.4.6 \
     --hash=sha256:066bc53f052dfeda2f2d7c195cf16fb3e5ff13e1b6b7415b468514b40b381a5b \
     --hash=sha256:0923ba600d00718d63a3976f23cab19aef10c1765038945628cd9be047ad0336 \

contrib/deterministic-build/requirements-build-appimage.txt

@@ -39,3 +39,6 @@ setuptools==49.6.0 \
 wheel==0.36.2 \
     --hash=sha256:78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e \
     --hash=sha256:e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e
+dash-hash==1.5.1 \
+    --hash=sha256:062d15505ffc9cdcc6f6883bcc0dc68f8fc869326239df61038592451c474af4 \
+    --hash=sha256:a209697d9faa10ad4ac804d129fdb44ebbb63ff34712de94399d59b537017d47

contrib/deterministic-build/requirements-build-sdist.txt

@@ -7,3 +7,6 @@ setuptools==49.6.0 \
 wheel==0.36.2 \
     --hash=sha256:78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e \
     --hash=sha256:e11eefd162658ea59a60a0f6c7d493a7190ea4b9a85e335b33489d9f17e0245e
+dash-hash==1.5.1 \
+    --hash=sha256:062d15505ffc9cdcc6f6883bcc0dc68f8fc869326239df61038592451c474af4 \
+    --hash=sha256:a209697d9faa10ad4ac804d129fdb44ebbb63ff34712de94399d59b537017d47