Merge remote-tracking branch 'upstream/master'

Author: MrNaif2018

.cirrus.yml

@@ -223,42 +223,43 @@ task:
   binaries_artifacts:
     path: "dist/*"
 
-task:
-  name: MacOS build
-  macos_instance:
-    image: catalina-xcode-11.3.1
-  env:
-    TARGET_OS: macOS
-  pip_cache:
-    folder: ~/Library/Caches/pip
-    fingerprint_script:
-      - echo $CIRRUS_TASK_NAME
-      - git ls-files -s contrib/deterministic-build/*.txt
-      - git ls-files -s contrib/osx/
-  build2_cache:
-    folder: contrib/osx/.cache
-    fingerprint_script:
-      - echo $CIRRUS_TASK_NAME
-      - cat contrib/make_libsecp256k1.sh | shasum -a 256
-      - cat contrib/make_libusb.sh | shasum -a 256
-      - cat contrib/make_zbar.sh | shasum -a 256
-      - git ls-files -s contrib/osx/
-  install_script:
-    - git fetch --all --tags
-  build_script:
-    - ./contrib/osx/make_osx.sh
-  sum_script:
-    - ls -lah dist
-    - shasum -a 256 dist/*.dmg
-  binaries_artifacts:
-    path: "dist/*"
+## mac build disabled, as Cirrus CI no longer supports Intel-based mac builds
+#task:
+#  name: MacOS build
+#  macos_instance:
+#    image: catalina-xcode-11.3.1
+#  env:
+#    TARGET_OS: macOS
+#  pip_cache:
+#    folder: ~/Library/Caches/pip
+#    fingerprint_script:
+#      - echo $CIRRUS_TASK_NAME
+#      - git ls-files -s contrib/deterministic-build/*.txt
+#      - git ls-files -s contrib/osx/
+#  build2_cache:
+#    folder: contrib/osx/.cache
+#    fingerprint_script:
+#      - echo $CIRRUS_TASK_NAME
+#      - cat contrib/make_libsecp256k1.sh | shasum -a 256
+#      - cat contrib/make_libusb.sh | shasum -a 256
+#      - cat contrib/make_zbar.sh | shasum -a 256
+#      - git ls-files -s contrib/osx/
+#  install_script:
+#    - git fetch --all --tags
+#  build_script:
+#    - ./contrib/osx/make_osx.sh
+#  sum_script:
+#    - ls -lah dist
+#    - shasum -a 256 dist/*.dmg
+#  binaries_artifacts:
+#    path: "dist/*"
 
 task:
   name: AppImage build
   container:
     dockerfile: contrib/build-linux/appimage/Dockerfile
     cpu: 2
-    memory: 1G
+    memory: 2G
   pip_cache:
     folder: contrib/build-linux/appimage/.cache/pip_cache
     fingerprint_script:

RELEASE-NOTES

@@ -1,3 +1,37 @@
+# Release 4.3.3 - (January 3, 2023)
+ * Lightning:
+   - fix handling failed HTLCs in gossip-based routing (#7995)
+   - fix LN cooperative-chan-close to witness v1 addr (#8012)
+ * PSBTs:
+   - never put ypub/zpub in psbts, only plain xpubs (#8036)
+   - for witness v0 txins, put both UTXO and WIT_UTXO in psbt (#8039)
+ * Hardware wallets:
+   - Trezor: optimize signing speed by not serializing tx (#8058)
+   - Ledger:
+     - modify plugin to support new bitcoin app v2.1.0 (#8041),
+     - added a deprecation warning when using Ledger HW.1 devices.
+       Ledger itself stopped supporting HW.1 some years ago, and it is
+       becoming a maintenance burden for us to keep supporting it.
+       Please migrate away from these devices. Support will be removed
+       in a future release.
+ * Binaries:
+   - tighten build system to only use source pkgs in more places
+     (#7999, #8000)
+   - Windows:
+     - use debian makensis instead of upstream windows exe (#8057)
+     - stop using debian sid, build missing dep instead (98d29cba)
+   - AppImage: fix failing to run on certain systems (#8011)
+ * commands:
+   - getinfo() to show if running in testnet mode (#8044)
+   - add a "convert_currency" command (for fiat FX rate) (#8091)
+ * Qt wizard: fix QR code not shown during 2fa wallet creation (#8071)
+ * rework Tor-socks-proxy detection to reduce Tor-log-spam (#7317)
+ * Android: add setting to enable debug logs (#7409)
+ * fix payserver (merchant) js for electrum 4.3 invoice api (0fc90e07)
+ * bip21: more robust handling of URIs that include a "lightning" key
+   (ac1d53f0, 2fd762c3, #8047)
+
+
 # Release 4.3.2 - (September 26, 2022)
  * When creating new requests, reuse addresses of expired requests
    (fixes #7927).

contrib/android/Dockerfile

@@ -179,7 +179,7 @@ RUN cd /opt \
     && git remote add accumulator https://github.com/accumulator/python-for-android \
     && git fetch --all \
     # commit: from branch accumulator/electrum_20210421d
-    && git checkout "a16a3dd5cf8fe0f846663bce9e248e5432dbbf2d^{commit}" \
+    && git checkout "d33e07ba4c7931da46122a32f3807709a73cb7f6^{commit}" \
     && python3 -m pip install --no-build-isolation --no-dependencies --user -e .
 
 # build env vars

contrib/android/make_apk.sh

@@ -93,6 +93,8 @@ if [[ "$2" == "all" ]] ; then
     make $TARGET
     #export APP_ANDROID_ARCH=x86
     #make $TARGET
+    export APP_ANDROID_ARCH=x86_64
+    make $TARGET
 else
     export APP_ANDROID_ARCH=$2
     make $TARGET

contrib/android/p4a_recipes/qt5/__init__.py

@@ -1,8 +1,16 @@
+import os
+
 from pythonforandroid.recipes.qt5 import Qt5Recipe
 
+from pythonforandroid.util import load_source
+
+util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py'))
 
 assert Qt5Recipe._version == "9b43a43ee96198674060c6b9591e515e2d27c28f"
 assert Qt5Recipe.depends == ['python3']
 assert Qt5Recipe.python_depends == []
 
-recipe = Qt5Recipe()
+class Qt5RecipePinned(util.InheritedRecipeMixin, Qt5Recipe):
+    pass
+
+recipe = Qt5RecipePinned()

contrib/build-linux/appimage/make_appimage.sh

@@ -61,7 +61,7 @@ tar xf "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" -C "$CACHEDIR"
         --enable-ipv6 \
         --enable-shared \
         -q
-    make -j4 -s || fail "Could not build Python"
+    make "-j$CPU_COUNT" -s || fail "Could not build Python"
 )
 info "installing python."
 (
@@ -111,7 +111,7 @@ XCB_UTIL_VERSION="acf790d7752f36e450d476ad79807d4012ec863b"
     git checkout "${XCB_UTIL_VERSION}^{commit}"
     ./autogen.sh
     ./configure --enable-shared
-    make -j4 -s || fail "Could not build libxcb-util1"
+    make "-j$CPU_COUNT" -s || fail "Could not build libxcb-util1"
 ) || fail "Could build libxcb-util1"
 cp "$CACHEDIR/libxcb-util1/util/src/.libs/libxcb-util.so.1" "$APPDIR/usr/lib/libxcb-util.so.1"
 

contrib/build-wine/deterministic.spec

@@ -15,7 +15,8 @@ hiddenimports = []
 hiddenimports += collect_submodules('pkg_resources')  # workaround for https://github.com/pypa/setuptools/issues/1963
 hiddenimports += collect_submodules('trezorlib')
 hiddenimports += collect_submodules('safetlib')
-hiddenimports += collect_submodules('btchip')
+hiddenimports += collect_submodules('btchip')          # device plugin: ledger
+hiddenimports += collect_submodules('ledger_bitcoin')  # device plugin: ledger
 hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 hiddenimports += collect_submodules('ckcc')

contrib/build_tools_util.sh

@@ -130,6 +130,14 @@ fi
 
 export GCC_STRIP_BINARIES="${GCC_STRIP_BINARIES:-0}"
 
+if [ -n "$CIRRUS_CPU" ] ; then
+    # special-case for CI. see https://github.com/cirruslabs/cirrus-ci-docs/issues/1115
+    export CPU_COUNT="$CIRRUS_CPU"
+else
+    export CPU_COUNT="$(nproc 2> /dev/null || sysctl -n hw.ncpu)"
+fi
+info "Found $CPU_COUNT CPUs, which we might use for building."
+
 
 function break_legacy_easy_install() {
     # We don't want setuptools sneakily installing dependencies, invisible to pip.

contrib/make_libsecp256k1.sh

@@ -59,7 +59,7 @@ info "Building $pkgname..."
             --disable-static \
             --enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
     fi
-    make -j4 || fail "Could not build $pkgname"
+    make "-j$CPU_COUNT" || fail "Could not build $pkgname"
     make install || fail "Could not install $pkgname"
     . "$here/$pkgname/dist/lib/libsecp256k1.la"
     host_strip "$here/$pkgname/dist/lib/$dlname"

contrib/make_libusb.sh

@@ -47,7 +47,7 @@ info "Building $pkgname..."
             $AUTOCONF_FLAGS \
             || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
     fi
-    make -j4 || fail "Could not build $pkgname"
+    make "-j$CPU_COUNT" || fail "Could not build $pkgname"
     make install || warn "Could not install $pkgname"
     . "$here/$pkgname/libusb/.libs/libusb-1.0.la"
     host_strip "$here/$pkgname/libusb/.libs/$dlname"

contrib/make_zbar.sh

@@ -81,7 +81,7 @@ info "Building $pkgname..."
             --disable-static \
             --enable-shared || fail "Could not configure $pkgname. Please make sure you have a C compiler installed and try again."
     fi
-    make -j4 || fail "Could not build $pkgname"
+    make "-j$CPU_COUNT" || fail "Could not build $pkgname"
     make install || fail "Could not install $pkgname"
     . "$here/$pkgname/dist/lib/libzbar.la"
     host_strip "$here/$pkgname/dist/lib/$dlname"

contrib/osx/osx.spec

@@ -22,7 +22,8 @@ hiddenimports = []
 hiddenimports += collect_submodules('pkg_resources')  # workaround for https://github.com/pypa/setuptools/issues/1963
 hiddenimports += collect_submodules('trezorlib')
 hiddenimports += collect_submodules('safetlib')
-hiddenimports += collect_submodules('btchip')
+hiddenimports += collect_submodules('btchip')          # device plugin: ledger
+hiddenimports += collect_submodules('ledger_bitcoin')  # device plugin: ledger
 hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
 hiddenimports += collect_submodules('ckcc')

contrib/release.sh

@@ -23,11 +23,11 @@
 #
 # Note: steps before doing a new release:
 # - update locale:
-#     1. cd /opt/electrum-locale && ./update && push
+#     1. cd /opt/electrum-locale && ./update && git push
 #     2. cd to the submodule dir, and git pull
 #     3. cd .. && git push
 # - update RELEASE-NOTES and version.py
-# - git tag
+# - $ git tag -s $VERSION -m $VERSION
 #
 
 set -e

electrum/address_synchronizer.py

@@ -84,8 +84,6 @@ def __init__(self, db: 'WalletDB', config: 'SimpleConfig', *, name: str = None):
         self.unverified_tx = defaultdict(int)  # type: Dict[str, int]  # txid -> height. Access with self.lock.
         # Txs the server claims are in the mempool:
         self.unconfirmed_tx = defaultdict(int)  # type: Dict[str, int]  # txid -> height. Access with self.lock.
-        # true when synchronized
-        self._up_to_date = False  # considers both Synchronizer and Verifier
         # thread local storage for caching stuff
         self.threadlocal_cache = threading.local()
 
@@ -210,9 +208,9 @@ async def stop(self):
     def add_address(self, address):
         if address not in self.db.history:
             self.db.history[address] = []
-            self.set_up_to_date(False)
         if self.synchronizer:
             self.synchronizer.add(address)
+        self.up_to_date_changed()
 
     def get_conflicting_transactions(self, tx_hash, tx: Transaction, include_self=False):
         """Returns a set of transaction hashes from the wallet history that are
@@ -538,6 +536,7 @@ def get_history(self, domain) -> Sequence[HistoryItem]:
         # sanity check
         c, u, x = self.get_balance(domain)
         if balance != c + u + x:
+            self.logger.error(f'sanity check failed! c={c},u={u},x={x} while history balance={balance}')
             raise Exception("wallet.get_history() failed balance sanity-check")
         return h2
 
@@ -676,17 +675,14 @@ def get_tx_height(self, tx_hash: str) -> TxMinedInfo:
                 # local transaction
                 return TxMinedInfo(height=TX_HEIGHT_LOCAL, conf=0)
 
-    def set_up_to_date(self, up_to_date):
-        with self.lock:
-            status_changed = self._up_to_date != up_to_date
-            self._up_to_date = up_to_date
+    def up_to_date_changed(self) -> None:
         # fire triggers
         util.trigger_callback('adb_set_up_to_date', self)
-        if status_changed:
-            self.logger.info(f'set_up_to_date: {up_to_date}')
 
     def is_up_to_date(self):
-        return self._up_to_date
+        if not self.synchronizer or not self.verifier:
+            return False
+        return self.synchronizer.is_up_to_date() and self.verifier.is_up_to_date()
 
     def reset_netrequest_counters(self) -> None:
         if self.synchronizer:

electrum/base_wizard.py

@@ -313,9 +313,9 @@ def failed_getting_device_infos(name, e):
                     continue
                 # see if plugin recognizes 'scanned_devices'
                 try:
-                    # FIXME: side-effect: unpaired_device_info sets client.handler
-                    device_infos = devmgr.unpaired_device_infos(None, plugin, devices=scanned_devices,
-                                                                include_failing_clients=True)
+                    # FIXME: side-effect: this sets client.handler
+                    device_infos = devmgr.list_pairable_device_infos(
+                        handler=None, plugin=plugin, devices=scanned_devices, include_failing_clients=True)
                 except HardwarePluginLibraryUnavailable as e:
                     failed_getting_device_infos(name, e)
                     continue
@@ -622,7 +622,7 @@ def create_wallet(self):
                 password = k.get_password_for_storage_encryption()
             except UserCancelled:
                 devmgr = self.plugins.device_manager
-                devmgr.unpair_xpub(k.xpub)
+                devmgr.unpair_pairing_code(k.pairing_code())
                 raise ChooseHwDeviceAgain()
             except BaseException as e:
                 self.logger.exception('')