Merge branch 'master' of https://github.com/spesmilo/electrum

� Conflicts:
�	contrib/android/Readme.md
�	electrum_vtc/gui/kivy/uix/dialogs/cpfp_dialog.py
�	electrum_vtc/gui/qt/__init__.py
�	electrum_vtc/tests/test_wallet_vertical.py
�	electrum_vtc/version.py
�	run_electrum

Author: vertiond

RELEASE-NOTES

@@ -1,3 +1,32 @@
+# Release 4.2.1 - (March 26, 2022)
+ * Binaries:
+   - Windows: we are dropping support for Windows 7. (#7728)
+     Version 4.2.0 already unintentionally broke compatibility with
+     Win7 and there is no easy way to restore and maintain support.
+     Existing users can keep using version 4.1.5 for now, but should
+     consider upgrading or changing their OS.
+     Win8.1 still works but only Win10 is regularly tested.
+   - bump bundled Python version (win, mac, appimage) to 3.9.11,
+     (android) to 3.8.13 (1bb7ef92, #7721)
+     (note these include a fix to an openssl DOS-vector CVE-2022-0778)
+   - windows: bump pyinstaller to 4.10 and wine to 7.0 (#7721)
+ * Kivy GUI:
+   - fix "Child Pays For Parent" not working on Android (#7723)
+   - revert to defaulting the UI language to English (25fee6a6)
+ * Qt GUI:
+   - macOS: fix opening "Preferences" segfaulting for some (#7725)
+   - more resilient startup: better error-handling and fallback (#7447)
+ * Library:
+   - fix LN error/warning message-handling, and fix regression that
+     errors during channel-open were not properly shown in GUI (a92dede4)
+   - during LN chan open, do not backup wallet automatically (#7733)
+   - Imported wallets: fix delete_address rm-ing too many txs (#7587)
+   - fix potential deadlock in wallet.py (d3476b6b)
+ * Hardware wallets:
+   - ledger: add progress indicator to sign_transaction (#7516)
+ * fix the "--portable" flag for AppImage, and for pip installs (#7732)
+
+
 # Release 4.2.0 - (March 16, 2022)
  * The minimum python version was increased to 3.8 (#7661)
  * Lightning:

contrib/add_cosigner

@@ -1,4 +1,19 @@
 #!/usr/bin/python3
+#
+# This script is part of the workflow for BUILDERs to reproduce and sign the
+# release binaries. (for builders who do not have sftp access to "electrum-downloads-airlock")
+#
+# - BUILDER builds all binaries and checks they match the official releases
+#   (using release.sh, and perhaps some manual steps)
+# - BUILDER creates a PR against https://github.com/spesmilo/electrum-signatures/
+#   to add their sigs for a given release, which then gets merged
+# - SFTPUSER runs `$ electrum/contrib/add_cosigner $BUILDER`
+# - SFTPUSER runs `$ SSHUSER=$SFTPUSER electrum/contrib/upload`
+# - SFTPUSER runs `$ electrum/contrib/make_download $WWW_DIR`
+# -     $ (cd $WWW_DIR; git commit -a -m "add_cosigner"; git push)
+# - SFTPUSER runs `$ electrum-web/publish.sh $SFTPUSER`
+# - (for the website to be updated, both ThomasV and SomberNight needs to run publish.sh)
+
 import re
 import os
 import sys

contrib/android/Dockerfile

@@ -145,8 +145,11 @@ RUN chown ${USER} /opt
 USER ${USER}
 
 
+COPY contrib/deterministic-build/requirements-build-base.txt /opt/deterministic-build/
 COPY contrib/deterministic-build/requirements-build-android.txt /opt/deterministic-build/
-RUN python3 -m pip install --no-dependencies --user \
+RUN python3 -m pip install --no-build-isolation --no-dependencies --user \
+    -r /opt/deterministic-build/requirements-build-base.txt
+RUN python3 -m pip install --no-build-isolation --no-dependencies --user \
     -r /opt/deterministic-build/requirements-build-android.txt
 
 # install buildozer
@@ -157,7 +160,7 @@ RUN cd /opt \
     && git fetch --all \
     # commit: from branch sombernight/electrum_20210421
     && git checkout "d570116e88184b0eca0c6b59a25edd49d977da23^{commit}" \
-    && python3 -m pip install --no-dependencies --user -e .
+    && python3 -m pip install --no-build-isolation --no-dependencies --user -e .
 
 # install python-for-android
 RUN cd /opt \
@@ -168,7 +171,7 @@ RUN cd /opt \
     && git fetch --all \
     # commit: from branch accumulator/qt5-wip
     && git checkout "ebbe8dcc271e36468666feb98f936d0a96936cf2^{commit}" \
-    && python3 -m pip install --no-dependencies --user -e .
+    && python3 -m pip install --no-build-isolation --no-dependencies --user -e .
 
 # build env vars
 ENV USE_SDK_WRAPPER=1

contrib/android/Readme.md

@@ -5,7 +5,8 @@ To generate an APK file, follow these instructions.
 
 ## Android binary with Docker
 
-✓ _These binaries should be reproducible.
+✓ _These binaries should be reproducible, meaning you should be able to generate
+   binaries that match the official releases._
 
 This assumes an Ubuntu (x86_64) host, but it should not be too hard to adapt to another
 similar system.
@@ -16,13 +17,20 @@ similar system.
 
 2. Build binaries (Note that this only works for debug builds! Otherwise the security model of Android does not let you access the internal storage of an app without root)
 
+    The build script takes a few arguments. To see syntax, run it without providing any:
     ```
     $ ./build.sh debug
     ```
-   If you want reproducibility, try instead e.g.:
+    For development, consider e.g. `$ ./build.sh kivy arm64-v8a debug`
+
+    If you want reproducibility, try instead e.g.:
     ```
     $ ELECBUILD_COMMIT=HEAD ELECBUILD_NOCACHE=1 ./build.sh debug
     ```
+    
+    Note: `build.sh` takes an optional parameter which can be
+    `release`, `release-unsigned`, or `debug` (default).
+
 
 3. The generated binary is in `./dist`.
 
@@ -43,6 +51,7 @@ similar system.
    $ adb shell run-as org.electrum.electrum cp /data/local/tmp/verthash.dat /data/data/org.electrum.electrum/files/app
    ```
 
+
 ## FAQ
 
 ### I changed something but I don't see any differences on the phone. What did I do wrong?
@@ -89,6 +98,15 @@ Build atlas: `(cd contrib/android/; make theming)`
 
 Run electrum with the `-g` switch: `electrum -g kivy`
 
+### debug vs release build
+If you just follow the instructions above, you will build the apk
+in debug mode. The most notable difference is that the apk will be
+signed using a debug keystore. If you are planning to upload
+what you build to e.g. the Play Store, you should create your own
+keystore, back it up safely, and run `./contrib/make_apk release`.
+
+See e.g. [kivy wiki](https://github.com/kivy/kivy/wiki/Creating-a-Release-APK)
+and [android dev docs](https://developer.android.com/studio/build/building-cmdline#sign_cmdline).
 
 ### Access datadir on Android from desktop (e.g. to copy wallet file)
 Note that this only works for debug builds! Otherwise the security model
@@ -99,3 +117,22 @@ $ adb shell
 $ run-as org.electrum.electrum ls /data/data/org.electrum.electrum/files/data
 $ run-as org.electrum.electrum cp /data/data/org.electrum.electrum/files/data/wallets/my_wallet /sdcard/some_path/my_wallet
 ```
+
+### How to investigate diff between binaries if reproducibility fails?
+```
+cd dist/
+unzip Electrum-*.apk1 -d apk1
+mkdir apk1/assets/private_mp3/
+tar -xzvf apk1/assets/private.mp3 --directory apk1/assets/private_mp3/
+
+unzip Electrum-*.apk2 -d apk2
+mkdir apk2/assets/private_mp3/
+tar -xzvf apk2/assets/private.mp3 --directory apk2/assets/private_mp3/
+
+sudo chown --recursive "$(id -u -n)" apk1/ apk2/
+chmod -R +Xr  apk1/ apk2/
+$(cd apk1; find -type f -exec sha256sum '{}' \; > ./../sha256sum1)
+$(cd apk2; find -type f -exec sha256sum '{}' \; > ./../sha256sum2)
+diff sha256sum1 sha256sum2 > d
+cat d
+```

contrib/android/make_apk

@@ -55,7 +55,7 @@ elif [[ "$3" == "release-unsigned" ]] ; then
     # do release build, but do not sign the APKs.
     TARGET="release"
 elif [[ "$3" == "debug" ]] ; then
-    # do debug build; the default.
+    # do debug build.
     TARGET="apk"
     export P4A_DEBUG_KEYSTORE="$CONTRIB_ANDROID"/android_debug.keystore
     export P4A_DEBUG_KEYSTORE_PASSWD=unsafepassword

contrib/android/p4a_recipes/hostpython3/__init__.py

@@ -11,8 +11,8 @@
 
 
 class HostPython3RecipePinned(util.InheritedRecipeMixin, HostPython3Recipe):
-    version = "3.8.12"
-    sha512sum = "f7227c9d82c37a3f21d4e4ec352b75424d8103b5144e7accec13dca626c79268db76143782629131525a07bb026630e55fccd4381bd78990b3561cc565681190"
+    version = "3.8.13"
+    sha512sum = "e57f5f5b441e46a742b0147dd7fbfa6b52d550a86e60c9765ecc3c4690e2cdedf197e151c07cd2ea1f75ed9022a2b8ce4850c3d65916eaede1db6feed40b52f6"
 
 
 recipe = HostPython3RecipePinned()

contrib/android/p4a_recipes/python3/__init__.py

@@ -11,8 +11,8 @@
 
 
 class Python3RecipePinned(util.InheritedRecipeMixin, Python3Recipe):
-    version = "3.8.12"
-    sha512sum = "f7227c9d82c37a3f21d4e4ec352b75424d8103b5144e7accec13dca626c79268db76143782629131525a07bb026630e55fccd4381bd78990b3561cc565681190"
+    version = "3.8.13"
+    sha512sum = "e57f5f5b441e46a742b0147dd7fbfa6b52d550a86e60c9765ecc3c4690e2cdedf197e151c07cd2ea1f75ed9022a2b8ce4850c3d65916eaede1db6feed40b52f6"
 
 
 recipe = Python3RecipePinned()

contrib/build-linux/appimage/make_appimage.sh

@@ -14,7 +14,7 @@ PIP_CACHE_DIR="$CACHEDIR/pip_cache"
 export GCC_STRIP_BINARIES="1"
 
 # pinned versions
-PYTHON_VERSION=3.9.10
+PYTHON_VERSION=3.9.11
 PKG2APPIMAGE_COMMIT="eb8f3acdd9f11ab19b78f5cb15daa772367daf15"
 
 
@@ -38,7 +38,7 @@ download_if_not_exist "$CACHEDIR/appimagetool" "https://github.com/AppImage/AppI
 verify_hash "$CACHEDIR/appimagetool" "df3baf5ca5facbecfc2f3fa6713c29ab9cefa8fd8c1eac5d283b79cab33e4acb"
 
 download_if_not_exist "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.xz"
-verify_hash "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" "0a8fbfb5287ebc3a13e9baf3d54e08fa06778ffeccf6311aef821bb3a6586cc8"
+verify_hash "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" "66767a35309d724f370df9e503c172b4ee444f49d62b98bc4eca725123e26c49"
 
 
 
@@ -110,22 +110,24 @@ info "preparing electrum-locale."
 
 
 info "Installing build dependencies."
-"$python" -m pip install --no-dependencies --no-binary :all: --no-warn-script-location \
+"$python" -m pip install --no-build-isolation --no-dependencies --no-warn-script-location \
+    --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements-build-base.txt"
+"$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \
     --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements-build-appimage.txt"
 
 info "installing electrum and its dependencies."
 # note: we prefer compiling C extensions ourselves, instead of using binary wheels,
 #       hence "--no-binary :all:" flags. However, we specifically allow
 #       - PyQt5, as it's harder to build from source
 #       - cryptography, as building it would need openssl 1.1, not available on ubuntu 16.04
-"$python" -m pip install --no-dependencies --no-binary :all: --no-warn-script-location \
+"$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \
     --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements.txt"
-"$python" -m pip install --no-dependencies --no-binary :all: --only-binary PyQt5,PyQt5-Qt5,cryptography --no-warn-script-location \
+"$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --only-binary PyQt5,PyQt5-Qt5,cryptography --no-warn-script-location \
     --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
-"$python" -m pip install --no-dependencies --no-binary :all: --no-warn-script-location \
+"$python" -m pip install --no-build-isolation --no-dependencies --no-binary :all: --no-warn-script-location \
     --cache-dir "$PIP_CACHE_DIR" -r "$CONTRIB/deterministic-build/requirements-hw.txt"
 
-"$python" -m pip install --no-dependencies --no-warn-script-location \
+"$python" -m pip install --no-build-isolation --no-dependencies --no-warn-script-location \
     --cache-dir "$PIP_CACHE_DIR" "$PROJECT_ROOT"
 
 # was only needed during build time, not runtime
@@ -199,7 +201,7 @@ PYDIR="$APPDIR"/usr/lib/python3.9
 rm -rf "$PYDIR"/{test,ensurepip,lib2to3,idlelib,turtledemo}
 rm -rf "$PYDIR"/{ctypes,sqlite3,tkinter,unittest}/test
 rm -rf "$PYDIR"/distutils/{command,tests}
-rm -rf "$PYDIR"/config-3.9m-x86_64-linux-gnu
+rm -rf "$PYDIR"/config-3.*-x86_64-linux-gnu
 rm -rf "$PYDIR"/site-packages/{opt,pip,setuptools,wheel}
 rm -rf "$PYDIR"/site-packages/Cryptodome/SelfTest
 rm -rf "$PYDIR"/site-packages/{psutil,qrcode,websocket}/tests

contrib/build-wine/Dockerfile

@@ -45,10 +45,10 @@ RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
     apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ && \
     apt-get update -q && \
     apt-get install -qy \
-        wine-stable-amd64:amd64=6.0.2~focal-1 \
-        wine-stable-i386:i386=6.0.2~focal-1 \
-        wine-stable:amd64=6.0.2~focal-1 \
-        winehq-stable:amd64=6.0.2~focal-1 \
+        wine-stable-amd64:amd64=7.0.0.0~focal-1 \
+        wine-stable-i386:i386=7.0.0.0~focal-1 \
+        wine-stable:amd64=7.0.0.0~focal-1 \
+        winehq-stable:amd64=7.0.0.0~focal-1 \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \

contrib/build-wine/README.md

@@ -1,5 +1,4 @@
-Windows binaries
-================
+# Windows binaries
 
 ✓ _These binaries should be reproducible, meaning you should be able to generate
    binaries that match the official releases._
@@ -29,8 +28,7 @@ similar system.
 
 
 
-Code Signing
-============
+## Code Signing
 
 Electrum Windows builds are signed with a Microsoft Authenticode™ code signing
 certificate in addition to the GPG-based signatures.
@@ -57,8 +55,7 @@ certificate/key) and one or multiple trusted verifiers:
 
 
 
-Verify Integrity of signed binary
-=================================
+## Verify Integrity of signed binary
 
 Every user can verify that the official binary was created from the source code in this 
 repository. To do so, the Authenticode signature needs to be stripped since the signature
@@ -73,3 +70,20 @@ This procedure removes the differences between the signed and unsigned binary:
    of 8.
 
 The script `unsign.sh` performs these steps.
+
+## FAQ
+
+### How to investigate diff between binaries if reproducibility fails?
+`pyi-archive_viewer` is needed, for that run `$ pip install pyinstaller`.
+As a first pass overview, run:
+```
+pyi-archive_viewer -l electrum-*.exe1 > f1
+pyi-archive_viewer -l electrum-*.exe2 > f2
+diff f1 f2 > d
+cat d
+```
+Then investigate manually:
+```
+$ pyi-archive_viewer electrum-*.exe1
+? help
+```