From 6d69f444c5a2cb2e48761f38882fceaabd36c778 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Sat, 6 Jan 2024 16:30:19 +0400 Subject: [PATCH 01/15] Lower Python min requirement to 3.10.11 --- electrum-dash | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/electrum-dash b/electrum-dash index 6784cfae0..c8cb92c11 100755 --- a/electrum-dash +++ b/electrum-dash @@ -27,7 +27,7 @@ import os import sys -MIN_PYTHON_VERSION = "3.10.13" # FIXME duplicated from setup.py +MIN_PYTHON_VERSION = "3.10.11" # FIXME duplicated from setup.py _min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split(".")))) diff --git a/setup.py b/setup.py index 6310de2fd..f102d56b6 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from setuptools import setup, find_packages from setuptools.command.install import install -MIN_PYTHON_VERSION = "3.10.0" +MIN_PYTHON_VERSION = "3.10.11" _min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split(".")))) print("Current Python Version:", (sys.version_info[:3])) From a54925369bd414d70da63d6cc967e85ae7191cd7 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Sat, 6 Jan 2024 16:33:29 +0400 Subject: [PATCH 02/15] Fix windows build (drop 32 bit support) --- .github/workflows/build_release.yml | 8 ---- contrib/build-wine/Dockerfile | 57 +++++++++-------------------- contrib/dash/actions/script-wine.sh | 31 +--------------- 3 files changed, 19 insertions(+), 77 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 736580e9a..65bf19a14 100644 --- a/.github/workflows/build_release.yml +++ b/.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/upload-release-asset@v1.0.4 - 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/upload-release-asset@v1.0.4 env: diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile index 2cfbb695f..77426a10c 100644 --- a/contrib/build-wine/Dockerfile +++ b/contrib/build-wine/Dockerfile @@ -1,4 +1,4 @@ -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 @@ -6,9 +6,6 @@ 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 \ diff --git a/contrib/dash/actions/script-wine.sh b/contrib/dash/actions/script-wine.sh index 40c8e3495..2aa9074cf 100755 --- a/contrib/dash/actions/script-wine.sh +++ b/contrib/dash/actions/script-wine.sh @@ -16,37 +16,9 @@ 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_FILE=zbarw-zbarcam-0.10-win64.zip ZBARW_SHA=7705dfd9a1c4b9d07c9ae11502dbe2dc305d08c884f0825b35d21b312316e162 @@ -63,7 +35,6 @@ 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 \ From e3e34cd6f1b33d5b00cbb3aeb87f773ee6e05c23 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Sat, 6 Jan 2024 17:08:57 +0400 Subject: [PATCH 03/15] Fix ZBARW_PATH is missing --- contrib/dash/actions/script-wine.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/dash/actions/script-wine.sh b/contrib/dash/actions/script-wine.sh index 2aa9074cf..72e3eccc5 100755 --- a/contrib/dash/actions/script-wine.sh +++ b/contrib/dash/actions/script-wine.sh @@ -20,6 +20,7 @@ export WINEARCH=win64 export WINEPREFIX=/root/.wine-64 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} From 997c4a80b3c7c18b1b56171aae07740322e28c4d Mon Sep 17 00:00:00 2001 From: pshenmic Date: Sat, 6 Jan 2024 17:28:37 +0400 Subject: [PATCH 04/15] Upgrade setuptools before run --- contrib/build-wine/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh index 3aeeed696..ba5983710 100755 --- a/contrib/build-wine/build.sh +++ b/contrib/build-wine/build.sh @@ -29,6 +29,7 @@ cp contrib/build-wine/deterministic.spec . cp contrib/dash/pyi_runtimehook.py . cp contrib/dash/pyi_tctl_runtimehook.py . +wine python -m pip install --upgrade setuptools wine python -m pip install --no-dependencies --no-warn-script-location \ -r contrib/deterministic-build/requirements.txt wine python -m pip install --no-dependencies --no-warn-script-location \ From 83339cc083ea8ff7a07427377f201012536f91ff Mon Sep 17 00:00:00 2001 From: pshenmic Date: Sat, 6 Jan 2024 19:31:35 +0400 Subject: [PATCH 05/15] Try to install multidict as prebinary --- contrib/build-wine/build.sh | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh index ba5983710..50d200f09 100755 --- a/contrib/build-wine/build.sh +++ b/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 @@ -29,7 +23,9 @@ cp contrib/build-wine/deterministic.spec . cp contrib/dash/pyi_runtimehook.py . cp contrib/dash/pyi_tctl_runtimehook.py . -wine python -m pip install --upgrade setuptools +wget https://download.lfd.uci.edu/pythonlibs/archived/cp36/multidict-5.1.0-cp36-cp36m-win_amd64.whl +pip install ./multidict-5.1.0-cp36-cp36m-win_amd64.whl + wine python -m pip install --no-dependencies --no-warn-script-location \ -r contrib/deterministic-build/requirements.txt wine python -m pip install --no-dependencies --no-warn-script-location \ @@ -43,11 +39,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 \ From c10651c76ed1103473cc62ce035b522da3d88c0a Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 18:22:39 +0400 Subject: [PATCH 06/15] Upgrade multidict --- contrib/build-wine/build.sh | 3 - contrib/deterministic-build/requirements.txt | 113 ++++++++++++------- 2 files changed, 75 insertions(+), 41 deletions(-) diff --git a/contrib/build-wine/build.sh b/contrib/build-wine/build.sh index 50d200f09..cdd648b20 100755 --- a/contrib/build-wine/build.sh +++ b/contrib/build-wine/build.sh @@ -23,9 +23,6 @@ cp contrib/build-wine/deterministic.spec . cp contrib/dash/pyi_runtimehook.py . cp contrib/dash/pyi_tctl_runtimehook.py . -wget https://download.lfd.uci.edu/pythonlibs/archived/cp36/multidict-5.1.0-cp36-cp36m-win_amd64.whl -pip install ./multidict-5.1.0-cp36-cp36m-win_amd64.whl - wine python -m pip install --no-dependencies --no-warn-script-location \ -r contrib/deterministic-build/requirements.txt wine python -m pip install --no-dependencies --no-warn-script-location \ diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt index b95af20ae..e5cdb81bd 100644 --- a/contrib/deterministic-build/requirements.txt +++ b/contrib/deterministic-build/requirements.txt @@ -70,44 +70,81 @@ idna_ssl==1.1.0 \ importlib-metadata==3.7.2 \ --hash=sha256:18d5ff601069f98d5d605b6a4b50c18a34811d655c55548adc833e687289acde \ --hash=sha256:407d13f55dc6f2a844e62325d18ad7019a436c4bfcaee34cda35f2be6e7c3e34 -multidict==5.1.0 \ - --hash=sha256:018132dbd8688c7a69ad89c4a3f39ea2f9f33302ebe567a879da8f4ca73f0d0a \ - --hash=sha256:051012ccee979b2b06be928a6150d237aec75dd6bf2d1eeeb190baf2b05abc93 \ - --hash=sha256:05c20b68e512166fddba59a918773ba002fdd77800cad9f55b59790030bab632 \ - --hash=sha256:07b42215124aedecc6083f1ce6b7e5ec5b50047afa701f3442054373a6deb656 \ - --hash=sha256:0e3c84e6c67eba89c2dbcee08504ba8644ab4284863452450520dad8f1e89b79 \ - --hash=sha256:0e929169f9c090dae0646a011c8b058e5e5fb391466016b39d21745b48817fd7 \ - --hash=sha256:1ab820665e67373de5802acae069a6a05567ae234ddb129f31d290fc3d1aa56d \ - --hash=sha256:25b4e5f22d3a37ddf3effc0710ba692cfc792c2b9edfb9c05aefe823256e84d5 \ - --hash=sha256:2e68965192c4ea61fff1b81c14ff712fc7dc15d2bd120602e4a3494ea6584224 \ - --hash=sha256:2f1a132f1c88724674271d636e6b7351477c27722f2ed789f719f9e3545a3d26 \ - --hash=sha256:37e5438e1c78931df5d3c0c78ae049092877e5e9c02dd1ff5abb9cf27a5914ea \ - --hash=sha256:3a041b76d13706b7fff23b9fc83117c7b8fe8d5fe9e6be45eee72b9baa75f348 \ - --hash=sha256:3a4f32116f8f72ecf2a29dabfb27b23ab7cdc0ba807e8459e59a93a9be9506f6 \ - --hash=sha256:46c73e09ad374a6d876c599f2328161bcd95e280f84d2060cf57991dec5cfe76 \ - --hash=sha256:46dd362c2f045095c920162e9307de5ffd0a1bfbba0a6e990b344366f55a30c1 \ - --hash=sha256:4b186eb7d6ae7c06eb4392411189469e6a820da81447f46c0072a41c748ab73f \ - --hash=sha256:54fd1e83a184e19c598d5e70ba508196fd0bbdd676ce159feb412a4a6664f952 \ - --hash=sha256:585fd452dd7782130d112f7ddf3473ffdd521414674c33876187e101b588738a \ - --hash=sha256:5cf3443199b83ed9e955f511b5b241fd3ae004e3cb81c58ec10f4fe47c7dce37 \ - --hash=sha256:6a4d5ce640e37b0efcc8441caeea8f43a06addace2335bd11151bc02d2ee31f9 \ - --hash=sha256:7df80d07818b385f3129180369079bd6934cf70469f99daaebfac89dca288359 \ - --hash=sha256:806068d4f86cb06af37cd65821554f98240a19ce646d3cd24e1c33587f313eb8 \ - --hash=sha256:830f57206cc96ed0ccf68304141fec9481a096c4d2e2831f311bde1c404401da \ - --hash=sha256:929006d3c2d923788ba153ad0de8ed2e5ed39fdbe8e7be21e2f22ed06c6783d3 \ - --hash=sha256:9436dc58c123f07b230383083855593550c4d301d2532045a17ccf6eca505f6d \ - --hash=sha256:9dd6e9b1a913d096ac95d0399bd737e00f2af1e1594a787e00f7975778c8b2bf \ - --hash=sha256:ace010325c787c378afd7f7c1ac66b26313b3344628652eacd149bdd23c68841 \ - --hash=sha256:b47a43177a5e65b771b80db71e7be76c0ba23cc8aa73eeeb089ed5219cdbe27d \ - --hash=sha256:b797515be8743b771aa868f83563f789bbd4b236659ba52243b735d80b29ed93 \ - --hash=sha256:b7993704f1a4b204e71debe6095150d43b2ee6150fa4f44d6d966ec356a8d61f \ - --hash=sha256:d5c65bdf4484872c4af3150aeebe101ba560dcfb34488d9a8ff8dbcd21079647 \ - --hash=sha256:d81eddcb12d608cc08081fa88d046c78afb1bf8107e6feab5d43503fea74a635 \ - --hash=sha256:dc862056f76443a0db4509116c5cd480fe1b6a2d45512a653f9a855cc0517456 \ - --hash=sha256:ecc771ab628ea281517e24fd2c52e8f31c41e66652d07599ad8818abaad38cda \ - --hash=sha256:f200755768dc19c6f4e2b672421e0ebb3dd54c38d5a4f262b872d8cfcc9e93b5 \ - --hash=sha256:f21756997ad8ef815d8ef3d34edd98804ab5ea337feedcd62fb52d22bf531281 \ - --hash=sha256:fc13a9524bc18b6fb6e0dbec3533ba0496bbed167c56d0aabefd965584557d80 +multidict==6.0.4 \ + --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \ + --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \ + --hash=sha256:0dfad7a5a1e39c53ed00d2dd0c2e36aed4650936dc18fd9a1826a5ae1cad6f03 \ + --hash=sha256:11bdf3f5e1518b24530b8241529d2050014c884cf18b6fc69c0c2b30ca248710 \ + --hash=sha256:1502e24330eb681bdaa3eb70d6358e818e8e8f908a22a1851dfd4e15bc2f8161 \ + --hash=sha256:16ab77bbeb596e14212e7bab8429f24c1579234a3a462105cda4a66904998664 \ + --hash=sha256:16d232d4e5396c2efbbf4f6d4df89bfa905eb0d4dc5b3549d872ab898451f569 \ + --hash=sha256:21a12c4eb6ddc9952c415f24eef97e3e55ba3af61f67c7bc388dcdec1404a067 \ + --hash=sha256:27c523fbfbdfd19c6867af7346332b62b586eed663887392cff78d614f9ec313 \ + --hash=sha256:281af09f488903fde97923c7744bb001a9b23b039a909460d0f14edc7bf59706 \ + --hash=sha256:33029f5734336aa0d4c0384525da0387ef89148dc7191aae00ca5fb23d7aafc2 \ + --hash=sha256:3601a3cece3819534b11d4efc1eb76047488fddd0c85a3948099d5da4d504636 \ + --hash=sha256:3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49 \ + --hash=sha256:36c63aaa167f6c6b04ef2c85704e93af16c11d20de1d133e39de6a0e84582a93 \ + --hash=sha256:39ff62e7d0f26c248b15e364517a72932a611a9b75f35b45be078d81bdb86603 \ + --hash=sha256:43644e38f42e3af682690876cff722d301ac585c5b9e1eacc013b7a3f7b696a0 \ + --hash=sha256:4372381634485bec7e46718edc71528024fcdc6f835baefe517b34a33c731d60 \ + --hash=sha256:458f37be2d9e4c95e2d8866a851663cbc76e865b78395090786f6cd9b3bbf4f4 \ + --hash=sha256:45e1ecb0379bfaab5eef059f50115b54571acfbe422a14f668fc8c27ba410e7e \ + --hash=sha256:4b9d9e4e2b37daddb5c23ea33a3417901fa7c7b3dee2d855f63ee67a0b21e5b1 \ + --hash=sha256:4ceef517eca3e03c1cceb22030a3e39cb399ac86bff4e426d4fc6ae49052cc60 \ + --hash=sha256:4d1a3d7ef5e96b1c9e92f973e43aa5e5b96c659c9bc3124acbbd81b0b9c8a951 \ + --hash=sha256:4dcbb0906e38440fa3e325df2359ac6cb043df8e58c965bb45f4e406ecb162cc \ + --hash=sha256:509eac6cf09c794aa27bcacfd4d62c885cce62bef7b2c3e8b2e49d365b5003fe \ + --hash=sha256:52509b5be062d9eafc8170e53026fbc54cf3b32759a23d07fd935fb04fc22d95 \ + --hash=sha256:52f2dffc8acaba9a2f27174c41c9e57f60b907bb9f096b36b1a1f3be71c6284d \ + --hash=sha256:574b7eae1ab267e5f8285f0fe881f17efe4b98c39a40858247720935b893bba8 \ + --hash=sha256:5979b5632c3e3534e42ca6ff856bb24b2e3071b37861c2c727ce220d80eee9ed \ + --hash=sha256:59d43b61c59d82f2effb39a93c48b845efe23a3852d201ed2d24ba830d0b4cf2 \ + --hash=sha256:5a4dcf02b908c3b8b17a45fb0f15b695bf117a67b76b7ad18b73cf8e92608775 \ + --hash=sha256:5cad9430ab3e2e4fa4a2ef4450f548768400a2ac635841bc2a56a2052cdbeb87 \ + --hash=sha256:5fc1b16f586f049820c5c5b17bb4ee7583092fa0d1c4e28b5239181ff9532e0c \ + --hash=sha256:62501642008a8b9871ddfccbf83e4222cf8ac0d5aeedf73da36153ef2ec222d2 \ + --hash=sha256:64bdf1086b6043bf519869678f5f2757f473dee970d7abf6da91ec00acb9cb98 \ + --hash=sha256:64da238a09d6039e3bd39bb3aee9c21a5e34f28bfa5aa22518581f910ff94af3 \ + --hash=sha256:666daae833559deb2d609afa4490b85830ab0dfca811a98b70a205621a6109fe \ + --hash=sha256:67040058f37a2a51ed8ea8f6b0e6ee5bd78ca67f169ce6122f3e2ec80dfe9b78 \ + --hash=sha256:6748717bb10339c4760c1e63da040f5f29f5ed6e59d76daee30305894069a660 \ + --hash=sha256:6b181d8c23da913d4ff585afd1155a0e1194c0b50c54fcfe286f70cdaf2b7176 \ + --hash=sha256:6ed5f161328b7df384d71b07317f4d8656434e34591f20552c7bcef27b0ab88e \ + --hash=sha256:7582a1d1030e15422262de9f58711774e02fa80df0d1578995c76214f6954988 \ + --hash=sha256:7d18748f2d30f94f498e852c67d61261c643b349b9d2a581131725595c45ec6c \ + --hash=sha256:7d6ae9d593ef8641544d6263c7fa6408cc90370c8cb2bbb65f8d43e5b0351d9c \ + --hash=sha256:81a4f0b34bd92df3da93315c6a59034df95866014ac08535fc819f043bfd51f0 \ + --hash=sha256:8316a77808c501004802f9beebde51c9f857054a0c871bd6da8280e718444449 \ + --hash=sha256:853888594621e6604c978ce2a0444a1e6e70c8d253ab65ba11657659dcc9100f \ + --hash=sha256:99b76c052e9f1bc0721f7541e5e8c05db3941eb9ebe7b8553c625ef88d6eefde \ + --hash=sha256:a2e4369eb3d47d2034032a26c7a80fcb21a2cb22e1173d761a162f11e562caa5 \ + --hash=sha256:ab55edc2e84460694295f401215f4a58597f8f7c9466faec545093045476327d \ + --hash=sha256:af048912e045a2dc732847d33821a9d84ba553f5c5f028adbd364dd4765092ac \ + --hash=sha256:b1a2eeedcead3a41694130495593a559a668f382eee0727352b9a41e1c45759a \ + --hash=sha256:b1e8b901e607795ec06c9e42530788c45ac21ef3aaa11dbd0c69de543bfb79a9 \ + --hash=sha256:b41156839806aecb3641f3208c0dafd3ac7775b9c4c422d82ee2a45c34ba81ca \ + --hash=sha256:b692f419760c0e65d060959df05f2a531945af31fda0c8a3b3195d4efd06de11 \ + --hash=sha256:bc779e9e6f7fda81b3f9aa58e3a6091d49ad528b11ed19f6621408806204ad35 \ + --hash=sha256:bf6774e60d67a9efe02b3616fee22441d86fab4c6d335f9d2051d19d90a40063 \ + --hash=sha256:c048099e4c9e9d615545e2001d3d8a4380bd403e1a0578734e0d31703d1b0c0b \ + --hash=sha256:c5cb09abb18c1ea940fb99360ea0396f34d46566f157122c92dfa069d3e0e982 \ + --hash=sha256:cc8e1d0c705233c5dd0c5e6460fbad7827d5d36f310a0fadfd45cc3029762258 \ + --hash=sha256:d5e3fc56f88cc98ef8139255cf8cd63eb2c586531e43310ff859d6bb3a6b51f1 \ + --hash=sha256:d6aa0418fcc838522256761b3415822626f866758ee0bc6632c9486b179d0b52 \ + --hash=sha256:d6c254ba6e45d8e72739281ebc46ea5eb5f101234f3ce171f0e9f5cc86991480 \ + --hash=sha256:d6d635d5209b82a3492508cf5b365f3446afb65ae7ebd755e70e18f287b0adf7 \ + --hash=sha256:dcfe792765fab89c365123c81046ad4103fcabbc4f56d1c1997e6715e8015461 \ + --hash=sha256:ddd3915998d93fbcd2566ddf9cf62cdb35c9e093075f862935573d265cf8f65d \ + --hash=sha256:ddff9c4e225a63a5afab9dd15590432c22e8057e1a9a13d28ed128ecf047bbdc \ + --hash=sha256:e41b7e2b59679edfa309e8db64fdf22399eec4b0b24694e1b2104fb789207779 \ + --hash=sha256:e69924bfcdda39b722ef4d9aa762b2dd38e4632b3641b1d9a57ca9cd18f2f83a \ + --hash=sha256:ea20853c6dbbb53ed34cb4d080382169b6f4554d394015f1bef35e881bf83547 \ + --hash=sha256:ee2a1ece51b9b9e7752e742cfb661d2a29e7bcdba2d27e66e28a99f1890e4fa0 \ + --hash=sha256:eeb6dcc05e911516ae3d1f207d4b0520d07f54484c49dfc294d6e7d63b734171 \ + --hash=sha256:f70b98cd94886b49d91170ef23ec5c0e8ebb6f242d734ed7ed677b24d50c82cf \ + --hash=sha256:fc35cb4676846ef752816d5be2193a1e8367b4c1397b74a565a9d0389c433a1d \ + --hash=sha256:ff959bee35038c4624250473988b24f846cbeb2c6639de3602c073f10410ceba pip==21.0.1 \ --hash=sha256:37fd50e056e2aed635dec96594606f0286640489b0db0ce7607f7e51890372d5 \ --hash=sha256:99bbde183ec5ec037318e774b0d8ae0a64352fe53b2c7fd630be1d07e94f41e5 From 03ba654f4b0f73f9a70cdbc2558fa08138b8a98f Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 18:40:33 +0400 Subject: [PATCH 07/15] Upgrade cffi package --- .../requirements-binaries.txt | 91 +++++++++++-------- .../deterministic-build/requirements-hw.txt | 91 +++++++++++-------- 2 files changed, 106 insertions(+), 76 deletions(-) diff --git a/contrib/deterministic-build/requirements-binaries.txt b/contrib/deterministic-build/requirements-binaries.txt index 29d78c415..f5ba41b6f 100644 --- a/contrib/deterministic-build/requirements-binaries.txt +++ b/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 \ diff --git a/contrib/deterministic-build/requirements-hw.txt b/contrib/deterministic-build/requirements-hw.txt index 7170cb5ad..f385d84c1 100644 --- a/contrib/deterministic-build/requirements-hw.txt +++ b/contrib/deterministic-build/requirements-hw.txt @@ -6,44 +6,59 @@ btchip-python==0.1.32 \ certifi==2020.12.5 \ --hash=sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c \ --hash=sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830 -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 chardet==4.0.0 \ --hash=sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa \ --hash=sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5 From 9023c8a1425a606a3459d610234edde0752cf03c Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 18:54:04 +0400 Subject: [PATCH 08/15] Update libusb path in deterministic.spec --- contrib/build-wine/deterministic.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 926a32bef..bdc264510 100644 --- a/contrib/build-wine/deterministic.spec +++ b/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', '.')] From ada79c2de69af527ab7db2a8ec7cf2a0a2abca99 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 19:57:00 +0400 Subject: [PATCH 09/15] Add dash_hash in the requirements --- contrib/deterministic-build/requirements.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt index e5cdb81bd..3ce6bdd23 100644 --- a/contrib/deterministic-build/requirements.txt +++ b/contrib/deterministic-build/requirements.txt @@ -323,3 +323,6 @@ python-bls==0.1.10 \ Pygments==2.11.2 \ --hash=sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a \ --hash=sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65 +dash-hash==1.5.0 \ + --hash=sha256:1f0a9e6c2ed8487ab4a12218f074e9b27ba8bb077b039a352e25dda78a90aa30 \ + --hash=sha256:f7907f55c4b8b71d7783c081fad0e8f62fd098821b67d2f57581d268344bc0e7 From 9a8fd836cf3835b82036e9fbcad8bf31f954e1ad Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 21:57:10 +0400 Subject: [PATCH 10/15] Bump dash_hash to 1.5.1 --- contrib/deterministic-build/requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt index 3ce6bdd23..5f240cbd1 100644 --- a/contrib/deterministic-build/requirements.txt +++ b/contrib/deterministic-build/requirements.txt @@ -323,6 +323,6 @@ python-bls==0.1.10 \ Pygments==2.11.2 \ --hash=sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a \ --hash=sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65 -dash-hash==1.5.0 \ - --hash=sha256:1f0a9e6c2ed8487ab4a12218f074e9b27ba8bb077b039a352e25dda78a90aa30 \ - --hash=sha256:f7907f55c4b8b71d7783c081fad0e8f62fd098821b67d2f57581d268344bc0e7 +dash-hash==1.5.1 \ + --hash=sha256:062d15505ffc9cdcc6f6883bcc0dc68f8fc869326239df61038592451c474af4 \ + --hash=sha256:a209697d9faa10ad4ac804d129fdb44ebbb63ff34712de94399d59b537017d47 From 3788e285b4f4e2335935d81a3941078afa6f62e9 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 22:11:13 +0400 Subject: [PATCH 11/15] Bump dash_hash to 1.5.1 --- contrib/requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/requirements/requirements.txt b/contrib/requirements/requirements.txt index 762328e35..b39f8a9d0 100644 --- a/contrib/requirements/requirements.txt +++ b/contrib/requirements/requirements.txt @@ -6,7 +6,7 @@ aiohttp_socks>=0.3 certifi bitstring attrs>=19.2.0 -dash_hash==1.5.0 +dash_hash==1.5.1 python-bls>=0.1.10 Pygments>=2.1 From dbe43aec4f16a0adacf60d130f23370904f77b8c Mon Sep 17 00:00:00 2001 From: pshenmic Date: Tue, 16 Jan 2024 23:53:20 +0400 Subject: [PATCH 12/15] Move dash_hash from win to linux & mac --- contrib/deterministic-build/requirements-binaries-mac.txt | 3 +++ contrib/deterministic-build/requirements-build-appimage.txt | 3 +++ contrib/deterministic-build/requirements-build-sdist.txt | 3 +++ contrib/deterministic-build/requirements.txt | 3 --- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/deterministic-build/requirements-binaries-mac.txt b/contrib/deterministic-build/requirements-binaries-mac.txt index 29d78c415..3fddabafe 100644 --- a/contrib/deterministic-build/requirements-binaries-mac.txt +++ b/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 diff --git a/contrib/deterministic-build/requirements-build-appimage.txt b/contrib/deterministic-build/requirements-build-appimage.txt index 023ee4511..617ac6f11 100644 --- a/contrib/deterministic-build/requirements-build-appimage.txt +++ b/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 diff --git a/contrib/deterministic-build/requirements-build-sdist.txt b/contrib/deterministic-build/requirements-build-sdist.txt index 48b2dd538..5bc133b5f 100644 --- a/contrib/deterministic-build/requirements-build-sdist.txt +++ b/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 diff --git a/contrib/deterministic-build/requirements.txt b/contrib/deterministic-build/requirements.txt index 5f240cbd1..e5cdb81bd 100644 --- a/contrib/deterministic-build/requirements.txt +++ b/contrib/deterministic-build/requirements.txt @@ -323,6 +323,3 @@ python-bls==0.1.10 \ Pygments==2.11.2 \ --hash=sha256:4e426f72023d88d03b2fa258de560726ce890ff3b630f88c21cbb8b2503b8c6a \ --hash=sha256:44238f1b60a76d78fc8ca0528ee429702aae011c265fe6a8dd8b63049ae41c65 -dash-hash==1.5.1 \ - --hash=sha256:062d15505ffc9cdcc6f6883bcc0dc68f8fc869326239df61038592451c474af4 \ - --hash=sha256:a209697d9faa10ad4ac804d129fdb44ebbb63ff34712de94399d59b537017d47 From 55605faf93dac412cd09f0cec1fb5cb03357fb68 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Wed, 17 Jan 2024 01:15:53 +0400 Subject: [PATCH 13/15] Add more production servers --- contrib/dash/exsrvmonit/exsrvmonit.py | 5 ++++- electrum_dash/servers.json | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/contrib/dash/exsrvmonit/exsrvmonit.py b/contrib/dash/exsrvmonit/exsrvmonit.py index 67cec61f0..2fd1dc411 100755 --- a/contrib/dash/exsrvmonit/exsrvmonit.py +++ b/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' ] diff --git a/electrum_dash/servers.json b/electrum_dash/servers.json index b2ce13733..9e7fd06d2 100644 --- a/electrum_dash/servers.json +++ b/electrum_dash/servers.json @@ -4,6 +4,21 @@ "s": "50002", "version": "1.4" }, + "electrum1.cipig.net": { + "pruning": "-", + "s": "20061", + "version": "1.4" + }, + "electrum2.cipig.net": { + "pruning": "-", + "s": "20061", + "version": "1.4" + }, + "electrum3.cipig.net": { + "pruning": "-", + "s": "20061", + "version": "1.4" + }, "rnxogu42f3pq3e3oo7shqmh7mtema6c5fhhhsi54din4olzlu7vsx2id.onion": { "pruning": "-", "s": "50002", From 202724a6330b0b014ca82885d920c62eb6a48db3 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Wed, 17 Jan 2024 02:09:43 +0400 Subject: [PATCH 14/15] Upgrade tor proxy to latest version --- contrib/dash/actions/script-wine.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/contrib/dash/actions/script-wine.sh b/contrib/dash/actions/script-wine.sh index 72e3eccc5..92ca82c6e 100755 --- a/contrib/dash/actions/script-wine.sh +++ b/contrib/dash/actions/script-wine.sh @@ -6,16 +6,10 @@ 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=win64 export WINEPREFIX=/root/.wine-64 export PYHOME=$WINEPREFIX/drive_c/Python310 @@ -31,7 +25,7 @@ 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 From 8591585f3629c56249ed0edabbe273b5ae46e607 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Wed, 17 Jan 2024 02:20:16 +0400 Subject: [PATCH 15/15] Fix rm tor dist --- contrib/dash/actions/script-wine.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/dash/actions/script-wine.sh b/contrib/dash/actions/script-wine.sh index 92ca82c6e..0b4932877 100755 --- a/contrib/dash/actions/script-wine.sh +++ b/contrib/dash/actions/script-wine.sh @@ -22,7 +22,6 @@ 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=62ee4604a788ceffb169c368efc9ccf751dce6ae5c2093858a42e814a1bd3c62