ln: add was_announced in test_lnhtlc

expose lnworker in peer
update channel_db when channels are open

.gitignore

@@ -4,39 +4,24 @@
 build/
 dist/
 *.egg/
+/electrum.py
+contrib/pyinstaller/
 Electrum.egg-info/
-electrum/locale/
+gui/qt/icons_rc.py
+locale/
 .devlocaltmp/
 *_trial_temp
 packages
 env/
+.tox/
 .buildozer/
 bin/
 /app.fil
-.idea
-.mypy_cache
-.vscode
 
-# icons
+# tox files
-electrum/gui/kivy/theming/light-0.png
-electrum/gui/kivy/theming/light-1.png
-electrum/gui/kivy/theming/light.atlas
-
-# tests/tox
-.tox/
 .cache/
 .coverage
-.pytest_cache
 
-# build workspaces
+# kivy
-contrib/build-wine/tmp/
+gui/kivy/theming/light-0.png
-contrib/build-wine/fresh_clone/
+gui/kivy/theming/light.atlas
-contrib/build-linux/appimage/build/
-contrib/build-linux/appimage/.cache/
-contrib/android_debug.keystore
-
-# shared objects
-electrum/*.so
-electrum/*.so.0
-electrum/*.dll
-electrum/*.dylib

.gitmodules

@@ -1,9 +1,6 @@
+[submodule "contrib/deterministic-build/electrum-icons"]
+	path = contrib/deterministic-build/electrum-icons
+	url = https://github.com/spesmilo/electrum-icons
 [submodule "contrib/deterministic-build/electrum-locale"]
 	path = contrib/deterministic-build/electrum-locale
 	url = https://github.com/spesmilo/electrum-locale
-[submodule "contrib/CalinsQRReader"]
-	path = contrib/osx/CalinsQRReader
-	url = https://github.com/spesmilo/CalinsQRReader
-[submodule "electrum/www"]
-	path = electrum/www
-	url = https://github.com/spesmilo/electrum-http.git

.travis.yml

@@ -1,15 +1,15 @@
-dist: bionic
+sudo: false
 language: python
 python:
+    - 3.5
     - 3.6
-    - 3.7
+addons:
-    - 3.8
+  apt:
-git:
+    sources:
-  depth: false
+      - sourceline: 'ppa:tah83/secp256k1'
-before_install:
+    packages:
-  - git tag
+      - libsecp256k1-0
 install:
-  - sudo apt-get -y install libsecp256k1-0
   - pip install -r contrib/requirements/requirements-travis.txt
 cache:
   - pip: true
@@ -18,91 +18,41 @@ cache:
 script:
     - tox
 after_success:
-    - if [ "$TRAVIS_BRANCH" = "master" ]; then pip install requests && contrib/push_locale; fi
+    - if [ "$TRAVIS_BRANCH" = "master" ]; then pip install pycurl requests && contrib/make_locale; fi
     - coveralls
 jobs:
   include:
-    - name: "Regtest functional tests"
-      language: python
-      python: 3.7
-      install:
-        - sudo add-apt-repository -y ppa:bitcoin/bitcoin
-        - sudo apt-get -qq update
-        - sudo apt-get install -yq bitcoind
-        - sudo apt-get -y install libsecp256k1-0
-        - pip install -r contrib/requirements/requirements.txt
-        - pip install electrumx
-      before_script:
-          - electrum/tests/regtest/start_bitcoind.sh
-          - electrum/tests/regtest/start_electrumx.sh
-      script:
-        - python -m unittest electrum/tests/regtest.py
-      after_success: True
-    - name: "Flake8 linter tests"
-      language: python
-      install: pip install flake8
-      script: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
     - stage: binary builds
-      if: branch = master
+      sudo: true
-      name: "Windows build"
-      language: c
-      python: false
       env:
         - TARGET_OS=Windows
-      services:
+      python: 3.6
-        - docker
       install:
-        - sudo docker build --no-cache -t electrum-wine-builder-img ./contrib/build-wine/
+        - sudo dpkg --add-architecture i386
-      script:
+        - wget -nc https://dl.winehq.org/wine-builds/Release.key
-        - sudo docker run --name electrum-wine-builder-cont -v $PWD:/opt/wine64/drive_c/electrum --rm --workdir /opt/wine64/drive_c/electrum/contrib/build-wine electrum-wine-builder-img ./build.sh
+        - sudo apt-key add Release.key
+        - sudo apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq winehq-stable dirmngr gnupg2 p7zip-full mingw-w64
+      before_script: ls -lah /tmp/electrum-build
+      script: ./contrib/build-wine/build.sh $TRAVIS_COMMIT
       after_success: true
-    - if: branch = master
+    - os: osx
-      name: "Android build"
-      language: python
-      python: 3.7
-      services:
-        - docker
-      install:
-        - pip install requests && ./contrib/pull_locale
-        - ./contrib/make_packages
-        - sudo docker build --no-cache -t electrum-android-builder-img electrum/gui/kivy/tools
-      script:
-        - sudo chown -R 1000:1000 .
-        # Output something every minute or Travis kills the job
-        - while sleep 60; do echo "=====[ $SECONDS seconds still running ]====="; done &
-        - sudo docker run -it -u 1000:1000 --rm --name electrum-android-builder-cont --env CI=true -v $PWD:/home/user/wspace/electrum --workdir /home/user/wspace/electrum electrum-android-builder-img ./contrib/make_apk
-        # kill background sleep loop
-        - kill %1
-        - ls -la bin
-        - if [ $(ls bin | grep -c Electrum-*) -eq 0 ]; then exit 1; fi
-      after_success: true
-    - if: branch = master
-      name: "MacOS build"
-      os: osx
       language: c
       env:
         - TARGET_OS=macOS
       python: false
       install:
         - git fetch --all --tags
-      script: ./contrib/osx/make_osx
+        - git fetch origin --unshallow
+      script: ./contrib/build-osx/make_osx
       after_script: ls -lah dist && md5 dist/*
       after_success: true
-    - if: branch = master
-      name: "AppImage build"
-      language: c
-      python: false
-      services:
-        - docker
-      install:
-        - sudo docker build --no-cache -t electrum-appimage-builder-img ./contrib/build-linux/appimage/
-      script:
-        - sudo docker run --name electrum-appimage-builder-cont -v $PWD:/opt/electrum --rm --workdir /opt/electrum/contrib/build-linux/appimage electrum-appimage-builder-img ./build.sh
-      after_success: true
     - stage: release check
       install:
           - git fetch --all --tags
+          - git fetch origin --unshallow
       script:
         - ./contrib/deterministic-build/check_submodules.sh
       after_success: true
-      if: tag IS present
+      if: tag IS present

Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>CFBundleURLTypes</key>
+  <array>
+    <dict>
+      <key>CFBundleURLName</key>
+      <string>bitcoin</string>
+      <key>CFBundleURLSchemes</key>
+      <array>
+        <string>bitcoin</string>
+      </array>
+    </dict>
+  </array>
+  <key>LSArchitecturePriority</key>
+  <array>
+    <string>x86_64</string>
+    <string>i386</string>
+  </array>
+</dict>
+</plist>

MANIFEST.in

@@ -1,21 +1,17 @@
 include LICENCE RELEASE-NOTES AUTHORS
 include README.rst
+include electrum.conf.sample
 include electrum.desktop
 include *.py
-include run_electrum
+include electrum
 include contrib/requirements/requirements.txt
 include contrib/requirements/requirements-hw.txt
+recursive-include lib *.py
+recursive-include gui *.py
+recursive-include plugins *.py
 recursive-include packages *.py
 recursive-include packages cacert.pem
+include icons.qrc
+recursive-include icons *
+recursive-include scripts *
 
-graft electrum
-prune electrum/tests
-graft contrib/udev
-
-exclude electrum/*.so
-exclude electrum/*.so.0
-
-global-exclude __pycache__
-global-exclude *.py[co~]
-global-exclude *.py.orig
-global-exclude *.py.rej

README.rst

@@ -5,7 +5,7 @@ Electrum - Lightweight Bitcoin client
 
   Licence: MIT Licence
   Author: Thomas Voegtlin
-  Language: Python (>= 3.6)
+  Language: Python
   Homepage: https://electrum.org/
 
 
@@ -15,9 +15,9 @@ Electrum - Lightweight Bitcoin client
 .. image:: https://coveralls.io/repos/github/spesmilo/electrum/badge.svg?branch=master
     :target: https://coveralls.io/github/spesmilo/electrum?branch=master
     :alt: Test coverage statistics
-.. image:: https://d322cqt584bo4o.cloudfront.net/electrum/localized.svg
+.. image:: https://img.shields.io/badge/help-translating-blue.svg
     :target: https://crowdin.com/project/electrum
-    :alt: Help translate Electrum online
+    :alt: Help translating Electrum online
 
 
 
@@ -26,66 +26,64 @@ Electrum - Lightweight Bitcoin client
 Getting started
 ===============
 
-Electrum itself is pure Python, and so are most of the required dependencies.
+Electrum is a pure python application. If you want to use the
-
+Qt interface, install the Qt dependencies::
-Non-python dependencies
------------------------
-
-If you want to use the Qt interface, install the Qt dependencies::
 
     sudo apt-get install python3-pyqt5
 
-For elliptic curve operations, libsecp256k1 is a required dependency::
-
-    sudo apt-get install libsecp256k1-0
-
-Alternatively, when running from a cloned repository, a script is provided to build
-libsecp256k1 yourself::
-
-    ./contrib/make_libsecp256k1.sh
-
-
-Running from tar.gz
--------------------
-
 If you downloaded the official package (tar.gz), you can run
-Electrum from its root directory without installing it on your
+Electrum from its root directory, without installing it on your
 system; all the python dependencies are included in the 'packages'
 directory. To run Electrum from its root directory, just do::
 
-    ./run_electrum
+    ./electrum
 
 You can also install Electrum on your system, by running this command::
 
-    sudo apt-get install python3-setuptools python3-pip
+    sudo apt-get install python3-setuptools
-    python3 -m pip install --user .
+    pip3 install .[full]
 
 This will download and install the Python dependencies used by
-Electrum instead of using the 'packages' directory.
+Electrum, instead of using the 'packages' directory.
+The 'full' extra contains some optional dependencies that we think
+are often useful but they are not strictly needed.
 
 If you cloned the git repository, you need to compile extra files
 before you can run Electrum. Read the next section, "Development
-version".
+Version".
+
 
 
 Development version
--------------------
+===================
 
 Check out the code from GitHub::
 
     git clone git://github.com/spesmilo/electrum.git
     cd electrum
-    git submodule update --init
 
 Run install (this should install dependencies)::
 
-    python3 -m pip install --user .
+    pip3 install .[full]
 
+Render the SVG icons to PNGs::
+
+    for i in lock unlock confirmed status_lagging status_disconnected status_connected_proxy status_connected status_waiting preferences; do convert -background none icons/$i.svg icons/$i.png; done
+
+Compile the icons file for Qt::
+
+    sudo apt-get install pyqt5-dev-tools
+    pyrcc5 icons.qrc -o gui/qt/icons_rc.py
+
+Compile the protobuf description file::
+
+    sudo apt-get install protobuf-compiler
+    protoc --proto_path=lib/ --python_out=lib/ lib/paymentrequest.proto
 
 Create translations (optional)::
 
     sudo apt-get install python-requests gettext
-    ./contrib/pull_locale
+    ./contrib/make_locale
 
 
 
@@ -93,31 +91,25 @@ Create translations (optional)::
 Creating Binaries
 =================
 
-Linux (tarball)
----------------
 
-See :code:`contrib/build-linux/README.md`.
+To create binaries, create the 'packages' directory::
 
+    ./contrib/make_packages
 
-Linux (AppImage)
+This directory contains the python dependencies used by Electrum.
-----------------
-
-See :code:`contrib/build-linux/appimage/README.md`.
-
 
 Mac OS X / macOS
-----------------
+--------
-
-See :code:`contrib/osx/README.md`.
 
+See `contrib/build-osx/`.
 
 Windows
 -------
 
-See :code:`contrib/build-wine/README.md`.
+See `contrib/build-wine/`.
 
 
 Android
 -------
 
-See :code:`electrum/gui/kivy/Readme.md`.
+See `gui/kivy/Readme.txt` file.

RELEASE-NOTES

@@ -1,268 +1,3 @@
-# Release 4.0 - (Not released yet; release notes are incomplete)
-
- * Lightning Network
- * Qt GUI: Separation between output selection and transaction finalization.
- * Http PayServer can be configured from GUI
-
-# Release 3.3.8 - (July 11, 2019)
-
- * fix some bugs with recent bump fee (RBF) improvements (#5483, #5502)
- * fix #5491: watch-only wallets could not bump fee in some cases
- * appimage: URLs could not be opened on some desktop environments (#5425)
- * faster tx signing for segwit inputs for really large txns (#5494)
- * A few other minor bugfixes and usability improvements.
-
-
-# Release 3.3.7 - (July 3, 2019)
-
- * The AppImage Linux x86_64 binary and the Windows setup.exe
-   (so now all Windows binaries) are now built reproducibly.
- * Bump fee (RBF) improvements:
-   Implemented a new fee-bump strategy that can add new inputs,
-   so now any tx can be fee-bumped (d0a4366). The old strategy
-   was to decrease the value of outputs (starting with change).
-   We will now try the new strategy first, and only use the old
-   as a fallback (needed e.g. when spending "Max").
- * CoinChooser improvements:
-   - more likely to construct txs without change (when possible)
-   - less likely to construct txs with really small change (e864fa5)
-   - will now only spend negative effective value coins when
-     beneficial for privacy (cb69aa8)
- * fix long-standing bug that broke wallets with >65k addresses (#5366)
- * Windows binaries: we now build the PyInstaller boot loader ourselves,
-   as this seems to reduce anti-virus false positives (1d0f679)
- * Android: (fix) BIP70 payment requests could not be paid (#5376)
- * Android: allow copy-pasting partial transactions from/to clipboard
- * Fix a performance regression for large wallets (c6a54f0)
- * Qt: fix some high DPI issues related to text fields (37809be)
- * Trezor:
-   - allow bypassing "too old firmware" error (#5391)
-   - use only the Bridge to scan devices if it is available (#5420)
- * hw wallets: (known issue) on Win10-1903, some hw devices
-   (that also have U2F functionality) can only be detected with
-   Administrator privileges. (see #5420 and #5437)
-   A workaround is to run as Admin, or for Trezor to install the Bridge.
- * Several other minor bugfixes and usability improvements.
-
-
-# Release 3.3.6 - (May 16, 2019)
-
- * qt: fix crash during 2FA wallet creation (#5334)
- * fix synchronizer not to keep resubscribing to addresses of
-   already closed wallets (e415c0d9)
- * fix removing addresses/keys from imported wallets (#4481)
- * kivy: fix crash when aborting 2FA wallet creation (#5333)
- * kivy: fix rare crash when changing exchange rate settings (#5329)
- * A few other minor bugfixes and usability improvements.
-
-
-# Release 3.3.5 - (May 9, 2019)
-
- * The logging system has been overhauled (#5296).
-   Logs can now also optionally be written to disk, disabled by default.
- * Fix a bug in synchronizer (#5122) where client could get stuck.
-   Also, show the progress of history sync in the GUI. (#5319)
- * fix Revealer in Windows and MacOS binaries (#5027)
- * fiat rate providers:
-   - added CoinGecko.com and CoinCap.io
-   - BitcoinAverage now only provides historical exchange rates for
-     paying customers. Changed default provider to CoinGecko.com (#5188)
- * hardware wallets:
-   - Ledger: Nano X is now recognized (#5140)
-   - KeepKey:
-     - device was not getting detected using Windows binary (#5165)
-     - support firmware 6.0.0+ (#5205)
-   - Trezor: implemented "seedless" mode (#5118)
- * Coin Control in Qt: implemented freezing individual UTXOs
-   in addition to freezing addresses (#5152)
- * TrustedCoin (2FA wallets):
-   - better error messages (#5184)
-   - longer signing timeout (#5221)
- * Kivy:
-   - fix bug with local transactions (#5156)
-   - allow selecting fiat rate providers without historical data (#5162)
- * fix CPFP: the fees already paid by the parent were not included in
-   the calculation, so it always overestimated (#5244)
- * Testnet: there is now a warning when the client is started in
-   testnet mode as there were a number of reports of users getting
-   scammed through social engineering (#5295)
- * CoinChooser: performance of creating transactions has been improved
-   significantly for large wallets. (d56917f4)
- * Importing/sweeping WIF keys: stricter checks (#4638, #5290)
- * Electrum protocol: the client's "user agent" has been changed from
-   "3.3.5" to "electrum/3.3.5". Other libraries connecting to servers
-   can consider not "spoofing" to be Electrum. (#5246)
- * Several other minor bugfixes and usability improvements.
-
-
-# Release 3.3.4 - (February 13, 2019)
-
- * AppImage: we now also distribute self-contained binaries for x86_64
-   Linux in the form of an AppImage (#5042). The Python interpreter,
-   PyQt5, libsecp256k1, PyCryptodomex, zbar, hidapi/libusb (including
-   hardware wallet libraries) are all bundled. Note that users of
-   hw wallets still need to set udev rules themselves.
- * hw wallets: fix a regression during transaction signing that prompts
-   the user too many times for confirmations (commit 2729909)
- * transactions now set nVersion to 2, to mimic Bitcoin Core
- * fix Qt bug that made all hw wallets unusable on Windows 8.1 (#4960)
- * fix bugs in wallet creation wizard that resulted in corrupted
-   wallets being created in rare cases (#5082, #5057)
- * fix compatibility with Qt 5.12 (#5109)
-
-
-# Release 3.3.3 - (January 25, 2019)
-
- * Do not expose users to server error messages (#4968)
- * Notify users of new releases. Release announcements must be signed,
-   and they are verified byElectrum using a hardcoded Bitcoin address.
- * Hardware wallet fixes (#4991, #4993, #5006)
- * Display only QR code in QRcode Window
- * Fixed code signing on MacOS
- * Randomise locktime of transactions
-
-
-# Release 3.3.2 - (December 21, 2018)
-
- * Fix Qt history export bug
- * Improve network timeouts
- * Prepend server transaction_broadcast error messages with
-   explanatory message. Render error messages as plain text.
-
-
-# Release 3.3.1 - (December 20, 2018)
-
- * Qt: Fix invoices tab crash (#4941)
- * Android: Minor GUI improvements
-
-
-# Release 3.3.0 - Hodler's Edition (December 19, 2018)
-
- * The network layer has been rewritten using asyncio and aiorpcx.
-   In addition to easier maintenance, this makes the client
-   more robust against misbehaving servers.
- * The minimum python version was increased to 3.6
- * The blockchain headers and fork handling logic has been generalized.
-   Clients by default now follow chain based on most work, not length.
- * New wallet creation defaults to native segwit (bech32).
- * Segwit 2FA: TrustedCoin now supports native segwit p2wsh
-   two-factor wallets.
- * RBF batching (opt-in): If the wallet has an unconfirmed RBF
-   transaction, new payments will be added to that transaction,
-   instead of creating new transactions.
- * MacOS: support QR code scanner in binaries.
- * Android APK:
-   - build using Google NDK instead of Crystax NDK
-   - target API 28
-   - do not use external storage (previously for block headers)
- * hardware wallets:
-   - Coldcard now supports spending from p2wpkh-p2sh,
-     fixed p2pkh signing for fw 1.1.0
-   - Archos Safe-T mini: fix #4726 signing issue
-   - KeepKey: full segwit support
-   - Trezor: refactoring and compat with python-trezor 0.11
-   - Digital BitBox: support firmware v5.0.0
- * fix bitcoin URI handling when app already running (#4796)
- * Qt listings rewritten:
-   the History tab now uses QAbstractItemModel, the other tabs use
-   QStandardItemModel. Performance should be better for large wallets.
- * Several other minor bugfixes and usability improvements.
-
-
-# Release 3.2.3 - (September 3, 2018)
-
- * hardware wallet: the Safe-T mini from Archos is now supported.
- * hardware wallet: the Coldcard from Coinkite is now supported.
- * BIP39 seeds: if a seed extension (aka passphrase) contained
-   multiple consecutive whitespaces or leading/trailing whitespaces
-   then the derived addresses were not following spec. This has been
-   fixed, and affected should move their coins. The wizard will show a
-   warning in this case. (#4566)
- * Revealer: the PRNG used has been changed (#4649)
- * fix Linux distributables: 'typing' was not bundled, needed for python 3.4
- * fix #4626: fix spending from segwit multisig wallets involving a Trezor
-   cosigner when using a custom derivation path
- * fix #4491: on Android, if user had set "uBTC" as base unit, app crashed
- * fix #4497: on Android, paying bip70 invoices from cold start did not work
- * Several other minor bugfixes and usability improvements.
-
-
-# Release 3.2.2 - (July 2nd, 2018)
-
- * Fix DNS resolution on Windows
- * Fix websocket bug in daemon
-
-
-# Release 3.2.1 - (July 1st, 2018)
-
- * fix Windows binaries: due to build process changes, the locale files
-   were not included; the language could not be changed from English
- * fix Linux distributables: wordlists were not included (#4475)
-
-
-# Release 3.2.0 - Satoshi's Vision (June 30, 2018)
-
- * If present, libsecp256k1 is used to speed up elliptic curve
-   operations. The library is bundled in the Windows, MacOS, and
-   Android binaries. On Linux, it needs to be installed separately.
- * Two-factor authentication is available on Android. Note that this
-   will only provide additional security if one time passwords are
-   generated on a separate device.
- * Semi-automated crash reporting is implemented for Android.
- * Transactions that are dropped from the mempool are kept in the
-   wallet as 'local', and can be rebroadcast. Previously these
-   transactions were deleted from the wallet.
- * The scriptSig and witness part of transaction inputs are no longer
-   parsed, unless actually needed. The wallet will no longer display
-   'from' addresses corresponding to transaction inputs, except for
-   its own inputs.
- * The partial transaction format has been incompatibly changed. This
-   was needed as for partial transactions the scriptSig/witness has to
-   be parsed, but for signed transactions we did not want to do the
-   parsing.  Users should make sure that all instances of Electrum
-   they use to co-sign or offline sign, are updated together.
- * Signing of partial transactions created with online imported
-   addresses wallets now supports significantly more
-   setups. Previously only online p2pkh address + offline WIF was
-   supported.  Now the following setups are all supported:
-   - online {p2pkh, p2wpkh-p2sh, p2wpkh} address + offline WIF,
-   - online {p2pkh, p2wpkh-p2sh, p2wpkh} address + offline seed/xprv,
-   - online {p2sh, p2wsh-p2sh, p2wsh}-multisig address + offline seeds/xprvs
-     (potentially distributed among several different machines)
-   Note that for the online address + offline HD secret case, you need
-   the offline wallet to recognize the address (i.e. within gap
-   limit).  Having an xpub on the online machine is still the
-   recommended setup, as this allows the online machine to generate
-   new addresses on demand.
- * Segwit multisig for bip39 and hardware wallets is now enabled.
-   (both p2wsh-p2sh and native p2wsh)
- * Ledger: offline signing for segwit inputs (#3302) This has already
-   worked for Trezor and Digital Bitbox. Offline segwit signing can be
-   combined with online imported addresses wallets.
- * Added Revealer plugin. ( https://revealer.cc ) Revealer is a seed
-   phrase back-up solution. It allows you to create a cold, analog,
-   multi-factor backup of your wallet seeds, or of any arbitrary
-   secret. The Revealer utilizes a transparent plastic visual one time
-   pad.
- * Fractional fee rates: the Qt GUI now displays fee rates with 0.1
-   sat/byte precision, and also allows this same resolution in the
-   Send tab.
- * Hardware wallets: a "show address" button is now displayed in the
-   Receive tab of the Qt GUI. (#4316)
- * Trezor One: implemented advanced/matrix recovery (#4329)
- * Qt/Kivy: added "sat" as optional base unit.
- * Kivy GUI: significant performance improvements when displaying
-   history and address list of large wallets; and transaction dialog
-   of large transactions.
- * Windows: use dnspython to resolve dns instead of socket.getaddrinfo
-   (#4422)
- * Importing minikeys: use uncompressed pubkey instead of compressed
-   (#4384)
- * SPV proofs: check inner nodes not to be valid transactions (#4436)
- * Qt GUI: there is now an optional "dark" theme (#4461)
- * Several other minor bugfixes and usability improvements.
-
-
 # Release 3.1.3 - (April 16, 2018)
 
  * Qt GUI: seed word auto-complete during restore
@@ -394,7 +129,7 @@ issue #3374. Users should upgrade to 3.0.5.
   * Qt GUI: sweeping now uses the Send tab, allowing fees to be set
   * Windows: if using the installer binary, there is now a separate shortcut
     for "Electrum Testnet"
-  * Digital Bitbox: added support for p2sh-segwit
+  * Digital Bitbox: added suport for p2sh-segwit
   * OS notifications for incoming transactions
   * better transaction size estimation:
     - fees for segwit txns were somewhat underestimated (#3347)
@@ -622,7 +357,7 @@ issue #3374. Users should upgrade to 3.0.5.
 
 # Release 2.7.7
   * Fix utf8 encoding bug with old wallet seeds (issue #1967)
-  * Fix delete request from menu (issue #1968)
+  * Fix delete request from menu (isue #1968)
 
 # Release 2.7.6
  * Fixes a critical bug with imported private keys (issue #1966). Keys
@@ -985,7 +720,7 @@ issue #3374. Users should upgrade to 3.0.5.
  * New 'Receive' tab in the GUI:
    - create and manage payment requests, with QR Codes
    - the former 'Receive' tab was renamed to 'Addresses'
-   - the former Point of Sale plugin is replaced by a resizable
+   - the former Point of Sale plugin is replaced by a resizeable
      window that pops up if you click on the QR code
 
  * The 'Send' tab in the Qt GUI supports transactions with multiple
@@ -1008,7 +743,7 @@ issue #3374. Users should upgrade to 3.0.5.
 
  * The client accepts servers with a CA-signed SSL certificate.
 
- * ECIES encrypt/decrypt methods, available in the GUI and using
+ * ECIES encrypt/decrypt methods, availabe in the GUI and using
    the command line:
       encrypt <pubkey> <message>
       decrypt <pubkey> <message>
@@ -1081,7 +816,7 @@ bugfixes: connection problems, transactions staying unverified
 
 # Release 1.8.1
 
-* Notification option when receiving new transactions
+* Notification option when receiving new tranactions
 * Confirm dialogue before sending large amounts
 * Alternative datafile location for non-windows systems
 * Fix offline wallet creation

SECURITY.md

@@ -1,19 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-To report security issues send an email to electrumdev@gmail.com.
-
-The following keys may be used to communicate sensitive information to developers:
-
-| Name | Fingerprint |
-|------|-------------|
-| ThomasV | 6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6 |
-| SomberNight | 4AD6 4339 DFA0 5E20 B3F6 AD51 E7B7 48CD AF5E 5ED9 |
-
-You can import a key by running the following command with that
-individual’s fingerprint: `gpg --recv-keys "<fingerprint>"`
-Ensure that you put quotes around fingerprints containing spaces.
-
-These public keys can also be found in the Electrum git repository,
-in the top-level `pubkeys` folder.

contrib/build-linux/README.md

@@ -1,16 +0,0 @@
-Source tarballs
-===============
-
-✗ _This script does not produce reproducible output (yet!)._
-
-1. Prepare python dependencies used by Electrum.
-
-    ```
-    contrib/make_packages
-    ```
-
-2. Create source tarball.
-
-    ```
-    contrib/make_tgz
-    ```

contrib/build-linux/appimage/Dockerfile

@@ -1,30 +0,0 @@
-FROM ubuntu:16.04@sha256:97b54e5692c27072234ff958a7442dde4266af21e7b688e7fca5dc5acc8ed7d9
-
-ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
-
-RUN apt-get update -q && \
-    apt-get install -qy \
-        git=1:2.7.4-0ubuntu1.7 \
-        wget=1.17.1-1ubuntu1.5 \
-        make=4.1-6 \
-        autotools-dev=20150820.1 \
-        autoconf=2.69-9 \
-        libtool=2.4.6-0.1 \
-        xz-utils=5.1.1alpha+20120614-2ubuntu2 \
-        libssl-dev=1.0.2g-1ubuntu4.15 \
-        libssl1.0.0=1.0.2g-1ubuntu4.15 \
-        openssl=1.0.2g-1ubuntu4.15 \
-        zlib1g-dev=1:1.2.8.dfsg-2ubuntu4.3 \
-        libffi-dev=3.2.1-4 \
-        libncurses5-dev=6.0+20160213-1ubuntu1 \
-        libsqlite3-dev=3.11.0-1ubuntu1.3 \
-        libusb-1.0-0-dev=2:1.0.20-1 \
-        libudev-dev=229-4ubuntu21.27 \
-        gettext=0.19.7-2ubuntu3.1 \
-        libzbar0=0.10+doc-10ubuntu1  \
-        libdbus-1-3=1.10.6-1ubuntu3.4 \
-        libxkbcommon-x11-0=0.5.0-1ubuntu2.1 \
-        && \
-    rm -rf /var/lib/apt/lists/* && \
-    apt-get autoremove -y && \
-    apt-get clean

contrib/build-linux/appimage/README.md

@@ -1,66 +0,0 @@
-AppImage binary for Electrum
-============================
-
-✓ _This binary should be reproducible, meaning you should be able to generate
-   binaries that match the official releases._
-
-This assumes an Ubuntu host, but it should not be too hard to adapt to another
-similar system. The host architecture should be x86_64 (amd64).
-The docker commands should be executed in the project's root folder.
-
-We currently only build a single AppImage, for x86_64 architecture.
-Help to adapt these scripts to build for (some flavor of) ARM would be welcome,
-see [issue #5159](https://github.com/spesmilo/electrum/issues/5159).
-
-
-1. Install Docker
-
-    ```
-    $ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    $ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    $ sudo apt-get update
-    $ sudo apt-get install -y docker-ce
-    ```
-
-2. Build image
-
-    ```
-    $ sudo docker build -t electrum-appimage-builder-img contrib/build-linux/appimage
-    ```
-
-3. Build binary
-
-    ```
-    $ sudo docker run -it \
-        --name electrum-appimage-builder-cont \
-        -v $PWD:/opt/electrum \
-        --rm \
-        --workdir /opt/electrum/contrib/build-linux/appimage \
-        electrum-appimage-builder-img \
-        ./build.sh
-    ```
-
-4. The generated binary is in `./dist`.
-
-
-## FAQ
-
-### How can I see what is included in the AppImage?
-Execute the binary as follows: `./electrum*.AppImage --appimage-extract`
-
-### How to investigate diff between binaries if reproducibility fails?
-```
-cd dist/
-./electrum-*-x86_64.AppImage1 --appimage-extract
-mv squashfs-root/ squashfs-root1/
-./electrum-*-x86_64.AppImage2 --appimage-extract
-mv squashfs-root/ squashfs-root2/
-$(cd squashfs-root1; find -type f -exec sha256sum '{}' \; > ./../sha256sum1)
-$(cd squashfs-root2; find -type f -exec sha256sum '{}' \; > ./../sha256sum2)
-diff sha256sum1 sha256sum2 > d
-cat d
-```
-
-Useful binary comparison tools:
-- vbindiff
-- diffoscope

contrib/build-linux/appimage/apprun.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-APPDIR="$(dirname "$(readlink -e "$0")")"
-
-export LD_LIBRARY_PATH="${APPDIR}/usr/lib/:${APPDIR}/usr/lib/x86_64-linux-gnu${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-export PATH="${APPDIR}/usr/bin:${PATH}"
-export LDFLAGS="-L${APPDIR}/usr/lib/x86_64-linux-gnu -L${APPDIR}/usr/lib"
-
-exec "${APPDIR}/usr/bin/python3.7" -s "${APPDIR}/usr/bin/electrum" "$@"

contrib/build-linux/appimage/build.sh

@@ -1,243 +0,0 @@
-#!/bin/bash
-
-set -e
-
-PROJECT_ROOT="$(dirname "$(readlink -e "$0")")/../../.."
-CONTRIB="$PROJECT_ROOT/contrib"
-CONTRIB_APPIMAGE="$CONTRIB/build-linux/appimage"
-DISTDIR="$PROJECT_ROOT/dist"
-BUILDDIR="$CONTRIB_APPIMAGE/build/appimage"
-APPDIR="$BUILDDIR/electrum.AppDir"
-CACHEDIR="$CONTRIB_APPIMAGE/.cache/appimage"
-
-export GCC_STRIP_BINARIES="1"
-
-# pinned versions
-PYTHON_VERSION=3.7.6
-PKG2APPIMAGE_COMMIT="eb8f3acdd9f11ab19b78f5cb15daa772367daf15"
-SQUASHFSKIT_COMMIT="ae0d656efa2d0df2fcac795b6823b44462f19386"
-
-
-VERSION=`git describe --tags --dirty --always`
-APPIMAGE="$DISTDIR/electrum-$VERSION-x86_64.AppImage"
-
-. "$CONTRIB"/build_tools_util.sh
-
-rm -rf "$BUILDDIR"
-mkdir -p "$APPDIR" "$CACHEDIR" "$DISTDIR"
-
-# potential leftover from setuptools that might make pip put garbage in binary
-rm -rf "$PROJECT_ROOT/build"
-
-
-info "downloading some dependencies."
-download_if_not_exist "$CACHEDIR/functions.sh" "https://raw.githubusercontent.com/AppImage/pkg2appimage/$PKG2APPIMAGE_COMMIT/functions.sh"
-verify_hash "$CACHEDIR/functions.sh" "78b7ee5a04ffb84ee1c93f0cb2900123773bc6709e5d1e43c37519f590f86918"
-
-download_if_not_exist "$CACHEDIR/appimagetool" "https://github.com/AppImage/AppImageKit/releases/download/12/appimagetool-x86_64.AppImage"
-verify_hash "$CACHEDIR/appimagetool" "d918b4df547b388ef253f3c9e7f6529ca81a885395c31f619d9aaf7030499a13"
-
-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" "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"
-
-
-
-info "building python."
-tar xf "$CACHEDIR/Python-$PYTHON_VERSION.tar.xz" -C "$BUILDDIR"
-(
-    cd "$BUILDDIR/Python-$PYTHON_VERSION"
-    LC_ALL=C export BUILD_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%b %d %Y")
-    LC_ALL=C export BUILD_TIME=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%H:%M:%S")
-    # Patch taken from Ubuntu http://archive.ubuntu.com/ubuntu/pool/main/p/python3.7/python3.7_3.7.6-1.debian.tar.xz
-    patch -p1 < "$CONTRIB_APPIMAGE/patches/python-3.7-reproducible-buildinfo.diff"
-    ./configure \
-      --cache-file="$CACHEDIR/python.config.cache" \
-      --prefix="$APPDIR/usr" \
-      --enable-ipv6 \
-      --enable-shared \
-      -q
-    make -j4 -s || fail "Could not build Python"
-    make -s install > /dev/null || fail "Could not install Python"
-    # When building in docker on macOS, python builds with .exe extension because the
-    # case insensitive file system of macOS leaks into docker. This causes the build
-    # to result in a different output on macOS compared to Linux. We simply patch
-    # sysconfigdata to remove the extension.
-    # Some more info: https://bugs.python.org/issue27631
-    sed -i -e 's/\.exe//g' "$APPDIR"/usr/lib/python3.7/_sysconfigdata*
-)
-
-
-info "Building squashfskit"
-git clone "https://github.com/squashfskit/squashfskit.git" "$BUILDDIR/squashfskit"
-(
-    cd "$BUILDDIR/squashfskit"
-    git checkout "$SQUASHFSKIT_COMMIT"
-    make -C squashfs-tools mksquashfs || fail "Could not build squashfskit"
-)
-MKSQUASHFS="$BUILDDIR/squashfskit/squashfs-tools/mksquashfs"
-
-
-"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
-cp -f "$PROJECT_ROOT/electrum/libsecp256k1.so.0" "$APPDIR/usr/lib/libsecp256k1.so.0" || fail "Could not copy libsecp to its destination"
-
-
-appdir_python() {
-  env \
-    PYTHONNOUSERSITE=1 \
-    LD_LIBRARY_PATH="$APPDIR/usr/lib:$APPDIR/usr/lib/x86_64-linux-gnu${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" \
-    "$APPDIR/usr/bin/python3.7" "$@"
-}
-
-python='appdir_python'
-
-
-info "installing pip."
-"$python" -m ensurepip
-
-
-info "preparing electrum-locale."
-(
-    cd "$PROJECT_ROOT"
-    git submodule update --init
-
-    pushd "$CONTRIB"/deterministic-build/electrum-locale
-    if ! which msgfmt > /dev/null 2>&1; then
-        fail "Please install gettext"
-    fi
-    for i in ./locale/*; do
-        dir="$PROJECT_ROOT/electrum/$i/LC_MESSAGES"
-        mkdir -p $dir
-        msgfmt --output-file="$dir/electrum.mo" "$i/electrum.po" || true
-    done
-    popd
-)
-
-
-info "installing electrum and its dependencies."
-mkdir -p "$CACHEDIR/pip_cache"
-"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements.txt"
-"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-binaries.txt"
-"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" -r "$CONTRIB/deterministic-build/requirements-hw.txt"
-"$python" -m pip install --no-dependencies --no-warn-script-location --cache-dir "$CACHEDIR/pip_cache" "$PROJECT_ROOT"
-
-# was only needed during build time, not runtime
-"$python" -m pip uninstall -y Cython
-
-
-info "copying zbar"
-cp "/usr/lib/x86_64-linux-gnu/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
-
-
-info "desktop integration."
-cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop"
-cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png"
-
-
-# add launcher
-cp "$CONTRIB_APPIMAGE/apprun.sh" "$APPDIR/AppRun"
-
-info "finalizing AppDir."
-(
-    export PKG2AICOMMIT="$PKG2APPIMAGE_COMMIT"
-    . "$CACHEDIR/functions.sh"
-
-    cd "$APPDIR"
-    # copy system dependencies
-    copy_deps; copy_deps; copy_deps
-    move_lib
-
-    # apply global appimage blacklist to exclude stuff
-    # move usr/include out of the way to preserve usr/include/python3.7m.
-    mv usr/include usr/include.tmp
-    delete_blacklisted
-    mv usr/include.tmp usr/include
-) || fail "Could not finalize AppDir"
-
-info "Copying additional libraries"
-(
-    # On some systems it can cause problems to use the system libusb (on AppImage excludelist)
-    cp -f /usr/lib/x86_64-linux-gnu/libusb-1.0.so "$APPDIR/usr/lib/libusb-1.0.so" || fail "Could not copy libusb"
-    # some distros lack libxkbcommon-x11
-    cp -f /usr/lib/x86_64-linux-gnu/libxkbcommon-x11.so.0 "$APPDIR"/usr/lib/x86_64-linux-gnu || fail "Could not copy libxkbcommon-x11"
-)
-
-info "stripping binaries from debug symbols."
-# "-R .note.gnu.build-id" also strips the build id
-# "-R .comment" also strips the GCC version information
-strip_binaries()
-{
-  chmod u+w -R "$APPDIR"
-  {
-    printf '%s\0' "$APPDIR/usr/bin/python3.7"
-    find "$APPDIR" -type f -regex '.*\.so\(\.[0-9.]+\)?$' -print0
-  } | xargs -0 --no-run-if-empty --verbose strip -R .note.gnu.build-id -R .comment
-}
-strip_binaries
-
-remove_emptydirs()
-{
-  find "$APPDIR" -type d -empty -print0 | xargs -0 --no-run-if-empty rmdir -vp --ignore-fail-on-non-empty
-}
-remove_emptydirs
-
-
-info "removing some unneeded stuff to decrease binary size."
-rm -rf "$APPDIR"/usr/{share,include}
-PYDIR="$APPDIR"/usr/lib/python3.7
-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.7m-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
-for component in connectivity declarative help location multimedia quickcontrols2 serialport webengine websockets xmlpatterns ; do
-  rm -rf "$PYDIR"/site-packages/PyQt5/Qt/translations/qt${component}_*
-  rm -rf "$PYDIR"/site-packages/PyQt5/Qt/resources/qt${component}_*
-done
-rm -rf "$PYDIR"/site-packages/PyQt5/Qt/{qml,libexec}
-rm -rf "$PYDIR"/site-packages/PyQt5/{pyrcc.so,pylupdate.so,uic}
-rm -rf "$PYDIR"/site-packages/PyQt5/Qt/plugins/{bearer,gamepads,geometryloaders,geoservices,playlistformats,position,renderplugins,sceneparsers,sensors,sqldrivers,texttospeech,webview}
-for component in Bluetooth Concurrent Designer Help Location NetworkAuth Nfc Positioning PositioningQuick Qml Quick Sensors SerialPort Sql Test Web Xml ; do
-    rm -rf "$PYDIR"/site-packages/PyQt5/Qt/lib/libQt5${component}*
-    rm -rf "$PYDIR"/site-packages/PyQt5/Qt${component}*
-done
-rm -rf "$PYDIR"/site-packages/PyQt5/Qt.so
-
-# these are deleted as they were not deterministic; and are not needed anyway
-find "$APPDIR" -path '*/__pycache__*' -delete
-# note that jsonschema-*.dist-info is needed by that package as it uses 'pkg_resources.get_distribution'
-# also, see https://gitlab.com/python-devs/importlib_metadata/issues/71
-for f in "$PYDIR"/site-packages/jsonschema-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done
-for f in "$PYDIR"/site-packages/importlib_metadata-*.dist-info; do mv "$f" "$(echo "$f" | sed s/\.dist-info/\.dist-info2/)"; done
-rm -rf "$PYDIR"/site-packages/*.dist-info/
-rm -rf "$PYDIR"/site-packages/*.egg-info/
-for f in "$PYDIR"/site-packages/jsonschema-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done
-for f in "$PYDIR"/site-packages/importlib_metadata-*.dist-info2; do mv "$f" "$(echo "$f" | sed s/\.dist-info2/\.dist-info/)"; done
-
-
-find -exec touch -h -d '2000-11-11T11:11:11+00:00' {} +
-
-
-info "creating the AppImage."
-(
-    cd "$BUILDDIR"
-    cp "$CACHEDIR/appimagetool" "$CACHEDIR/appimagetool_copy"
-    # zero out "appimage" magic bytes, as on some systems they confuse the linker
-    sed -i 's|AI\x02|\x00\x00\x00|' "$CACHEDIR/appimagetool_copy"
-    chmod +x "$CACHEDIR/appimagetool_copy"
-    "$CACHEDIR/appimagetool_copy" --appimage-extract
-    # We build a small wrapper for mksquashfs that removes the -mkfs-fixed-time option
-    # that mksquashfs from squashfskit does not support. It is not needed for squashfskit.
-    cat > ./squashfs-root/usr/lib/appimagekit/mksquashfs << EOF
-#!/bin/sh
-args=\$(echo "\$@" | sed -e 's/-mkfs-fixed-time 0//')
-"$MKSQUASHFS" \$args
-EOF
-    env VERSION="$VERSION" ARCH=x86_64 SOURCE_DATE_EPOCH=1530212462 ./squashfs-root/AppRun --no-appstream --verbose "$APPDIR" "$APPIMAGE"
-)
-
-
-info "done."
-ls -la "$DISTDIR"
-sha256sum "$DISTDIR"/*

contrib/build-linux/appimage/patches/python-3.7-reproducible-buildinfo.diff

@@ -1,13 +0,0 @@
-# DP: Build getbuildinfo.o with DATE/TIME values when defined
-
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -766,6 +766,8 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
- 	      -DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
- 	      -DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
- 	      -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
-+	      $(if $(BUILD_DATE),-DDATE='"$(BUILD_DATE)"') \
-+	      $(if $(BUILD_TIME),-DTIME='"$(BUILD_TIME)"') \
- 	      -o $@ $(srcdir)/Modules/getbuildinfo.c
- 
- Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile

contrib/build-osx/README.md

@@ -0,0 +1,36 @@
+Building Mac OS binaries
+========================
+
+This guide explains how to build Electrum binaries for macOS systems.
+
+The build process consists of two steps:
+
+## 1. Building the binary
+
+This needs to be done on a system running macOS or OS X. We use El Capitan (10.11.6) as building it on High Sierra
+makes the binaries incompatible with older versions. 
+
+Before starting, make sure that the Xcode command line tools are installed (e.g. you have `git`).
+
+
+    cd electrum
+    ./contrib/build-osx/make_osx
+    
+This creates a folder named Electrum.app.
+
+## 2. Building the image 
+The usual way to distribute macOS applications is to use image files containing the 
+application. Although these images can be created on a Mac with the built-in `hdiutil`,
+they are not deterministic.
+
+Instead, we use the toolchain that Bitcoin uses: genisoimage and libdmg-hfsplus.
+These tools do not work on macOS, so you need a separate Linux machine (or VM).
+
+Copy the Electrum.app directory over and install the dependencies, e.g.:
+
+    apt install libcap-dev cmake make gcc faketime
+    
+Then you can just invoke `package.sh` with the path to the app:
+
+    cd electrum
+    ./contrib/build-osx/package.sh ~/Electrum.app/

contrib/build-osx/base.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+RED='\033[0;31m'
+BLUE='\033[0,34m'
+NC='\033[0m' # No Color
+function info {
+	printf "\r💬 ${BLUE}INFO:${NC}  ${1}\n"
+}
+function fail {
+    printf "\r🗯 ${RED}ERROR:${NC} ${1}\n"
+    exit 1
+}

contrib/build-osx/make_osx

@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+
+# Parameterize
+PYTHON_VERSION=3.6.4
+BUILDDIR=/tmp/electrum-build
+PACKAGE=Electrum
+GIT_REPO=https://github.com/spesmilo/electrum
+LIBSECP_VERSION=452d8e4d2a2f9f1b5be6b02e18f1ba102e5ca0b4
+
+. $(dirname "$0")/base.sh
+
+src_dir=$(dirname "$0")
+cd $src_dir/../..
+
+export PYTHONHASHSEED=22
+VERSION=`git describe --tags --dirty`
+
+which brew > /dev/null 2>&1 || fail "Please install brew from https://brew.sh/ to continue"
+
+info "Installing Python $PYTHON_VERSION"
+export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.6/bin:$PATH"
+if [ -d "~/.pyenv" ]; then
+  pyenv update
+else
+  curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1
+fi
+PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
+pyenv global $PYTHON_VERSION || \
+fail "Unable to use Python $PYTHON_VERSION"
+
+
+info "Installing pyinstaller"
+python3 -m pip install git+https://github.com/ecdsa/pyinstaller@fix_2952 -I --user || fail "Could not install pyinstaller"
+
+info "Using these versions for building $PACKAGE:"
+sw_vers
+python3 --version
+echo -n "Pyinstaller "
+pyinstaller --version
+
+rm -rf ./dist
+
+git submodule init
+git submodule update
+
+rm  -rf $BUILDDIR > /dev/null 2>&1
+mkdir $BUILDDIR
+
+cp -R ./contrib/deterministic-build/electrum-locale/locale/ ./lib/locale/
+cp    ./contrib/deterministic-build/electrum-icons/icons_rc.py ./gui/qt/
+
+
+info "Downloading libusb..."
+curl https://homebrew.bintray.com/bottles/libusb-1.0.22.el_capitan.bottle.tar.gz | \
+tar xz --directory $BUILDDIR
+cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/build-osx
+
+info "Building libsecp256k1"
+brew install autoconf automake libtool
+git clone https://github.com/bitcoin-core/secp256k1 $BUILDDIR/secp256k1
+pushd $BUILDDIR/secp256k1
+git reset --hard $LIBSECP_VERSION
+git clean -f -x -q
+./autogen.sh
+./configure --enable-module-recovery --enable-experimental --enable-module-ecdh --disable-jni
+make
+popd
+cp $BUILDDIR/secp256k1/.libs/libsecp256k1.0.dylib contrib/build-osx
+
+
+info "Installing requirements..."
+python3 -m pip install -Ir ./contrib/deterministic-build/requirements.txt --user && \
+python3 -m pip install -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \
+fail "Could not install requirements"
+
+info "Installing hardware wallet requirements..."
+python3 -m pip install -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
+fail "Could not install hardware wallet requirements"
+
+info "Building $PACKAGE..."
+python3 setup.py install --user > /dev/null || fail "Could not build $PACKAGE"
+
+info "Faking timestamps..."
+for d in ~/Library/Python/ ~/.pyenv .; do
+  pushd $d
+  find . -exec touch -t '200101220000' {} +
+  popd
+done
+
+info "Building binary"
+pyinstaller --noconfirm --ascii --name $VERSION contrib/build-osx/osx.spec || fail "Could not build binary"
+
+info "Creating .DMG"
+hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrum-$VERSION.dmg || fail "Could not create .DMG"

contrib/build-osx/osx.spec

@@ -0,0 +1,97 @@
+# -*- mode: python -*-
+
+from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs
+
+import sys
+import os
+
+PACKAGE='Electrum'
+PYPKG='electrum'
+MAIN_SCRIPT='electrum'
+ICONS_FILE='electrum.icns'
+
+for i, x in enumerate(sys.argv):
+    if x == '--name':
+        VERSION = sys.argv[i+1]
+        break
+else:
+    raise Exception('no version')
+
+electrum = os.path.abspath(".") + "/"
+block_cipher = None
+
+# see https://github.com/pyinstaller/pyinstaller/issues/2005
+hiddenimports = []
+hiddenimports += collect_submodules('trezorlib')
+hiddenimports += collect_submodules('btchip')
+hiddenimports += collect_submodules('keepkeylib')
+hiddenimports += collect_submodules('websocket')
+
+datas = [
+    (electrum+'lib/*.json', PYPKG),
+    (electrum+'lib/wordlist/english.txt', PYPKG + '/wordlist'),
+    (electrum+'lib/locale', PYPKG + '/locale'),
+    (electrum+'plugins', PYPKG + '_plugins'),
+]
+datas += collect_data_files('trezorlib')
+datas += collect_data_files('btchip')
+datas += collect_data_files('keepkeylib')
+
+# Add libusb so Trezor will work
+binaries = [(electrum + "contrib/build-osx/libusb-1.0.dylib", ".")]
+binaries += [(electrum + "contrib/build-osx/libsecp256k1.0.dylib", ".")]
+
+# Workaround for "Retro Look":
+binaries += [b for b in collect_dynamic_libs('PyQt5') if 'macstyle' in b[0]]
+
+# We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
+a = Analysis([electrum+MAIN_SCRIPT,
+              electrum+'gui/qt/main_window.py',
+              electrum+'gui/text.py',
+              electrum+'lib/util.py',
+              electrum+'lib/wallet.py',
+              electrum+'lib/simple_config.py',
+              electrum+'lib/bitcoin.py',
+              electrum+'lib/dnssec.py',
+              electrum+'lib/commands.py',
+              electrum+'plugins/cosigner_pool/qt.py',
+              electrum+'plugins/email_requests/qt.py',
+              electrum+'plugins/trezor/client.py',
+              electrum+'plugins/trezor/qt.py',
+              electrum+'plugins/keepkey/qt.py',
+              electrum+'plugins/ledger/qt.py',
+              ],
+             binaries=binaries,
+             datas=datas,
+             hiddenimports=hiddenimports,
+             hookspath=[])
+
+# http://stackoverflow.com/questions/19055089/pyinstaller-onefile-warning-pyconfig-h-when-importing-scipy-or-scipy-signal
+for d in a.datas:
+    if 'pyconfig' in d[0]:
+        a.datas.remove(d)
+        break
+
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(pyz,
+          a.scripts,
+          a.binaries,
+          a.datas,
+          name=PACKAGE,
+          debug=False,
+          strip=False,
+          upx=True,
+          icon=electrum+ICONS_FILE,
+          console=False)
+
+app = BUNDLE(exe,
+             version = VERSION,
+             name=PACKAGE + '.app',
+             icon=electrum+ICONS_FILE,
+             bundle_identifier=None,
+             info_plist={
+                'NSHighResolutionCapable': 'True',
+                'NSSupportsAutomaticGraphicsSwitching': 'True'
+             }
+)

contrib/build-osx/package.sh

@@ -85,4 +85,4 @@ dmg dmg Electrum_uncompressed.dmg electrum-$VERSION.dmg || fail "Unable to creat
 rm Electrum_uncompressed.dmg
 
 echo "Done."
-sha256sum electrum-$VERSION.dmg
+md5sum electrum-$VERSION.dmg

contrib/build-wine/Dockerfile

@@ -1,43 +0,0 @@
-FROM ubuntu:18.04@sha256:5f4bdc3467537cbbe563e80db2c3ec95d548a9145d64453b06939c4592d67b6d
-
-ENV LC_ALL=C.UTF-8 LANG=C.UTF-8
-
-RUN dpkg --add-architecture i386 && \
-    apt-get update -q && \
-    apt-get install -qy \
-        wget=1.19.4-1ubuntu2.2 \
-        gnupg2=2.2.4-1ubuntu1.2 \
-        dirmngr=2.2.4-1ubuntu1.2 \
-        python3-software-properties=0.96.24.32.1 \
-        software-properties-common=0.96.24.32.1
-
-RUN apt-get update -q && \
-        apt-get install -qy \
-        git=1:2.17.1-1ubuntu0.5 \
-        p7zip-full=16.02+dfsg-6 \
-        make=4.1-9.1ubuntu1 \
-        mingw-w64=5.0.3-1 \
-        autotools-dev=20180224.1 \
-        autoconf=2.69-11 \
-        libtool=2.4.6-2 \
-        gettext=0.19.8.1-6
-
-RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
-        echo "c51bcb8cc4a12abfbd7c7660eaf90f49674d15e222c262f27e6c96429111b822 Release.key" | sha256sum -c - && \
-        apt-key add Release.key && \
-        rm Release.key && \
-    wget -nc https://dl.winehq.org/wine-builds/winehq.key && \
-        echo "78b185fabdb323971d13bd329fefc8038e08559aa51c4996de18db0639a51df6 winehq.key" | sha256sum -c - && \
-        apt-key add winehq.key && \
-        rm winehq.key && \
-    apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ && \
-    apt-get update -q && \
-    apt-get install -qy \
-        wine-stable-amd64:amd64=4.0.3~bionic \
-        wine-stable-i386:i386=4.0.3~bionic \
-        wine-stable:amd64=4.0.3~bionic \
-        winehq-stable:amd64=4.0.3~bionic
-
-RUN rm -rf /var/lib/apt/lists/* && \
-    apt-get autoremove -y && \
-    apt-get clean

contrib/build-wine/README.md

@@ -1,100 +1,39 @@
-Windows binaries
+Windows Binary Builds
-================
+=====================
 
-✓ _These binaries should be reproducible, meaning you should be able to generate
+These scripts can be used for cross-compilation of Windows Electrum executables from Linux/Wine.
-   binaries that match the official releases._
+Produced binaries are deterministic, so 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. The docker commands should be executed in the project's root
-folder.
-
-1. Install Docker
-
-    ```
-    $ curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    $ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    $ sudo apt-get update
-    $ sudo apt-get install -y docker-ce
-    ```
-
-2. Build image
-
-    ```
-    $ sudo docker build -t electrum-wine-builder-img contrib/build-wine
-    ```
-
-    Note: see [this](https://stackoverflow.com/a/40516974/7499128) if having dns problems
-
-3. Build Windows binaries
-
-    It's recommended to build from a fresh clone
-    (but you can skip this if reproducibility is not necessary).
-
-    ```
-    $ FRESH_CLONE=contrib/build-wine/fresh_clone && \
-        sudo rm -rf $FRESH_CLONE && \
-        mkdir -p $FRESH_CLONE && \
-        cd $FRESH_CLONE  && \
-        git clone https://github.com/spesmilo/electrum.git && \
-        cd electrum
-    ```
-
-    And then build from this directory:
-    ```
-    $ git checkout $REV
-    $ sudo docker run -it \
-        --name electrum-wine-builder-cont \
-        -v $PWD:/opt/wine64/drive_c/electrum \
-        --rm \
-        --workdir /opt/wine64/drive_c/electrum/contrib/build-wine \
-        electrum-wine-builder-img \
-        ./build.sh
-    ```
-4. The generated binaries are in `./contrib/build-wine/dist`.
 
 
-
+Usage:
-Code Signing
-============
-
-Electrum Windows builds are signed with a Microsoft Authenticode™ code signing
-certificate in addition to the GPG-based signatures.
-
-The advantage of using Authenticode is that Electrum users won't receive a 
-Windows SmartScreen warning when starting it.
-
-The release signing procedure involves a signer (the holder of the
-certificate/key) and one or multiple trusted verifiers:
 
 
-| Signer                                                    | Verifier                          |
+1. Install the following dependencies:
-|-----------------------------------------------------------|-----------------------------------|
-| Build .exe files using `build.sh`                         |                                   |
-| Sign .exe with `./sign.sh`                                |                                   |
-| Upload signed files to download server                    |                                   |
-|                                                           | Build .exe files using `build.sh` |
-|                                                           | Compare files using `unsign.sh`   |
-|                                                           | Sign .exe file using `gpg -b`     |
 
-| Signer and verifiers:                                                                         |
+ - dirmngr
-|-----------------------------------------------------------------------------------------------|
+ - gpg
-| Upload signatures to 'electrum-signatures' repo, as `$version/$filename.$builder.asc`         |
+ - 7Zip
+ - Wine (>= v2)
+ - mingw-w64
 
 
+For example:
 
-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
+$ sudo apt-get install wine-development dirmngr gnupg2 p7zip-full mingw-w64
-is not reproducible.
+$ wine --version
+ wine-2.0 (Debian 2.0-3+b2)
+```
 
-This procedure removes the differences between the signed and unsigned binary:
+or
 
-1. Remove the signature from the signed binary using osslsigncode or signtool.
+```
-2. Set the COFF image checksum for the signed binary to 0x0. This is necessary
+$ pacman -S wine gnupg
-   because pyinstaller doesn't generate a checksum.
+$ wine --version
-3. Append null bytes to the _unsigned_ binary until the byte count is a multiple
+ wine-2.21
-   of 8.
+```
 
-The script `unsign.sh` performs these steps.
+2. Make sure `/opt` is writable by the current user.
+3. Run `build.sh`.
+4. The generated binaries are in `./dist`.

contrib/build-wine/build-electrum-git.sh

@@ -1,74 +1,87 @@
 #!/bin/bash
 
 NAME_ROOT=electrum
+PYTHON_VERSION=3.5.4
 
 # These settings probably don't need any change
 export WINEPREFIX=/opt/wine64
-export WINEDEBUG=-all
 export PYTHONDONTWRITEBYTECODE=1
+export PYTHONHASHSEED=22
 
-PYHOME=c:/python3
+PYHOME=c:/python$PYTHON_VERSION
 PYTHON="wine $PYHOME/python.exe -OO -B"
 
 
 # Let's begin!
+cd `dirname $0`
 set -e
 
-here="$(dirname "$(readlink -e "$0")")"
+mkdir -p tmp
+cd tmp
 
-. "$CONTRIB"/build_tools_util.sh
+if [ -d ./electrum ]; then
+  rm ./electrum -rf
+fi
 
-pushd $WINEPREFIX/drive_c/electrum
+git clone https://github.com/spesmilo/electrum -b master
 
-VERSION=`git describe --tags --dirty --always`
+pushd electrum
-info "Last commit: $VERSION"
+if [ ! -z "$1" ]; then
+    # a commit/tag/branch was specified
+    if ! git cat-file -e "$1" 2> /dev/null
+    then  # can't find target
+        # try pull requests
+        git config --local --add remote.origin.fetch '+refs/pull/*/merge:refs/remotes/origin/pr/*'
+        git fetch --all
+    fi
+    git checkout $1
+fi
 
-# Load electrum-locale for this release
+# Load electrum-icons and electrum-locale for this release
-git submodule update --init
+git submodule init
+git submodule update
 
 pushd ./contrib/deterministic-build/electrum-locale
-if ! which msgfmt > /dev/null 2>&1; then
-    fail "Please install gettext"
-fi
 for i in ./locale/*; do
-    dir=$WINEPREFIX/drive_c/electrum/electrum/$i/LC_MESSAGES
+    dir=$i/LC_MESSAGES
     mkdir -p $dir
     msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
 done
 popd
 
+VERSION=`git describe --tags --dirty`
+echo "Last commit: $VERSION"
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
+rm -rf $WINEPREFIX/drive_c/electrum
+cp -r electrum $WINEPREFIX/drive_c/electrum
+cp electrum/LICENCE .
+cp -r ./electrum/contrib/deterministic-build/electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/
+cp ./electrum/contrib/deterministic-build/electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/
 
 # Install frozen dependencies
-$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements.txt
+$PYTHON -m pip install -r ../../deterministic-build/requirements.txt
 
-$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-hw.txt
+$PYTHON -m pip install -r ../../deterministic-build/requirements-hw.txt
 
 pushd $WINEPREFIX/drive_c/electrum
-# see https://github.com/pypa/pip/issues/2195 -- pip makes a copy of the entire directory
+$PYTHON setup.py install
-info "Pip installing Electrum. This might take a long time if the project folder is large."
-$PYTHON -m pip install --no-dependencies --no-warn-script-location .
 popd
 
-
+cd ..
-# these are deleted as they were not deterministic; and are not needed anyway
-rm "$WINEPREFIX"/drive_c/python3/Lib/site-packages/jsonschema-*.dist-info/RECORD
-
 
 rm -rf dist/
 
 # build standalone and portable versions
-info "Running pyinstaller..."
+wine "C:/python$PYTHON_VERSION/scripts/pyinstaller.exe" --noconfirm --ascii --name $NAME_ROOT-$VERSION -w deterministic.spec
-wine "$PYHOME/scripts/pyinstaller.exe" --noconfirm --ascii --clean --name $NAME_ROOT-$VERSION -w deterministic.spec
 
 # set timestamps in dist, in order to make the installer reproducible
 pushd dist
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 
-info "building NSIS installer"
+# build NSIS installer
 # $VERSION could be passed to the electrum.nsi script, but this would require some rewriting in the script itself.
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
@@ -76,46 +89,5 @@ cd dist
 mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe
 cd ..
 
-info "Padding binaries to 8-byte boundaries, and fixing COFF image checksum in PE header"
+echo "Done."
-# note: 8-byte boundary padding is what osslsigncode uses:
+md5sum dist/electrum*exe
-#       https://github.com/mtrojnar/osslsigncode/blob/6c8ec4427a0f27c145973450def818e35d4436f6/osslsigncode.c#L3047
-(
-    cd dist
-    for binary_file in ./*.exe; do
-        info ">> fixing $binary_file..."
-        # code based on https://github.com/erocarrera/pefile/blob/bbf28920a71248ed5c656c81e119779c131d9bd4/pefile.py#L5877
-        python3 <<EOF
-pe_file = "$binary_file"
-with open(pe_file, "rb") as f:
-    binary = bytearray(f.read())
-pe_offset = int.from_bytes(binary[0x3c:0x3c+4], byteorder="little")
-checksum_offset = pe_offset + 88
-checksum = 0
-
-# Pad data to 8-byte boundary.
-remainder = len(binary) % 8
-binary += bytes(8 - remainder)
-
-for i in range(len(binary) // 4):
-    if i == checksum_offset // 4:  # Skip the checksum field
-        continue
-    dword = int.from_bytes(binary[i*4:i*4+4], byteorder="little")
-    checksum = (checksum & 0xffffffff) + dword + (checksum >> 32)
-    if checksum > 2 ** 32:
-        checksum = (checksum & 0xffffffff) + (checksum >> 32)
-
-checksum = (checksum & 0xffff) + (checksum >> 16)
-checksum = (checksum) + (checksum >> 16)
-checksum = checksum & 0xffff
-checksum += len(binary)
-
-# Set the checksum
-binary[checksum_offset : checksum_offset + 4] = int.to_bytes(checksum, byteorder="little", length=4)
-
-with open(pe_file, "wb") as f:
-    f.write(binary)
-EOF
-    done
-)
-
-sha256sum dist/electrum*.exe

contrib/build-wine/build-secp256k1.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+# heavily based on https://github.com/ofek/coincurve/blob/417e726f553460f88d7edfa5dc67bfda397c4e4a/.travis/build_windows_wheels.sh
+
+set -e
+
+build_dll() {
+    #sudo apt-get install -y mingw-w64
+    ./autogen.sh
+    echo "LDFLAGS = -no-undefined" >> Makefile.am
+    ./configure --host=$1 --enable-module-recovery --enable-experimental --enable-module-ecdh --disable-jni
+    make
+}
+
+
+cd /tmp/electrum-build
+
+if [ ! -d secp256k1 ]; then
+    git clone https://github.com/bitcoin-core/secp256k1.git
+    cd secp256k1;
+else
+    cd secp256k1
+    git pull
+fi
+
+git reset --hard 452d8e4d2a2f9f1b5be6b02e18f1ba102e5ca0b4
+git clean -f -x -q
+
+build_dll i686-w64-mingw32  # 64-bit would be: x86_64-w64-mingw32
+mv .libs/libsecp256k1-0.dll libsecp256k1.dll
+
+find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
+
+echo "building libsecp256k1 finished"

contrib/build-wine/build.sh

@@ -1,43 +1,32 @@
 #!/bin/bash
+# Lucky number
+export PYTHONHASHSEED=22
 
-set -e
+if [ ! -z "$1" ]; then
+    to_build="$1"
+fi
 
-here="$(dirname "$(readlink -e "$0")")"
+here=$(dirname "$0")
 test -n "$here" -a -d "$here" || exit
 
-export CONTRIB="$here/.."
+echo "Clearing $here/build and $here/dist..."
-export PROJECT_ROOT="$CONTRIB/.."
-export CACHEDIR="$here/.cache"
-export PIP_CACHE_DIR="$CACHEDIR/pip_cache"
-
-export BUILD_TYPE="wine"
-export GCC_TRIPLET_HOST="i686-w64-mingw32"
-export GCC_TRIPLET_BUILD="x86_64-pc-linux-gnu"
-export GCC_STRIP_BINARIES="1"
-
-. "$CONTRIB"/build_tools_util.sh
-
-info "Clearing $here/build and $here/dist..."
 rm "$here"/build/* -rf
 rm "$here"/dist/* -rf
 
-mkdir -p "$CACHEDIR" "$PIP_CACHE_DIR"
+mkdir -p /tmp/electrum-build
+mkdir -p /tmp/electrum-build/pip-cache
+export PIP_CACHE_DIR="/tmp/electrum-build/pip-cache"
 
-if [ -f "$PROJECT_ROOT/electrum/libsecp256k1-0.dll" ]; then
+$here/build-secp256k1.sh || exit 1
-    info "libsecp256k1 already built, skipping"
-else
-    "$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
-fi
 
-$here/prepare-wine.sh || fail "prepare-wine failed"
+$here/prepare-wine.sh || exit 1
 
-info "Resetting modification time in C:\Python..."
+echo "Resetting modification time in C:\Python..."
 # (Because of some bugs in pyinstaller)
 pushd /opt/wine64/drive_c/python*
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
 ls -l /opt/wine64/drive_c/python*
 
-$here/build-electrum-git.sh || fail "build-electrum-git failed"
+$here/build-electrum-git.sh $to_build && \
-
+echo "Done."
-info "Done."

contrib/build-wine/deterministic.spec

@@ -10,63 +10,53 @@ for i, x in enumerate(sys.argv):
 else:
     raise Exception('no name')
 
-PYHOME = 'c:/python3'
+PYTHON_VERSION = '3.5.4'
+PYHOME = 'c:/python' + PYTHON_VERSION
 
 home = 'C:\\electrum\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
 hiddenimports += collect_submodules('trezorlib')
-hiddenimports += collect_submodules('safetlib')
 hiddenimports += collect_submodules('btchip')
 hiddenimports += collect_submodules('keepkeylib')
 hiddenimports += collect_submodules('websocket')
-hiddenimports += collect_submodules('ckcc')
-hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
 
-
+# Add libusb binary
-binaries = []
+binaries = [(PYHOME+"/libusb-1.0.dll", ".")]
 
 # Workaround for "Retro Look":
 binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]]
 
-binaries += [('C:/tmp/libsecp256k1-0.dll', '.')]
+binaries += [('C:/tmp/libsecp256k1.dll', '.')]
-binaries += [('C:/tmp/libusb-1.0.dll', '.')]
 
 datas = [
-    (home+'electrum/*.json', 'electrum'),
+    (home+'lib/*.json', 'electrum'),
-    (home+'electrum/wordlist/english.txt', 'electrum/wordlist'),
+    (home+'lib/wordlist/english.txt', 'electrum/wordlist'),
-    (home+'electrum/locale', 'electrum/locale'),
+    (home+'lib/locale', 'electrum/locale'),
-    (home+'electrum/plugins', 'electrum/plugins'),
+    (home+'plugins', 'electrum_plugins'),
-    ('C:\\Program Files (x86)\\ZBar\\bin\\', '.'),
+    ('C:\\Program Files (x86)\\ZBar\\bin\\', '.')
-    (home+'electrum/gui/icons', 'electrum/gui/icons'),
 ]
 datas += collect_data_files('trezorlib')
-datas += collect_data_files('safetlib')
 datas += collect_data_files('btchip')
 datas += collect_data_files('keepkeylib')
-datas += collect_data_files('ckcc')
-datas += collect_data_files('jsonrpcserver')
-datas += collect_data_files('jsonrpcclient')
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis([home+'run_electrum',
+a = Analysis([home+'electrum',
-              home+'electrum/gui/qt/main_window.py',
+              home+'gui/qt/main_window.py',
-              home+'electrum/gui/text.py',
+              home+'gui/text.py',
-              home+'electrum/util.py',
+              home+'lib/util.py',
-              home+'electrum/wallet.py',
+              home+'lib/wallet.py',
-              home+'electrum/simple_config.py',
+              home+'lib/simple_config.py',
-              home+'electrum/bitcoin.py',
+              home+'lib/bitcoin.py',
-              home+'electrum/dnssec.py',
+              home+'lib/dnssec.py',
-              home+'electrum/commands.py',
+              home+'lib/commands.py',
-              home+'electrum/plugins/cosigner_pool/qt.py',
+              home+'plugins/cosigner_pool/qt.py',
-              home+'electrum/plugins/email_requests/qt.py',
+              home+'plugins/email_requests/qt.py',
-              home+'electrum/plugins/trezor/qt.py',
+              home+'plugins/trezor/client.py',
-              home+'electrum/plugins/safe_t/client.py',
+              home+'plugins/trezor/qt.py',
-              home+'electrum/plugins/safe_t/qt.py',
+              home+'plugins/keepkey/qt.py',
-              home+'electrum/plugins/keepkey/qt.py',
+              home+'plugins/ledger/qt.py',
-              home+'electrum/plugins/ledger/qt.py',
-              home+'electrum/plugins/coldcard/qt.py',
               #home+'packages/requests/utils.py'
               ],
              binaries=binaries,
@@ -78,28 +68,10 @@ a = Analysis([home+'run_electrum',
 
 # http://stackoverflow.com/questions/19055089/pyinstaller-onefile-warning-pyconfig-h-when-importing-scipy-or-scipy-signal
 for d in a.datas:
-    if 'pyconfig' in d[0]:
+    if 'pyconfig' in d[0]: 
         a.datas.remove(d)
         break
 
-# Strip out parts of Qt that we never use. Reduces binary size by tens of MBs. see #4815
-qt_bins2remove=('qt5web', 'qt53d', 'qt5game', 'qt5designer', 'qt5quick',
-                'qt5location', 'qt5test', 'qt5xml', r'pyqt5\qt\qml\qtquick')
-print("Removing Qt binaries:", *qt_bins2remove)
-for x in a.binaries.copy():
-    for r in qt_bins2remove:
-        if x[0].lower().startswith(r):
-            a.binaries.remove(x)
-            print('----> Removed x =', x)
-
-qt_data2remove=(r'pyqt5\qt\translations\qtwebengine_locales', )
-print("Removing Qt datas:", *qt_data2remove)
-for x in a.datas.copy():
-    for r in qt_data2remove:
-        if x[0].lower().startswith(r):
-            a.datas.remove(x)
-            print('----> Removed x =', x)
-
 # hotfix for #3171 (pre-Win10 binaries)
 a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')]
 
@@ -113,12 +85,12 @@ exe_standalone = EXE(
     pyz,
     a.scripts,
     a.binaries,
-    a.datas,
+    a.datas, 
     name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + ".exe"),
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'electrum/gui/icons/electrum.ico',
+    icon=home+'icons/electrum.ico',
     console=False)
     # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
@@ -131,7 +103,7 @@ exe_portable = EXE(
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'electrum/gui/icons/electrum.ico',
+    icon=home+'icons/electrum.ico',
     console=False)
 
 #####
@@ -145,7 +117,7 @@ exe_dependent = EXE(
     debug=False,
     strip=None,
     upx=False,
-    icon=home+'electrum/gui/icons/electrum.ico',
+    icon=home+'icons/electrum.ico',
     console=False)
 
 coll = COLLECT(
@@ -156,6 +128,6 @@ coll = COLLECT(
     strip=None,
     upx=True,
     debug=False,
-    icon=home+'electrum/gui/icons/electrum.ico',
+    icon=home+'icons/electrum.ico',
     console=False,
     name=os.path.join('dist', 'electrum'))

contrib/build-wine/electrum.nsi

@@ -58,7 +58,7 @@
   VIAddVersionKey ProductName "${PRODUCT_NAME} Installer"
   VIAddVersionKey Comments "The installer for ${PRODUCT_NAME}"
   VIAddVersionKey CompanyName "${PRODUCT_NAME}"
-  VIAddVersionKey LegalCopyright "2013-2018 ${PRODUCT_PUBLISHER}"
+  VIAddVersionKey LegalCopyright "2013-2016 ${PRODUCT_PUBLISHER}"
   VIAddVersionKey FileDescription "${PRODUCT_NAME} Installer"
   VIAddVersionKey FileVersion ${PRODUCT_VERSION}
   VIAddVersionKey ProductVersion ${PRODUCT_VERSION}
@@ -72,7 +72,7 @@
   !define MUI_ABORTWARNING
   !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
   
-  !define MUI_ICON "c:\electrum\electrum\gui\icons\electrum.ico"
+  !define MUI_ICON "tmp\electrum\icons\electrum.ico"
   
 ;--------------------------------
 ;Pages
@@ -111,7 +111,7 @@ Section
   
   ;Files to pack into the installer
   File /r "dist\electrum\*.*"
-  File "c:\electrum\electrum\gui\icons\electrum.ico"
+  File "..\..\icons\electrum.ico"
 
   ;Store installation folder
   WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR

contrib/build-wine/gpg_keys/7ED10B6531D7C8E1BC296021FC624643487034E5.asc

@@ -1,108 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: User-ID:	Steve Dower (Python Release Signing) <steve.dower@microsoft.com>
-Comment: Created:	2015-04-06 02:32
-Comment: Type:	4096-bit RSA
-Comment: Usage:	Signing, Encryption, Certifying User-IDs
-Comment: Fingerprint:	7ED10B6531D7C8E1BC296021FC624643487034E5
-
-
-mQINBFUh1AUBEACdUPt6PwJVO23zGZqgtgBeA9JsO22dk3CMzrwPJdUmMd6mcRWa
-vl4BoAba66fuC17GvOgGXimKI+iaw5Vt9QI3uSjUjFSfc24J8T7NB/yAr/0zEcex
-raHD2dxT/JpE/iY0yWHxRlitvwGSw1Qlq3NnY8tDI1DJEJD+gBuCktvVvu1FfQTw
-6bd+aEq0c4sWJHAOnKLuLH0pNFOznnynAFGPGBBsm/YwYc5BP2JVvka775LUjA+W
-1h2Sgg3FAUPIm64pc4Pq6mUo6Tulw72xsWMpCL1/5atXNPXT6rJUOB8euTcNMr4l
-1O6GKSsiLeLAuvq4bmhOKtLzjWzXnY1gDVoOfdgpD6o4ZHk4xiVsdVE8hCa/ylz8
-1ZwRW2gGo2jP8t3hKciR2i+Qs+6lPNZpeFIxa6Uo9ER1IBgCHHapIR/UdcOFyoS0
-MNn7Ui7DLQNM4gI/G17eG9tfvjW2dl4SgFSYWMq/OtXnPDUBGqFUWsn8adOL2PFL
-B7kM5ZRTPc5SnY9hoSGa5E20rJZIXcpy1aygRz/xUjoKwNzAySSEyyIorUxZ8KaH
-EEBQSsqwe04MXIENqnDozH0/cvP4JXEDSl8EkzMSCWSoavQSIYD5pQppyFQpGHqa
-5CuOA25Ja+sgp2xqahtr3fEqZUknPQSoYlnJbaHnzsGSlRAVWMsklsZibQARAQAB
-tEBTdGV2ZSBEb3dlciAoUHl0aG9uIFJlbGVhc2UgU2lnbmluZykgPHN0ZXZlLmRv
-d2VyQG1pY3Jvc29mdC5jb20+iQEcBBABCAAGBQJYsBphAAoJEEhSKohZ29goZggI
-ALKlgyoecD5v3ulh1eoctRqtCOxkAoENEfPt3l5x6N8Wq89yHzf10T1rVioEXOHh
-Di1m37DDoQmRJD0sOYQymq10xDGRYAJjyOf3X0pvRkZ+F7T0U4dSV3DasLIHcN26
-kRwv1yCYsf0QvhgT6EJZKyUNHtV9qrb9u3A1Zp6epC/EyT8zMZj+21GzTUrnbnug
-3Ak9p7+APCZS4Ahh9ZHFuD38MZ7+OwrUd6ot+6cbb1nnQLSAGQOHSp6EP6ktrnsK
-zts0L+tzHurxtJgUkR01imJuSFfYpLoZa/L7qXNyEpEUTC/SWzRWD9y2QkM7DLzX
-caReVAyJr9rix1lDQbEFIquJAhwEEAEIAAYFAlW2TwMACgkQKeBHm5nIo5fahg/+
-IQSSE/yH8Cf82PYI7IGqDVNwRw2o7dq8iscB+fhFHfFFhXANwUUFpzPeDMrMrdmq
-Bke7Vg1D3bIFocXYOiNwf2J7f4mBO6OL0VAvDX02Vyh/C2ZSc15uZyU6CWFQMCG8
-JOSmgQFs3kMHkL4qtut1Y5reoYesmteIe06UVyRw8yT1R1BkxP2whZ97qwsvUUE9
-cVD08wCvH486efw7EswIzYGa1KcZXji0MvjXfksVtkEQQbxMMI7SVXo0345ZReww
-buioGL5gvvAPObgU43skORanFHFxiHEKmqgHBHXK/LKqaFUFMKcb4iFTNs2XKrhE
-XsEi5EMI1AFsJzjcXRqT50Wi2cZhXeRc70uF6gzqrdWvowa2oOPiO6zGDiTqZCW1
-AArk/QBzGtPjVh+nKEdHwnvpK9913UAkAN682h8QkoVPYXOvIKDYZRBr5EfpUyQt
-y2r9MYewz0YN4zlGP1PFS9FxncdSZiZJqQVif0CkOp1tdSxLynHcujQgATZNtgcu
-X9JwUwPp60MurgOcIZiW3nZw/z/5vzBBadSa9/TIFSJAFNBlqeKdIGQuik0UH+Cz
-RRtSFb38F7jMPwr0QUSktuntQ0HWuvNqj4N8DFm45/n5rN190eRotrVDXZmjGein
-qWPITuICslGIKAp+Q6y3t7JA71MIbeu/ZY6ZcftOka6JAhwEEAEIAAYFAlZRWicA
-CgkQxiNM8COVzQq5bRAAktnXceO3GCivMt9yR1Qr0Ov4A4Q+CJSIL45efLFmS30k
-cbkHHtaq+0FZNh2ZaMartC16MUja4a2OUejg53VBhaSVkQrVk/6M/HA6/o6CvIhb
-FW/5C+nRWBd5gfvwsWvjrtC3cKZco4wg+yYclkDbSH+2EPDZOKIHpBy46YTz9WQ1
-8SJ51WVkNUNiZqRBA6Ny5GFoyd6EpWZYEPelmzNemv3zOrQdVzLV24/mLejcLL2t
-KmI6ngX4XViXUCRUU3MH8/V+V2YTQGcTM/6HGaHpN0LTqknf6zEto9q9FiRTaiU2
-kzExhBq8Qf+cVqwm+1kMt0FGOgpT47VBWMeUWq62gQ3h5NfAs4DfriLgNURlTC1d
-JYAEquFhB/8oBQD1h/d9CjQyk88iib2pJInRBDsK2FcfQBap9iaeBFYoBWTzMQJx
-g+RuWK1wIm2n0oqa5urBYZtRHE5RIdDP8ZLogrBOFkfXGJxlRBQD1Gab77qohdp0
-SnErGw4Ne3gJH/SNhK+zzHkHERIrRZCR95zdYkKfZ2jyOPzSuABVRigEQVQPCDn0
-hbv3cblTCeJYwG2mfRdmfyqSMALKIgXe9yvJ2kl8QgaVOsJjNfQzIKeoHFPIm5Uw
-3YB6jgDFc5uzEaH7WSz74A7KhGYjC7huw2TugosHbWxphJKddwxfK1WujYaAeJyJ
-AhwEEAEIAAYFAlf2sPIACgkQfb+tds3soNuXEQ//XkWYHmJsKyeDZC8MFU+/vsVq
-dhnFs6UXZkvf7MoNFkuMDL+zgVoMpFHftTdyBqNAoEnndakk212jK8YWF8g4kQXI
-a9uMRqJLM4mqCl9yco/twJ9z9EMA+JLSXYK0ZbTkLdutSDZEDKgpHbmekx2C1OsW
-lRLs9PahF5PAZQs0N+m+LJBnw6bEHOSTv4OE5uVUf9nvdes3OARvkGSEGURNmUaF
-chxWtZ/SF1q9Jfj0K/xgs9Gt855oueveRXLIGpjiEVoKH/drsgyKFMJVrpZDDgS4
-GVXG8bq3GTFiMAs7BPPd9bjI+jgvqttgItZcYsW/IQK1BIoG6Fere4cPvu+IshCc
-km9T8nOK98tZuov8hLbND9mW2d7LChJI1r/HbzbKIl0k6OigdFMrJlun2zmtDxT9
-Tp3uxOYSaW2YggcpNUjI28tv6AwoA8okVY93LWjO5kdZGkbliRnf/eJy7NJYn0LO
-ogsvMUJClRAGnZTHLEr32Whq0MImlXa43kr6oPJT5dwXXyw5ELstEQztczCd1PYB
-kbQHUpD5j3PwgNVOinCnbd4pc/qVtYSqpg2g6TJi1XiJ1638jhn2k+i8wop/dyet
-iN8lGR76twYGex9AavEAUpVR9r6qfpp4KBibEhdvL6o2O03RQu17GcRzXSAYzmUi
-5U5jZ3dBz5MYUjgUZM+JAhwEEAEKAAYFAllTh9gACgkQXLNh5VL7DRAk7Q//X8eU
-hwEvl/d9Sv2kBNCZFjAW3QmZp2L/sxhScJZXrOFzKUdmjap9Xlul1qr6/Wif7YLK
-bOdNUI7KziEBn+9SEd90XauoVkzU2F0Jn9ILGQfUHAIpocRTKuCwBrncaBozHQwD
-O3Dk33AhZ6lqTv/AVLRKHQXwigGTBJxK4cCEZ+VwK9tKk6BrQB48Rm7pg9HF5ey5
-JGPRWgUnn1v0IJN5ysZ5m9ChYbqF8VwvMw0txmgKgvdDKpXbF/S59Bp4TH/7Dr2D
-kAeNTcuzTFBaFE+siMgksZIYKZ1VkVoiN2qQA7ZaA5LQbUom0WdrKZGefFfPt9ES
-A4wyL3OfxRsmWmd/5Fxrwm1VbzgPoMd1Dc5ExlyqnecdGzDui2bmltNqRJd9ytRq
-6YUGYzXp4qQkWO61CoC3mkm2M8Ex7DGbUtXhdg0zoa08w9lXuOtHVhY7XlLWjO1U
-p8cp4DVxsN/wOXtyH1pcleGo4aEsgyU/DH57prFLGz7Egp2JhRDHnZmlonWp74G1
-VLfqkOqZlqTU4mPA827C8qPCx6cMsRvFS7OEiDBswkFWBKjkUCw4rLC1tBMBCxJW
-tZlc+Y0LNyOryJ3h6EJmRIHO57oLen345e1WOi4ROOC/wQMErFk7B3P41Lqmrwb8
-HGuKn3ca+Aw70hVrZ+7Q3RRFTLlOS/vv107Fqu6JAjkEEwEIACMFAlUh1AUCGwMH
-CwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRD8YkZDSHA05RfdD/97wPXnoe7e
-ipP7UXQ942z1buV6pTGv0Lea2aHn20o2BBjHp97YXroF/e/8W6h+Y+Fq8hWoXdYJ
-dC9DVgzJhvbXAIG8VrF6/IDGQ62r4ff/AIyQY+kiCOCCVhjwuqOTjVYw2pYRUcI3
-UwXVPeptDSXcIZkHCLtEUnS5YMTdkPuZrAmucCCnfcJtevXbHD2yJYP4vwfXMbal
-sNBDKJi6uYAFc4yv+/DyS13rfXJvu2pYGvtRd+fs7mBETvUTubhI440pIss6TX6M
-lxWexX6Ty8vI5HCQT281H4zqdbe5GdzGmIx1EiYx1sJbgSBNqCh5sRJY5/BXzVJ3
-dfM/Mv5QYY4ulO/qUNFdC8f1cZm0euOo3maB4jY+Sjaff7t0WIz0GufO4dHARwJg
-3s0LO9Wf5+z/fbWOMcfvvcfaHNbhaKWk16kslc/g7NYvMfOuleM06YGyGPz//a9c
-baX53OiMupNvLlhyPO5NfGppvRn5xAElcAw1RLhHJcgvTtIs/zVVfHPaK41u8A9c
-XKnmIUC39K4BGvOpPzEvCdQ2ZbAqzQLmZ1UICr15w1Nfs6uoERJbnuq+JgOPOcOk
-ezAWELi5LdZTElnpJpZPTDQ03+3GvxD4R9sR+l5RT8Ul7kF+3PPPzekfQzF+Nisr
-BhPFb2lPt3Hw32FgTTIuXCMRTKEBb/6z77kCDQRVIdQFARAAtmnsZ9A8ovJIJ9Rl
-WeIylEhHRyQifqzgc/r50uDZVPBjewOA462LjH3+F6zFGEkU+q2aqSe0A0SJPF/W
-hj6MNYXLoibxi5D4mGkoIao9ExnXt4LXAc6ogQpY6vFQBJU5Nr8XCefQbm0loa/o
-y5uK8JHLWCZ2jAossnVpzDwNeN27+B8h5+OifnWhQCTun1xz5EJiyc0yoBmf46zf
-mU4CMUBsPvrXcLmw4J3wp35qmrHg1tNyPhd7VBlikMrgtrWX9IaPZ40dnrGG/WjO
-FYB3CKxGb0pTCj7GC4ubxo2upeWZqHLmdIVc7Nzsfp8EcwJbTj+jZ2Zfq6F8y+je
-sbgh8CaxYn4hEs23aPYRq5H4/buVmZhUw3/AAL9ZmyX6AtAQ0HktVtQe7ykP7DLs
-EpeLG+vPJFY363QeDsLHwOoxnZSfGziVlB4N/KqIkixNWcFTG8GSE1zKcdJVNoW+
-3MB3+FtMZWUJhH0FyKg5qLaJCtC7Yo5gsddU+QCqTn6gcZBnMX5j4LaAmW4hh1RX
-ffwwsbfviK5uhXQCeUnbUaokieetDx4s6Kay6t9ahTRr0r/Z3VWzvr+xATxNWZzi
-xTdezCGOB2ycZ0vq4bKXBuN8CAyOy5X1hf7Rc1BiAVQCILHJDtz0Ak/Hax6DAa2A
-Hnx9YlugHQf000KroLEY+GaxqYEAEQEAAYkCHwQYAQgACQUCVSHUBQIbDAAKCRD8
-YkZDSHA05RtyEACdOEmGolL1xG6I+lDVdot6oBZqC9e021aLWqCUpWJFDp0m0aTm
-CfmOI1gTaFjScxhq1W0GPUoJKUZhk3tlVfdSCtUckI+xuWKEfqJYtvUtTXpK4jDe
-aZBovJ3KNpJRIynbr1566zCSQJhHiCGWmE/M5KN3gPsORbCBQXEkONSVsslf1Wm6
-6hU6uqSWUaceD+4fl5LClbck1DPWchAP7+uLKPEOtORyH6KRTgKl73zYo7xU1K4Q
-MN/1aMjobPkqNvvkXnUNwO7QMz18Nx+WqPc4ksJgW1O1aPQ2qL/ARY5jatZ6BBd7
-iytfz7d6JOh0FOIlmhBqbWd7fEGrLsSA+EjBGBwW5BnIMmxP1xhjhwrcI18y8kAK
-5UzdW2hbbAlc2rlsuxEc+xOYh8kGcc+mZ1j/aMn4gALsTbSO/0T+YJhfODNnL1dC
-j7oPbJGmmG6pb/o7P4azBUVC9lHOuV3XlAPjSmJylnNsV7+PxwPlXlvKgh4S4C4Z
-PUc/iPetsxXR2djccOoNxVU4CqJBqYKgul/pUphXkh7QfEKyH+42UETbVhstdBVU
-azJ6SeUnv9ClVDGsCEhfEZfNOnOoDzJGxDfESoAw7ih91vIhTyHHsK83p2HLDMLP
-ptLzx/0AFBfo6MWGGpd2RSnMWNbvh59wiThlDeI+Das3ln5nsAo67dMYdA==
-=fjOq
------END PGP PUBLIC KEY BLOCK-----

contrib/build-wine/prepare-wine.sh

@@ -1,137 +1,145 @@
 #!/bin/bash
 
 # Please update these carefully, some versions won't work under Wine
-NSIS_FILENAME=nsis-3.05-setup.exe
+NSIS_FILENAME=nsis-3.03-setup.exe
 NSIS_URL=https://prdownloads.sourceforge.net/nsis/$NSIS_FILENAME?download
-NSIS_SHA256=1a3cc9401667547b9b9327a177b13485f7c59c2303d4b6183e7bc9e6c8d6bfdb
+NSIS_SHA256=bd3b15ab62ec6b0c7a00f46022d441af03277be893326f6fea8e212dc2d77743
 
 ZBAR_FILENAME=zbarw-20121031-setup.exe
 ZBAR_URL=https://sourceforge.net/projects/zbarw/files/$ZBAR_FILENAME/download
 ZBAR_SHA256=177e32b272fa76528a3af486b74e9cb356707be1c5ace4ed3fcee9723e2c2c02
 
-LIBUSB_REPO="https://github.com/libusb/libusb.git"
+LIBUSB_FILENAME=libusb-1.0.22.7z
-LIBUSB_COMMIT=e782eeb2514266f6738e242cdcb18e3ae1ed06fa
+LIBUSB_URL=https://prdownloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.22/$LIBUSB_FILENAME?download
-# ^ tag v1.0.23
+LIBUSB_SHA256=671f1a420757b4480e7fadc8313d6fb3cbb75ca00934c417c1efa6e77fb8779b
 
-PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git"
+PYTHON_VERSION=3.5.4
-PYINSTALLER_COMMIT=e934539374e30d1500fcdbe8e4eb0860413935b2
-# ^ tag 3.6, plus a custom commit that fixes cross-compilation with MinGW
-
-PYTHON_VERSION=3.7.6
 
 ## These settings probably don't need change
 export WINEPREFIX=/opt/wine64
-export WINEDEBUG=-all
+#export WINEARCH='win32'
 
-PYTHON_FOLDER="python3"
+PYHOME=c:/python$PYTHON_VERSION
-PYHOME="c:/$PYTHON_FOLDER"
 PYTHON="wine $PYHOME/python.exe -OO -B"
 
 
+# based on https://superuser.com/questions/497940/script-to-verify-a-signature-with-gpg
+verify_signature() {
+    local file=$1 keyring=$2 out=
+    if out=$(gpg --no-default-keyring --keyring "$keyring" --status-fd 1 --verify "$file" 2>/dev/null) &&
+       echo "$out" | grep -qs "^\[GNUPG:\] VALIDSIG "; then
+        return 0
+    else
+        echo "$out" >&2
+        exit 1
+    fi
+}
+
+verify_hash() {
+    local file=$1 expected_hash=$2
+    actual_hash=$(sha256sum $file | awk '{print $1}')
+    if [ "$actual_hash" == "$expected_hash" ]; then
+        return 0
+    else
+        echo "$file $actual_hash (unexpected hash)" >&2
+        rm "$file"
+        exit 1
+    fi
+}
+
+download_if_not_exist() {
+    local file_name=$1 url=$2
+    if [ ! -e $file_name ] ; then
+        wget -O $PWD/$file_name "$url"
+    fi
+}
+
+# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/templates/header.sh
+retry() {
+  local result=0
+  local count=1
+  while [ $count -le 3 ]; do
+    [ $result -ne 0 ] && {
+      echo -e "\nThe command \"$@\" failed. Retrying, $count of 3.\n" >&2
+    }
+    ! { "$@"; result=$?; }
+    [ $result -eq 0 ] && break
+    count=$(($count + 1))
+    sleep 1
+  done
+
+  [ $count -gt 3 ] && {
+    echo -e "\nThe command \"$@\" failed 3 times.\n" >&2
+  }
+
+  return $result
+}
+
 # Let's begin!
+here=$(dirname $(readlink -e $0))
 set -e
 
-here="$(dirname "$(readlink -e "$0")")"
+# Clean up Wine environment
+echo "Cleaning $WINEPREFIX"
+rm -rf $WINEPREFIX
+echo "done"
 
-. "$CONTRIB"/build_tools_util.sh
-
-info "Booting wine."
 wine 'wineboot'
 
+cd /tmp/electrum-build
 
-cd "$CACHEDIR"
+# Install Python
-mkdir -p $WINEPREFIX/drive_c/tmp
-
-info "Installing Python."
 # note: you might need "sudo apt-get install dirmngr" for the following
 # keys from https://www.python.org/downloads/#pubkeys
+KEYLIST_PYTHON_DEV="531F072D39700991925FED0C0EDDC5F26A45C816 26DEA9D4613391EF3E25C9FF0A5B101836580288 CBC547978A3964D14B9AB36A6AF053F07D9DC8D2 C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF 12EF3DC38047DA382D18A5B999CDEA9DA4135B38 8417157EDBE73D9EAC1E539B126EB563A74B06BF DBBF2EEBF925FAADCF1F3FFFD9866941EA5BBD71 2BA0DB82515BBB9EFFAC71C5C9BE28DEE6DF025C 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D C9B104B3DD3AA72D7CCB1066FB9921286F5E1540 97FC712E4C024BBEA48A61ED3A5CA953F73C700D 7ED10B6531D7C8E1BC296021FC624643487034E5"
 KEYRING_PYTHON_DEV="keyring-electrum-build-python-dev.gpg"
-gpg --no-default-keyring --keyring $KEYRING_PYTHON_DEV --import "$here"/gpg_keys/7ED10B6531D7C8E1BC296021FC624643487034E5.asc
+KEYSERVER_PYTHON_DEV="hkp://pool.sks-keyservers.net"
-PYTHON_DOWNLOADS="$CACHEDIR/python$PYTHON_VERSION"
+retry gpg --no-default-keyring --keyring $KEYRING_PYTHON_DEV --keyserver $KEYSERVER_PYTHON_DEV --recv-keys $KEYLIST_PYTHON_DEV
-mkdir -p "$PYTHON_DOWNLOADS"
 for msifile in core dev exe lib pip tools; do
     echo "Installing $msifile..."
-    download_if_not_exist "$PYTHON_DOWNLOADS/${msifile}.msi" "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"
+    wget -N -c "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi"
-    download_if_not_exist "$PYTHON_DOWNLOADS/${msifile}.msi.asc" "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi.asc"
+    wget -N -c "https://www.python.org/ftp/python/$PYTHON_VERSION/win32/${msifile}.msi.asc"
-    verify_signature "$PYTHON_DOWNLOADS/${msifile}.msi.asc" $KEYRING_PYTHON_DEV
+    verify_signature "${msifile}.msi.asc" $KEYRING_PYTHON_DEV
-    wine msiexec /i "$PYTHON_DOWNLOADS/${msifile}.msi" /qb TARGETDIR=$PYHOME
+    wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/python$PYTHON_VERSION
 done
 
-info "Installing build dependencies."
+# upgrade pip
-$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-wine-build.txt
+$PYTHON -m pip install pip --upgrade
 
-info "Installing dependencies specific to binaries."
+# Install pywin32-ctypes (needed by pyinstaller)
-$PYTHON -m pip install --no-dependencies --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-binaries.txt
+$PYTHON -m pip install pywin32-ctypes==0.1.2
 
-info "Installing ZBar."
+# install PySocks
-download_if_not_exist "$CACHEDIR/$ZBAR_FILENAME" "$ZBAR_URL"
+$PYTHON -m pip install win_inet_pton==1.0.1
-verify_hash "$CACHEDIR/$ZBAR_FILENAME" "$ZBAR_SHA256"
-wine "$CACHEDIR/$ZBAR_FILENAME" /S
 
-info "Installing NSIS."
+$PYTHON -m pip install -r $here/../deterministic-build/requirements-binaries.txt
-download_if_not_exist "$CACHEDIR/$NSIS_FILENAME" "$NSIS_URL"
-verify_hash "$CACHEDIR/$NSIS_FILENAME" "$NSIS_SHA256"
-wine "$CACHEDIR/$NSIS_FILENAME" /S
 
+# Install PyInstaller
+$PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip
 
-info "Compiling libusb..."
+# Install ZBar
-(
+download_if_not_exist $ZBAR_FILENAME "$ZBAR_URL"
-    cd "$CACHEDIR"
+verify_hash $ZBAR_FILENAME "$ZBAR_SHA256"
-    if [ -f "libusb/libusb/.libs/libusb-1.0.dll" ]; then
+wine "$PWD/$ZBAR_FILENAME" /S
-        info "libusb-1.0.dll already built, skipping"
-        exit 0
-    fi
-    rm -rf libusb
-    mkdir libusb
-    cd libusb
-    # Shallow clone
-    git init
-    git remote add origin $LIBUSB_REPO
-    git fetch --depth 1 origin $LIBUSB_COMMIT
-    git checkout -b pinned FETCH_HEAD
-    echo "libusb_1_0_la_LDFLAGS += -Wc,-static" >> libusb/Makefile.am
-    ./bootstrap.sh || fail "Could not bootstrap libusb"
-    host="i686-w64-mingw32"
-    LDFLAGS="-Wl,--no-insert-timestamp" ./configure \
-        --host=$host \
-        --build=x86_64-pc-linux-gnu || fail "Could not run ./configure for libusb"
-    make -j4 || fail "Could not build libusb"
-    ${host}-strip libusb/.libs/libusb-1.0.dll
-) || fail "libusb build failed"
-cp "$CACHEDIR/libusb/libusb/.libs/libusb-1.0.dll" $WINEPREFIX/drive_c/tmp/  || fail "Could not copy libusb to its destination"
 
+# Upgrade setuptools (so Electrum can be installed later)
+$PYTHON -m pip install setuptools --upgrade
 
-# copy libsecp dll (already built)
+# Install NSIS installer
-cp "$PROJECT_ROOT/electrum/libsecp256k1-0.dll" $WINEPREFIX/drive_c/tmp/ || fail "Could not copy libsecp to its destination"
+download_if_not_exist $NSIS_FILENAME "$NSIS_URL"
+verify_hash $NSIS_FILENAME "$NSIS_SHA256"
+wine "$PWD/$NSIS_FILENAME" /S
 
+download_if_not_exist $LIBUSB_FILENAME "$LIBUSB_URL"
+verify_hash $LIBUSB_FILENAME "$LIBUSB_SHA256"
+7z x -olibusb $LIBUSB_FILENAME -aoa
 
-info "Building PyInstaller."
+cp libusb/MS32/dll/libusb-1.0.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/
-# we build our own PyInstaller boot loader as the default one has high
-# anti-virus false positives
-(
-    cd "$WINEPREFIX/drive_c/electrum"
-    ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD)
-    cd "$CACHEDIR"
-    rm -rf pyinstaller
-    mkdir pyinstaller
-    cd pyinstaller
-    # Shallow clone
-    git init
-    git remote add origin $PYINSTALLER_REPO
-    git fetch --depth 1 origin $PYINSTALLER_COMMIT
-    git checkout -b pinned FETCH_HEAD
-    rm -fv PyInstaller/bootloader/Windows-*/run*.exe || true
-    # add reproducible randomness. this ensures we build a different bootloader for each commit.
-    # if we built the same one for all releases, that might also get anti-virus false positives
-    echo "const char *electrum_tag = \"tagged by Electrum@$ELECTRUM_COMMIT_HASH\";" >> ./bootloader/src/pyi_main.c
-    pushd bootloader
-    # cross-compile to Windows using host python
-    python3 ./waf all CC=i686-w64-mingw32-gcc CFLAGS="-static -Wno-dangling-else -Wno-error=unused-value"
-    popd
-    # sanity check bootloader is there:
-    [[ -e PyInstaller/bootloader/Windows-32bit/runw.exe ]] || fail "Could not find runw.exe in target dir!"
-) || fail "PyInstaller build failed"
-info "Installing PyInstaller."
-$PYTHON -m pip install --no-dependencies --no-warn-script-location ./pyinstaller
 
-info "Wine is configured."
+# add dlls needed for pyinstaller:
+cp $WINEPREFIX/drive_c/python$PYTHON_VERSION/Lib/site-packages/PyQt5/Qt/bin/* $WINEPREFIX/drive_c/python$PYTHON_VERSION/
+
+mkdir -p $WINEPREFIX/drive_c/tmp
+cp secp256k1/libsecp256k1.dll $WINEPREFIX/drive_c/tmp/
+
+echo "Wine is configured."

contrib/build-wine/sign.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-here=$(dirname "$0")
-test -n "$here" -a -d "$here" || exit
-cd $here
-
-CERT_FILE=${CERT_FILE:-~/codesigning/cert.pem}
-KEY_FILE=${KEY_FILE:-~/codesigning/key.pem}
-if [[ ! -f "$CERT_FILE" ]]; then
-    ls $CERT_FILE
-    echo "Make sure that $CERT_FILE and $KEY_FILE exist"
-fi
-
-if ! which osslsigncode > /dev/null 2>&1; then
-    echo "Please install osslsigncode"
-fi
-
-rm -rf signed
-mkdir -p signed >/dev/null 2>&1
-
-cd dist
-echo "Found $(ls *.exe | wc -w) files to sign."
-for f in $(ls *.exe); do
-    echo "Signing $f..."
-    osslsigncode sign \
-      -certs "$CERT_FILE" \
-      -key "$KEY_FILE" \
-      -n "Electrum" \
-      -i "https://electrum.org/" \
-      -t "http://timestamp.digicert.com/" \
-      -in "$f" \
-      -out "../signed/$f"
-    ls ../signed/$f -lah
-done

contrib/build-wine/unsign.sh

@@ -1,36 +0,0 @@
-#!/bin/bash
-here=$(dirname "$0")
-test -n "$here" -a -d "$here" || exit
-cd $here
-
-if ! which osslsigncode > /dev/null 2>&1; then
-    echo "Please install osslsigncode"
-    exit
-fi
-
-# exit if command fails
-set -e
-
-mkdir -p signed >/dev/null 2>&1
-mkdir -p signed/stripped >/dev/null 2>&1
-
-version=`python3 -c "import electrum; print(electrum.version.ELECTRUM_VERSION)"`
-
-echo "Found $(ls dist/*.exe | wc -w) files to verify."
-
-for mine in $(ls dist/*.exe); do
-    echo "---------------"
-    f=$(basename $mine)
-    echo "Downloading https://download.electrum.org/$version/$f"
-    wget -q https://download.electrum.org/$version/$f -O signed/$f
-    out="signed/stripped/$f"
-    # Remove PE signature from signed binary
-    osslsigncode remove-signature -in signed/$f -out $out > /dev/null 2>&1
-    chmod +x $out
-    if cmp -s $out $mine; then
-	echo "Success: $f"
-	gpg --sign --armor --detach signed/$f
-    else
-	echo "Failure: $f"
-    fi
-done

contrib/build_tools_util.sh

@@ -1,133 +0,0 @@
-#!/usr/bin/env bash
-
-# Set a fixed umask as this leaks into docker containers
-umask 0022
-
-RED='\033[0;31m'
-BLUE='\033[0;34m'
-YELLOW='\033[0;33m'
-NC='\033[0m' # No Color
-function info {
-    printf "\r💬 ${BLUE}INFO:${NC}  ${1}\n"
-}
-function fail {
-    printf "\r🗯 ${RED}ERROR:${NC} ${1}\n"
-    exit 1
-}
-function warn {
-    printf "\r⚠️  ${YELLOW}WARNING:${NC}  ${1}\n"
-}
-
-
-# based on https://superuser.com/questions/497940/script-to-verify-a-signature-with-gpg
-function verify_signature() {
-    local file=$1 keyring=$2 out=
-    if out=$(gpg --no-default-keyring --keyring "$keyring" --status-fd 1 --verify "$file" 2>/dev/null) &&
-       echo "$out" | grep -qs "^\[GNUPG:\] VALIDSIG "; then
-        return 0
-    else
-        echo "$out" >&2
-        exit 1
-    fi
-}
-
-function verify_hash() {
-    local file=$1 expected_hash=$2
-    actual_hash=$(sha256sum $file | awk '{print $1}')
-    if [ "$actual_hash" == "$expected_hash" ]; then
-        return 0
-    else
-        echo "$file $actual_hash (unexpected hash)" >&2
-        rm "$file"
-        exit 1
-    fi
-}
-
-function download_if_not_exist() {
-    local file_name=$1 url=$2
-    if [ ! -e $file_name ] ; then
-        wget -O $file_name "$url"
-    fi
-}
-
-# https://github.com/travis-ci/travis-build/blob/master/lib/travis/build/templates/header.sh
-function retry() {
-  local result=0
-  local count=1
-  while [ $count -le 3 ]; do
-    [ $result -ne 0 ] && {
-      echo -e "\nThe command \"$@\" failed. Retrying, $count of 3.\n" >&2
-    }
-    ! { "$@"; result=$?; }
-    [ $result -eq 0 ] && break
-    count=$(($count + 1))
-    sleep 1
-  done
-
-  [ $count -gt 3 ] && {
-    echo -e "\nThe command \"$@\" failed 3 times.\n" >&2
-  }
-
-  return $result
-}
-
-function gcc_with_triplet()
-{
-    TRIPLET="$1"
-    CMD="$2"
-    shift 2
-    if [ -n "$TRIPLET" ] ; then
-        "$TRIPLET-$CMD" "$@"
-    else
-        "$CMD" "$@"
-    fi
-}
-
-function gcc_host()
-{
-    gcc_with_triplet "$GCC_TRIPLET_HOST" "$@"
-}
-
-function gcc_build()
-{
-    gcc_with_triplet "$GCC_TRIPLET_BUILD" "$@"
-}
-
-function host_strip()
-{
-    if [ "$GCC_STRIP_BINARIES" -ne "0" ] ; then
-        case "$BUILD_TYPE" in
-            linux|wine)
-                gcc_host strip "$@"
-                ;;
-            darwin)
-                # TODO: Strip on macOS?
-                ;;
-        esac
-    fi
-}
-
-# on MacOS, there is no realpath by default
-if ! [ -x "$(command -v realpath)" ]; then
-    function realpath() {
-        [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
-    }
-fi
-
-
-export SOURCE_DATE_EPOCH=1530212462
-export PYTHONHASHSEED=22
-# Set the build type, overridden by wine build
-export BUILD_TYPE="${BUILD_TYPE:-$(uname | tr '[:upper:]' '[:lower:]')}"
-# No additional autoconf flags by default
-export AUTOCONF_FLAGS=""
-# Add host / build flags if the triplets are set
-if [ -n "$GCC_TRIPLET_HOST" ] ; then
-    export AUTOCONF_FLAGS="$AUTOCONF_FLAGS --host=$GCC_TRIPLET_HOST"
-fi
-if [ -n "$GCC_TRIPLET_BUILD" ] ; then
-    export AUTOCONF_FLAGS="$AUTOCONF_FLAGS --build=$GCC_TRIPLET_BUILD"
-fi
-
-export GCC_STRIP_BINARIES="${GCC_STRIP_BINARIES:-0}"
-

contrib/deterministic-build/check_submodules.sh

@@ -18,6 +18,13 @@ function get_git_mtime {
 
 fail=0
 
+for f in icons/* "icons.qrc"; do
+    if (( $(get_git_mtime "$f") > $(get_git_mtime "contrib/deterministic-build/electrum-icons/") )); then
+        echo "Modification time of $f (" $(get_git_mtime --readable "$f") ") is newer than"\
+             "last update of electrum-icons"
+        fail=1
+    fi
+done
 
 if [ $(date +%s -d "2 weeks ago") -gt $(get_git_mtime "contrib/deterministic-build/electrum-locale/") ]; then
     echo "Last update from electrum-locale is older than 2 weeks."\

contrib/deterministic-build/electrum-icons

@@ -0,0 +1 @@
+Subproject commit a1a986ceed2d4546cf719ebfd9ab3f98df2ce979

contrib/deterministic-build/electrum-locale

@@ -1 +1 @@
-Subproject commit aafd932d37f35a1f276909b6ec27d2f7a60e606a
+Subproject commit c234aa98cce2c255f0c86c22de31e3e9a291987c

contrib/deterministic-build/find_restricted_dependencies.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
 import sys
 
-try:
+import requests
-    import requests
-except ImportError as e:
-    sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install <module-name>'")
 
 
 def check_restriction(p, r):

contrib/deterministic-build/requirements-binaries.txt

@@ -1,27 +1,55 @@
-pip==19.3.1 \
+pip==10.0.1 \
-    --hash=sha256:21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 \
+    --hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
-    --hash=sha256:6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7
+    --hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
-PyQt5==5.11.3 \
+pycryptodomex==3.6.1 \
-    --hash=sha256:517e4339135c4874b799af0d484bc2e8c27b54850113a68eec40a0b56534f450 \
+    --hash=sha256:1869d7735f445bbf1681afa2acce10ad829857cfb7a4a7b702e484f222021892 \
-    --hash=sha256:ac1eb5a114b6e7788e8be378be41c5e54b17d5158994504e85e43b5fca006a39 \
+    --hash=sha256:24e054190d2b11ad3b8517d186c0b3df6f902a5f5a91be8e4bb6a3fcdc65b2cf \
-    --hash=sha256:d2309296a5a79d0a1c0e6c387c30f0398b65523a6dcc8a19cc172e46b949e00d \
+    --hash=sha256:26967d31fabb0d80cb2b254a7c0f55f8dec9931e8676891edd24aa5aaeb0d021 \
-    --hash=sha256:e85936bae1581bcb908847d2038e5b34237a5e6acc03130099a78930770e7ead
+    --hash=sha256:2a341b57bb5844d53b8f632f79277cd534762f502fb73bff5dc1a2f615ff91ed \
-PyQt5-sip==4.19.13 \
+    --hash=sha256:43d6eb014aba7be354f3e8fe2693fe96446f6791da2b9570e8d54d481e3ab224 \
-    --hash=sha256:125f77c087572c9272219cda030a63c2f996b8507592b2a54d7ef9b75f9f054d \
+    --hash=sha256:4c271577f4f8c5cced55a60f4504b34545121c14facb8fc357f89c24089c81fc \
-    --hash=sha256:14c37b06e3fb7c2234cb208fa461ec4e62b4ba6d8b32ca3753c0b2cfd61b00e3 \
+    --hash=sha256:59721f2853df9cf2265304d3b6d6d8cebe3a86b1fddc00f2bfbf18eb2a48fb78 \
-    --hash=sha256:1cb2cf52979f9085fc0eab7e0b2438eb4430d4aea8edec89762527e17317175b \
+    --hash=sha256:63a77a1b27d12ed1c42f4e539d9dbe588a88b70ec64b55271cdf1f56c1223bd6 \
-    --hash=sha256:4babef08bccbf223ec34464e1ed0a23caeaeea390ca9a3529227d9a57f0d6ee4 \
+    --hash=sha256:6d04640386c55b9f44015747496c3b6582360b5b3b4e42f9ce3fc7c6840f80d0 \
-    --hash=sha256:53cb9c1208511cda0b9ed11cffee992a5a2f5d96eb88722569b2ce65ecf6b960 \
+    --hash=sha256:730bd75d90e16975a112ea79863ce1faa7703d3b54f10d77656e7dadf6be0ef6 \
-    --hash=sha256:549449d9461d6c665cbe8af4a3808805c5e6e037cd2ce4fd93308d44a049bfac \
+    --hash=sha256:75a300aa86c56e9c19a7b476c397cb22fda3be7af4cf2f105990fdd94c52f486 \
-    --hash=sha256:5f5b3089b200ff33de3f636b398e7199b57a6b5c1bb724bdb884580a072a14b5 \
+    --hash=sha256:7c6f67005c6e421f02fd7fe9d95876094307b31628d728adc6c2e038e2ed9c09 \
-    --hash=sha256:a4d9bf6e1fa2dd6e73f1873f1a47cee11a6ba0cf9ba8cf7002b28c76823600d0 \
+    --hash=sha256:82b758f870c8dd859f9b58bc9cff007403b68742f9e0376e2cbd8aa2ad3baa83 \
-    --hash=sha256:a4ee6026216f1fbe25c8847f9e0fbce907df5b908f84816e21af16ec7666e6fe \
+    --hash=sha256:8528a958b746c4da767bfba5ac370250dcb741f4c69e55873bd6efe89ac07291 \
-    --hash=sha256:a91a308a5e0cc99de1e97afd8f09f46dd7ca20cfaa5890ef254113eebaa1adff \
+    --hash=sha256:93582ea5bc3e8f95cb36d9dd752c01452085b54b396e3ed775ac1793b8dc486a \
-    --hash=sha256:b0342540da479d2713edc68fb21f307473f68da896ad5c04215dae97630e0069 \
+    --hash=sha256:94e0105ad8d82d3bf5a032c92fc03b01e3bc9ea40b58308c2da42f8cf8c16c47 \
-    --hash=sha256:f997e21b4e26a3397cb7b255b8d1db5b9772c8e0c94b6d870a5a0ab5c27eacaa
+    --hash=sha256:a65889424bf10a884ff031e7f3fd12273dd5b420ee08ca8fcfd431a2f6cbabc1 \
-setuptools==42.0.2 \
+    --hash=sha256:a8467982d26bfb90089f50c3c5d9ed541b7fe9f9df20803fede70d5046cd4ff1 \
-    --hash=sha256:c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940 \
+    --hash=sha256:ab497d4e7361511ede562ed3cd4528f46c005781bc23b1b943612d27bfb078c3 \
-    --hash=sha256:c8abd0f3574bc23afd2f6fd2c415ba7d9e097c8a99b845473b0d957ba1e2dac6
+    --hash=sha256:bb05caf3f6cf41d964c01e08dfaddfe48086c7b3e96708d50647f0a29ff33f56 \
-wheel==0.33.6 \
+    --hash=sha256:c4643647f5656855975b2aaf70fe3aa1e0c1558f8d1b5de0c9a8ccac65114c57 \
-    --hash=sha256:10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646 \
+    --hash=sha256:c550e20834b679ed0b7608c345a816f97047d2297aab4f4599f95edee5d16e99 \
-    --hash=sha256:f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28
+    --hash=sha256:cc797712add76cd658110585481c380833637b68df1404190777ba715a81c9b9 \
+    --hash=sha256:dff0c883d495bf45d18acc74938d1de4d6a08b3345acb9177a46c6997a578c44 \
+    --hash=sha256:e4f69af1f5b46255ec7b8116a853879a55e8e6b595a73c39f14ca430c410c469 \
+    --hash=sha256:f61d0d83e9dd974849f9b0826ec20f49dbd9ed233fd90bf2592be1337231418e \
+    --hash=sha256:f65f21d2b616c30ad4ba801504343eb768fd0a2894c5f587e784201320556543
+PyQt5==5.10.1 \
+    --hash=sha256:1e652910bd1ffd23a3a48c510ecad23a57a853ed26b782cd54b16658e6f271ac \
+    --hash=sha256:4db7113f464c733a99fcb66c4c093a47cf7204ad3f8b3bda502efcc0839ac14b \
+    --hash=sha256:9c17ab3974c1fc7bbb04cc1c9dae780522c0ebc158613f3025fccae82227b5f7 \
+    --hash=sha256:f6035baa009acf45e5f460cf88f73580ad5dc0e72330029acd99e477f20a5d61
+setuptools==39.1.0 \
+    --hash=sha256:0cb8b8625bfdcc2d43ea4b9cdba0b39b2b7befc04f3088897031082aa16ce186 \
+    --hash=sha256:c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7
+SIP==4.19.8 \
+    --hash=sha256:09f9a4e6c28afd0bafedb26ffba43375b97fe7207bd1a0d3513f79b7d168b331 \
+    --hash=sha256:105edaaa1c8aa486662226360bd3999b4b89dd56de3e314d82b83ed0587d8783 \
+    --hash=sha256:1bb10aac55bd5ab0e2ee74b3047aa2016cfa7932077c73f602a6f6541af8cd51 \
+    --hash=sha256:265ddf69235dd70571b7d4da20849303b436192e875ce7226be7144ca702a45c \
+    --hash=sha256:52074f7cb5488e8b75b52f34ec2230bc75d22986c7fe5cd3f2d266c23f3349a7 \
+    --hash=sha256:5ff887a33839de8fc77d7f69aed0259b67a384dc91a1dc7588e328b0b980bde2 \
+    --hash=sha256:74da4ddd20c5b35c19cda753ce1e8e1f71616931391caeac2de7a1715945c679 \
+    --hash=sha256:7d69e9cf4f8253a3c0dfc5ba6bb9ac8087b8239851f22998e98cb35cfe497b68 \
+    --hash=sha256:97bb93ee0ef01ba90f57be2b606e08002660affd5bc380776dd8b0fcaa9e093a \
+    --hash=sha256:cf98150a99e43fda7ae22abe655b6f202e491d6291486548daa56cb15a2fcf85 \
+    --hash=sha256:d9023422127b94d11c1a84bfa94933e959c484f2c79553c1ef23c69fe00d25f8 \
+    --hash=sha256:e72955e12f4fccf27aa421be383453d697b8a44bde2cc26b08d876fd492d0174
+wheel==0.31.0 \
+    --hash=sha256:1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce \
+    --hash=sha256:9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107

contrib/deterministic-build/requirements-hw.txt

@@ -1,56 +1,51 @@
-btchip-python==0.1.28 \
+btchip-python==0.1.27 \
-    --hash=sha256:da09d0d7a6180d428833795ea9a233c3b317ddfcccea8cc6f0eba59435e5dd83
+    --hash=sha256:e58a941abbb2d8901bf4858baa18012537c60812c7f895f9a039113ecce3032b
-certifi==2019.11.28 \
+certifi==2018.4.16 \
-    --hash=sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3 \
+    --hash=sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7 \
-    --hash=sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f
+    --hash=sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0
 chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691
-ckcc-protocol==0.8.0 \
+click==6.7 \
-    --hash=sha256:bad1d1448423472df95ba67621fdd0ad919e625fbe0a4d3ba93648f34ea286e0 \
+    --hash=sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d \
-    --hash=sha256:f0851c98b91825d19567d0d3bac1b28044d40a3d5f194c8b04c5338f114d7ad5
+    --hash=sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b
-click==7.0 \
+Cython==0.28.2 \
-    --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \
+    --hash=sha256:03db8c1b8120039f72493b95494a595be13b01b6860cfc93e2a651a001847b3b \
-    --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7
+    --hash=sha256:0d2ccb812d73e67557fd16e7aa7bc5bac18933c1dfe306133cd0680ccab89f33 \
-construct==2.9.45 \
+    --hash=sha256:24f8ea864de733f5a447896cbeec2cac212247e33272539670b9f466f43f23db \
-    --hash=sha256:2271a0efd0798679dea825ff47e22a4c550456a5db0ba8baa82f7eae0af0118c
+    --hash=sha256:30a8fd029eb932a7b5a74e158316d1d069ccb67a8607aa7b6c4ed19fab7fbd4a \
-Cython==0.29.10 \
+    --hash=sha256:37e680901e6a4b97ab67717f9b43fc58542cd10a77431efd2d8801d21d5a37d4 \
-    --hash=sha256:0afa0b121b89de619e71587e25702e2b7068d7da2164c47e6eee80c17823a62f \
+    --hash=sha256:4984e097bc9da37862d97c1f66dacf2c80fadaea488d96ba0b5ea9d84dbc7521 \
-    --hash=sha256:1c608ba76f7a20cc9f0c021b7fe5cb04bc1a70327ae93a9298b1bc3e0edddebe \
+    --hash=sha256:4cfda677227af41e4502e088ee9875e71922238a207d0c40785a0fb09c703c21 \
-    --hash=sha256:26229570d6787ff3caa932fe9d802960f51a89239b990d275ae845405ce43857 \
+    --hash=sha256:4ec60a4086a175a81b9258f810440a6dd2671aa4b419d8248546d85a7de6a93f \
-    --hash=sha256:2a9deafa437b6154cac2f25bb88e0bfd075a897c8dc847669d6f478d7e3ee6b1 \
+    --hash=sha256:51c7d48ea4cba532d11a6d128ebbc15373013f816e5d1c3a3946650b582a30b8 \
-    --hash=sha256:2f28396fbce6d9d68a40edbf49a6729cf9d92a4d39ff0f501947a89188e9099f \
+    --hash=sha256:634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a \
-    --hash=sha256:3983dd7b67297db299b403b29b328d9e03e14c4c590ea90aa1ad1d7b35fb178b \
+    --hash=sha256:67e0359709c8addc3ecb19e1dec6d84d67647e3906da618b953001f6d4480275 \
-    --hash=sha256:4100a3f8e8bbe47d499cdac00e56d5fe750f739701ea52dc049b6c56f5421d97 \
+    --hash=sha256:6a93d4ba0461edc7a359241f4ebbaa8f9bc9490b3540a8dd0460bef8c2c706db \
-    --hash=sha256:51abfaa7b6c66f3f18028876713c8804e73d4c2b6ceddbcbcfa8ec62429377f0 \
+    --hash=sha256:6ba89d56c3ee45716378cda4f0490c3abe1edf79dce8b997f31608b14748a52b \
-    --hash=sha256:61c24f4554efdb8fb1ac6c8e75dab301bcdf2b7b739ed0c2b267493bb43163c5 \
+    --hash=sha256:6ca5436d470584ba6fd399a802c9d0bcf76cf1edb0123725a4de2f0048f9fa07 \
-    --hash=sha256:700ccf921b2fdc9b23910e95b5caae4b35767685e0812343fa7172409f1b5830 \
+    --hash=sha256:7656895cdd59d56dd4ed326d1ee9ede727020d4a5d8778a05af2d8e25af4b13d \
-    --hash=sha256:7b41eb2e792822a790cb2a171df49d1a9e0baaa8e81f58077b7380a273b93d5f \
+    --hash=sha256:85f7432776870d65639fed00f951a3c05ef1e534bc72a73cd1200d79b9a7d7d0 \
-    --hash=sha256:803987d3b16d55faa997bfc12e8b97f1091f145930dee229b020487aed8a1f44 \
+    --hash=sha256:96dd674e72281d3feed74fd5adcf0514ba02884f123cdf4fb78567e7be6b1694 \
-    --hash=sha256:99af5cfcd208c81998dcf44b3ca466dee7e17453cfb50e98b87947c3a86f8753 \
+    --hash=sha256:97bf06a89bcf9e8d7633cde89274d42b3b661dc974b58fca066fad762e46b4d8 \
-    --hash=sha256:9faea1cca34501c7e139bc7ef8e504d532b77865c58592493e2c154a003b450f \
+    --hash=sha256:9a465e7296a4629139be5d2015577f2ae5e08196eb7dc4c407beea130f362dc3 \
-    --hash=sha256:a7ba4c9a174db841cfee9a0b92563862a0301d7ca543334666c7266b541f141a \
+    --hash=sha256:9a60355edca1cc9006be086e2633e190542aad2bf9e46948792a48b3ae28ed97 \
-    --hash=sha256:b26071c2313d1880599c69fd831a07b32a8c961ba69d7ccbe5db1cd8d319a4ca \
+    --hash=sha256:9eab3696f2cb88167db109d737c787fb9dd34ca414bd1e0c424e307956e02c94 \
-    --hash=sha256:b49dc8e1116abde13a3e6a9eb8da6ab292c5a3325155fb872e39011b110b37e6 \
+    --hash=sha256:c3ae7d40ebceb0d944dfeeceaf1fbf17e528f5327d97b008a8623ddddd1ecee3 \
-    --hash=sha256:bd40def0fd013569887008baa6da9ca428e3d7247adeeaeada153006227bb2e7 \
+    --hash=sha256:c623d19fcc60ea27882f20cf484218926ddf6f978b958dae1070600a1974f809 \
-    --hash=sha256:bfd0db770e8bd4e044e20298dcae6dfc42561f85d17ee546dcd978c8b23066ae \
+    --hash=sha256:c719a6e86d7c737afcc9729994f76b284d1c512099ee803eff11c2a9e6e33a42 \
-    --hash=sha256:c2fad1efae5889925c8fd7867fdd61f59480e4e0b510f9db096c912e884704f1 \
+    --hash=sha256:cf17af0433218a1e33dc6f3069dd9e7cd0c80fe505972c3acd548e25f67973fd \
-    --hash=sha256:c81aea93d526ccf6bc0b842c91216ee9867cd8792f6725a00f19c8b5837e1715 \
+    --hash=sha256:daf96e0d232605e979995795f62ffd24c5c6ecea4526e4cbb86d80f01da954b2 \
-    --hash=sha256:da786e039b4ad2bce3d53d4799438cf1f5e01a0108f1b8d78ac08e6627281b1a \
+    --hash=sha256:db40de7d03842d3c4625028a74189ade52b27f8efaeb0d2ca06474f57e0813b2 \
-    --hash=sha256:deab85a069397540987082d251e9c89e0e5b2e3e044014344ff81f60e211fc4b \
+    --hash=sha256:deea1ef59445568dd7738fa3913aea7747e4927ff4ae3c10737844b8a5dd3e22 \
-    --hash=sha256:e3f1e6224c3407beb1849bdc5ae3150929e593e4cffff6ca41c6ec2b10942c80 \
+    --hash=sha256:e05d28b5ce1ee5939d83e50344980659688ecaed65c5e10214d817ecf5d1fe6a \
-    --hash=sha256:e74eb224e53aae3943d66e2d29fe42322d5753fd4c0641329bccb7efb3a46552 \
+    --hash=sha256:f5f6694ce668eb7a9b59550bfe4265258809c9b0665c206b26d697df2eef2a8b
-    --hash=sha256:ee697c7ea65cb14915a64f36874da8ffc2123df43cf8bc952172e04a26656cd6 \
+ecdsa==0.13 \
-    --hash=sha256:f37792b16d11606c28e428460bd6a3d14b8917b109e77cdbe4ca78b0b9a52c87 \
+    --hash=sha256:40d002cf360d0e035cf2cb985e1308d41aaa087cbfc135b2dc2d844296ea546c \
-    --hash=sha256:fd2906b54cbf879c09d875ad4e4687c58d87f5ed03496063fec1c9065569fd5d
+    --hash=sha256:64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa
-ecdsa==0.14.1 \
-    --hash=sha256:64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e \
-    --hash=sha256:e108a5fe92c67639abae3260e43561af914e7fd0d27bae6d2ec1312ae7934dfe
 hidapi==0.7.99.post21 \
     --hash=sha256:1ac170f4d601c340f2cd52fd06e85c5e77bad7ceac811a7bb54b529f7dc28c24 \
-    --hash=sha256:6424ad75da0021ce8c1bcd78056a04adada303eff3c561f8d132b85d0a914cb3 \
     --hash=sha256:8d3be666f464347022e2b47caf9132287885d9eacc7895314fc8fefcb4e42946 \
-    --hash=sha256:92878bad7324dee619b7832fbfc60b5360d378aa7c5addbfef0a410d8fd342c7 \
     --hash=sha256:b4b1f6aff0192e9be153fe07c1b7576cb7a1ff52e78e3f76d867be95301a8e87 \
     --hash=sha256:bf03f06f586ce7d8aeb697a94b7dba12dc9271aae92d7a8d4486360ff711a660 \
     --hash=sha256:c76de162937326fcd57aa399f94939ce726242323e65c15c67e183da1f6c26f7 \
@@ -58,63 +53,70 @@ hidapi==0.7.99.post21 \
     --hash=sha256:d4b5787a04613503357606bb10e59c3e2c1114fa00ee328b838dd257f41cbd7b \
     --hash=sha256:e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97 \
     --hash=sha256:edfb16b16a298717cf05b8c8a9ad1828b6ff3de5e93048ceccd74e6ae4ff0922
-idna==2.8 \
+idna==2.6 \
-    --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \
+    --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \
-    --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c
+    --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4
-keepkey==6.3.1 \
+keepkey==4.0.2 \
-    --hash=sha256:88e2b5291c85c8e8567732f675697b88241082884aa1aba32257f35ee722fc09 \
+    --hash=sha256:cddee60ae405841cdff789cbc54168ceaeb2282633420f2be155554c25c69138
-    --hash=sha256:cef1e862e195ece3e42640a0f57d15a63086fd1dedc8b5ddfcbc9c2657f0bb1e \
+libusb1==1.6.4 \
-    --hash=sha256:f369d640c65fec7fd8e72546304cdc768c04224a6b9b00a19dc2cd06fa9d2a6b
+    --hash=sha256:8c930d9c1d037d9c83924c82608aa6a1adcaa01ca0e4a23ee0e8e18d7eee670d
-libusb1==1.7.1 \
+mnemonic==0.18 \
-    --hash=sha256:adf64a4f3f5c94643a1286f8153bcf4bc787c348b38934aacd7fe17fbeebc571
+    --hash=sha256:02a7306a792370f4a0c106c2cf1ce5a0c84b9dbd7e71c6792fdb9ad88a727f1d
-mnemonic==0.19 \
+pbkdf2==1.3 \
-    --hash=sha256:4e37eb02b2cbd56a0079cabe58a6da93e60e3e4d6e757a586d9f23d96abea931 \
+    --hash=sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979
-    --hash=sha256:a8d78c5100acfa7df9bab6b9db7390831b0e54490934b718ff9efd68f0d731a6
+pip==10.0.1 \
-pip==19.3.1 \
+    --hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
-    --hash=sha256:21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 \
+    --hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
-    --hash=sha256:6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7
+protobuf==3.5.2.post1 \
-protobuf==3.11.1 \
+    --hash=sha256:01ccd6d03449ae75b779fb5bf4ed62177d61afe3c5e6465ccf3f8b2e1a84afbe \
-    --hash=sha256:0265379852b9e1f76af6d3d3fe4b3c383a595cc937594bda8565cf69a96baabd \
+    --hash=sha256:1d92cc30b0b46cced33adde5853d920179eb5ea8eecdee9552502a7f29cc3f21 \
-    --hash=sha256:200b77e51f17fbc1d3049045f5835f60405dec3a00fe876b9b986592e46d908c \
+    --hash=sha256:242e4c7ae565267a8bc8b92d707177f915607ea4bd73244bec6cbf4a49b96661 \
-    --hash=sha256:29bd1ed46b2536ad8959401a2f02d2d7b5a309f8e97518e4f92ca6c5ba74dbed \
+    --hash=sha256:3b60685732bd0cbdc802dfcb6071efbcf5d927ce3127c13c33ea1a8efae3aa76 \
-    --hash=sha256:3175d45698edb9a07c1a78a1a4850e674ce8988f20596580158b1d0921d0f057 \
+    --hash=sha256:3f655e1f99c3e14d56ca900af1b9a4715b691319a295cc38939d7f77eabd5e7c \
-    --hash=sha256:34a7270940f86da7a28be466ac541c89b6dbf144a6348b9cf7ac6f56b71006ce \
+    --hash=sha256:560a38e692a69957a70ba0e5839aa67430efd63072bf91b0539dac19055694cd \
-    --hash=sha256:38cbc830a4a5ba9956763b0f37090bfd14dd74e72762be6225de2ceac55f4d03 \
+    --hash=sha256:5c1c8f6a0a68a874e3beff89255959dd80fad45870e96c88944a1b81a22dd5f5 \
-    --hash=sha256:665194f5ad386511ac8d8a0bd57b9ab37b8dd2cd71969458777318e774b9cd46 \
+    --hash=sha256:628a3bf0794a8b3cabb18db11eb67cc10e0cc6e5525d557ae7b682bb73fa2018 \
-    --hash=sha256:839bad7d115c77cdff29b488fae6a3ab503ce9a4192bd4c42302a6ea8e5d0f33 \
+    --hash=sha256:7222d6616108b33ad6cbeff8117062a73c43cdc8fa8f64f6a322ebeb663e710e \
-    --hash=sha256:934a9869a7f3b0d84eca460e386fba1f7ba2a0c1a120a2648bc41fadf50efd1c \
+    --hash=sha256:76ef6ca3c50e4cfd044861586d5f1b352e0fe7f17f883df6c165bad5b4d0e10a \
-    --hash=sha256:aecdf12ef6dc7fd91713a6da93a86c2f2a8fe54840a3b1670853a2b7402e77c9 \
+    --hash=sha256:7c193e6964e752bd056735594826c5b03274ceb8f07349d3ae47d9766250ba96 \
-    --hash=sha256:c4e90bc27c0691c76e09b5dc506133451e52caee1472b8b3c741b7c912ce43ef \
+    --hash=sha256:869e12bcfb5759e683f53ec1dd6155b7be034065431da289f0cb4510040a0799 \
-    --hash=sha256:c65d135ea2d85d40309e268106dab02d3bea723db2db21c23ecad4163ced210b \
+    --hash=sha256:905414e5ea6cdb78d8730f66335755152b46685fcb9fc2f2134024e3ea9e8dcc \
-    --hash=sha256:c98dea04a1ff41a70aff2489610f280004831798cb36a068013eed04c698903d \
+    --hash=sha256:ac0067e3c60737865ed72bb7416e02297d229d960902802d874c0e167128c809 \
-    --hash=sha256:d9049aa194378a426f0b2c784e2054565bf6f754d20fcafdee7102a6250556e8 \
+    --hash=sha256:adf716a89c9cc1891ead79a861c427071ef59172f0e11967b00565a9547b3bd0 \
-    --hash=sha256:e028fee51c96de4e81924484c77111dfdea14010ecfc906ea5b252209b0c4de6 \
+    --hash=sha256:bcfa99f5a82f5eaaf6e5cee5bfdca5a1670f5740aec1d93dae170645ed1a16b0 \
-    --hash=sha256:e84ad26fb50091b1ea676403c0dd2bd47663099454aa6d88000b1dafecab0941 \
+    --hash=sha256:cc94079ae6cbcea5ae194464a30f3223f075e06a0446f52bca9ddbeb6e9f412a \
-    --hash=sha256:e88a924b591b06d0191620e9c8aa75297b3111066bb09d49a24bae1054a10c13
+    --hash=sha256:d5d9edfdc5a3a01d06062d677b121081629782edf0e05ca1be14f15bb947eeee \
-pyaes==1.6.1 \
+    --hash=sha256:e269ab7a50bf0fa6fe6a88ea7dcc7a1079ae9450d9ab9b7730ac32916d55508b \
-    --hash=sha256:02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
+    --hash=sha256:e7fd33a3474cbe18fd5b5620784a0fa21fcae3e402b1806e29c6b450c7f61706
-requests==2.22.0 \
+pyblake2==1.1.2 \
-    --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \
+    --hash=sha256:3757f7ad709b0e1b2a6b3919fa79fe3261f166fc375cd521f2be480f8319dde9 \
-    --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31
+    --hash=sha256:407e02c7f8f36fcec1b7aa114ddca0c1060c598142ea6f6759d03710b946a7e3 \
-safet==0.1.5 \
+    --hash=sha256:4d47b4a2c1d292b1e460bde1dda4d13aa792ed2ed70fcc263b6bc24632c8e902 \
-    --hash=sha256:a7fd4b68bb1bc6185298af665c8e8e00e2bb2bcbddbb22844ead929b845c635e \
+    --hash=sha256:5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f \
-    --hash=sha256:f966a23243312f64d14c7dfe02e8f13f6eeba4c3f51341f2c11ae57831f07de3
+    --hash=sha256:8043267fbc0b2f3748c6920591cd0b8b5609dcce60c504c32858aa36206386f2 \
-setuptools==42.0.2 \
+    --hash=sha256:982295a87907d50f4723db6bc724660da76b6547826d52160171d54f95b919ac \
-    --hash=sha256:c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940 \
+    --hash=sha256:baa2190bfe549e36163aa44664d4ee3a9080b236fc5d42f50dc6fd36bbdc749e \
-    --hash=sha256:c8abd0f3574bc23afd2f6fd2c415ba7d9e097c8a99b845473b0d957ba1e2dac6
+    --hash=sha256:c53417ee0bbe77db852d5fd1036749f03696ebc2265de359fe17418d800196c4 \
-six==1.13.0 \
+    --hash=sha256:fbc9fcde75713930bc2a91b149e97be2401f7c9c56d735b46a109210f58d7358
-    --hash=sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd \
+requests==2.18.4 \
-    --hash=sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66
+    --hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \
-trezor==0.11.5 \
+    --hash=sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e
-    --hash=sha256:711137bb83e7e0aef4009745e0da1b7d258146f246b43e3f7f5b849405088ef1 \
+rlp==0.6.0 \
-    --hash=sha256:cd8aafd70a281daa644c4a3fb021ffac20b7a88e86226ecc8bb3e78e1734a184
+    --hash=sha256:87879a0ba1479b760cee98af165de2eee95258b261faa293199f60742be96f34
-typing-extensions==3.7.4.1 \
+setuptools==39.1.0 \
-    --hash=sha256:091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2 \
+    --hash=sha256:0cb8b8625bfdcc2d43ea4b9cdba0b39b2b7befc04f3088897031082aa16ce186 \
-    --hash=sha256:910f4656f54de5993ad9304959ce9bb903f90aadc7c67a0bef07e678014e892d \
+    --hash=sha256:c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7
-    --hash=sha256:cf8b63fedea4d89bab840ecbb93e75578af28f76f66c35889bd7065f5af88575
+six==1.11.0 \
-urllib3==1.25.7 \
+    --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \
-    --hash=sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293 \
+    --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb
-    --hash=sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745
+trezor==0.9.1 \
-wheel==0.33.6 \
+    --hash=sha256:a481191011bade98f1e9f1201e7c72a83945050657bbc90dc4ac32dc8b8b46a4
-    --hash=sha256:10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646 \
+urllib3==1.22 \
-    --hash=sha256:f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28
+    --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \
+    --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
+websocket-client==0.47.0 \
+    --hash=sha256:188b68b14fdb2d8eb1a111f21b9ffd2dbf1dbc4e4c1d28cf2c37cdbf1dd1cae6 \
+    --hash=sha256:a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149
+wheel==0.31.0 \
+    --hash=sha256:1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce \
+    --hash=sha256:9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107

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

@@ -1,19 +0,0 @@
-altgraph==0.16.1 \
-    --hash=sha256:d6814989f242b2b43025cba7161fc1b8fb487a62cd49c49245d6fd01c18ac997 \
-    --hash=sha256:ddf5320017147ba7b810198e0b6619bd7b5563aa034da388cea8546b877f9b0c
-future==0.18.2 \
-    --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d
-pefile==2019.4.18 \
-    --hash=sha256:a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645
-pip==19.3.1 \
-    --hash=sha256:21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 \
-    --hash=sha256:6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7
-pywin32-ctypes==0.2.0 \
-    --hash=sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942 \
-    --hash=sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98
-setuptools==42.0.2 \
-    --hash=sha256:c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940 \
-    --hash=sha256:c8abd0f3574bc23afd2f6fd2c415ba7d9e097c8a99b845473b0d957ba1e2dac6
-wheel==0.33.6 \
-    --hash=sha256:10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646 \
-    --hash=sha256:f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28

contrib/deterministic-build/requirements.txt

@@ -1,183 +1,71 @@
-aiohttp==3.6.2 \
+certifi==2018.4.16 \
-    --hash=sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e \
+    --hash=sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7 \
-    --hash=sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326 \
+    --hash=sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0
-    --hash=sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a \
-    --hash=sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654 \
-    --hash=sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a \
-    --hash=sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4 \
-    --hash=sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17 \
-    --hash=sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec \
-    --hash=sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd \
-    --hash=sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48 \
-    --hash=sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59 \
-    --hash=sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965
-aiohttp-socks==0.2.2 \
-    --hash=sha256:e473ee222b001fe33798957b9ce3352b32c187cf41684f8e2259427925914993 \
-    --hash=sha256:eebd8939a7c3c1e3e7e1b2552c60039b4c65ef6b8b2351efcbdd98290538e310
-aiorpcX==0.18.4 \
-    --hash=sha256:bec9c0feb328d62ba80b79931b07f7372c98f2891ad51300be0b7163d5ccfb4a \
-    --hash=sha256:d424a55bcf52ebf1b3610a7809c0748fac91ce926854ad33ce952463bc6017e8
-apply-defaults==0.1.4 \
-    --hash=sha256:1ce26326a61d8773d38a9726a345c6525a91a6120d7333af79ad792dacb6246c
-async-timeout==3.0.1 \
-    --hash=sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f \
-    --hash=sha256:4291ca197d287d274d0b6cb5d6f8f8f82d434ed288f962539ff18cc9012f9ea3
-attrs==19.3.0 \
-    --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \
-    --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
-bitstring==3.1.6 \
-    --hash=sha256:7b60b0c300d0d3d0a24ec84abfda4b0eaed3dc56dc90f6cbfe497166c9ad8443 \
-    --hash=sha256:c97a8e2a136e99b523b27da420736ae5cb68f83519d633794a6a11192f69f8bf \
-    --hash=sha256:e392819965e7e0246e3cf6a51d5a54e731890ae03ebbfa3cd0e4f74909072096
-certifi==2019.11.28 \
-    --hash=sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3 \
-    --hash=sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f
 chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691
-click==6.7 \
+dnspython==1.15.0 \
-    --hash=sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d \
+    --hash=sha256:40f563e1f7a7b80dc5a4e76ad75c23da53d62f1e15e6e517293b04e1f84ead7c \
-    --hash=sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b
+    --hash=sha256:861e6e58faa730f9845aaaa9c6c832851fbf89382ac52915a51f89c71accdd31
-dnspython==1.16.0 \
+ecdsa==0.13 \
-    --hash=sha256:36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01 \
+    --hash=sha256:40d002cf360d0e035cf2cb985e1308d41aaa087cbfc135b2dc2d844296ea546c \
-    --hash=sha256:f69c21288a962f4da86e56c4905b49d11aba7938d3d740e80d9e366ee4f1632d
+    --hash=sha256:64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa
-ecdsa==0.14.1 \
+idna==2.6 \
-    --hash=sha256:64c613005f13efec6541bb0a33290d0d03c27abab5f15fbab20fb0ee162bdd8e \
+    --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \
-    --hash=sha256:e108a5fe92c67639abae3260e43561af914e7fd0d27bae6d2ec1312ae7934dfe
+    --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4
-idna==2.8 \
+jsonrpclib-pelix==0.3.1 \
-    --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \
+    --hash=sha256:5417b1508d5a50ec64f6e5b88907f111155d52607b218ff3ba9a777afb2e49e3 \
-    --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c
+    --hash=sha256:bd89a6093bc4d47dc8a096197aacb827359944a4533be5193f3845f57b9f91b4
-idna_ssl==1.1.0 \
+pbkdf2==1.3 \
-    --hash=sha256:a933e3bb13da54383f9e8f35dc4f9cb9eb9b3b78c6b36f311254d6d0d92c6c7c
+    --hash=sha256:ac6397369f128212c43064a2b4878038dab78dab41875364554aaf2a684e6979
-importlib-metadata==1.1.0 \
+pip==10.0.1 \
-    --hash=sha256:b044f07694ef14a6683b097ba56bd081dbc7cdc7c7fe46011e499dfecc082f21 \
+    --hash=sha256:717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7 \
-    --hash=sha256:e6ac600a142cf2db707b1998382cc7fc3b02befb7273876e01b8ad10b9652742
+    --hash=sha256:f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68
-jsonrpcclient==3.3.4 \
+protobuf==3.5.2.post1 \
-    --hash=sha256:c50860409b73af9f94b648439caae3b4af80d5ac937f2a8ac7783de3d1050ba9
+    --hash=sha256:01ccd6d03449ae75b779fb5bf4ed62177d61afe3c5e6465ccf3f8b2e1a84afbe \
-jsonrpcserver==4.0.5 \
+    --hash=sha256:1d92cc30b0b46cced33adde5853d920179eb5ea8eecdee9552502a7f29cc3f21 \
-    --hash=sha256:240c517f49b0fdd3bfa428c9a7cc581126a0c43eca60d29762da124017d9d9f4
+    --hash=sha256:242e4c7ae565267a8bc8b92d707177f915607ea4bd73244bec6cbf4a49b96661 \
-jsonschema==3.2.0 \
+    --hash=sha256:3b60685732bd0cbdc802dfcb6071efbcf5d927ce3127c13c33ea1a8efae3aa76 \
-    --hash=sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163 \
+    --hash=sha256:3f655e1f99c3e14d56ca900af1b9a4715b691319a295cc38939d7f77eabd5e7c \
-    --hash=sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a
+    --hash=sha256:560a38e692a69957a70ba0e5839aa67430efd63072bf91b0539dac19055694cd \
-more-itertools==8.0.0 \
+    --hash=sha256:5c1c8f6a0a68a874e3beff89255959dd80fad45870e96c88944a1b81a22dd5f5 \
-    --hash=sha256:53ff73f186307d9c8ef17a9600309154a6ae27f25579e80af4db8f047ba14bc2 \
+    --hash=sha256:628a3bf0794a8b3cabb18db11eb67cc10e0cc6e5525d557ae7b682bb73fa2018 \
-    --hash=sha256:a0ea684c39bc4315ba7aae406596ef191fd84f873d2d2751f84d64e81a7a2d45
+    --hash=sha256:7222d6616108b33ad6cbeff8117062a73c43cdc8fa8f64f6a322ebeb663e710e \
-multidict==4.6.1 \
+    --hash=sha256:76ef6ca3c50e4cfd044861586d5f1b352e0fe7f17f883df6c165bad5b4d0e10a \
-    --hash=sha256:07f9a6bf75ad675d53956b2c6a2d4ef2fa63132f33ecc99e9c24cf93beb0d10b \
+    --hash=sha256:7c193e6964e752bd056735594826c5b03274ceb8f07349d3ae47d9766250ba96 \
-    --hash=sha256:0ffe4d4d28cbe9801952bfb52a8095dd9ffecebd93f84bdf973c76300de783c5 \
+    --hash=sha256:869e12bcfb5759e683f53ec1dd6155b7be034065431da289f0cb4510040a0799 \
-    --hash=sha256:1b605272c558e4c659dbaf0fb32a53bfede44121bcf77b356e6e906867b958b7 \
+    --hash=sha256:905414e5ea6cdb78d8730f66335755152b46685fcb9fc2f2134024e3ea9e8dcc \
-    --hash=sha256:205a011e636d885af6dd0029e41e3514a46e05bb2a43251a619a6e8348b96fc0 \
+    --hash=sha256:ac0067e3c60737865ed72bb7416e02297d229d960902802d874c0e167128c809 \
-    --hash=sha256:250632316295f2311e1ed43e6b26a63b0216b866b45c11441886ac1543ca96e1 \
+    --hash=sha256:adf716a89c9cc1891ead79a861c427071ef59172f0e11967b00565a9547b3bd0 \
-    --hash=sha256:2bc9c2579312c68a3552ee816311c8da76412e6f6a9cf33b15152e385a572d2a \
+    --hash=sha256:bcfa99f5a82f5eaaf6e5cee5bfdca5a1670f5740aec1d93dae170645ed1a16b0 \
-    --hash=sha256:318aadf1cfb6741c555c7dd83d94f746dc95989f4f106b25b8a83dfb547f2756 \
+    --hash=sha256:cc94079ae6cbcea5ae194464a30f3223f075e06a0446f52bca9ddbeb6e9f412a \
-    --hash=sha256:42cdd649741a14b0602bf15985cad0dd4696a380081a3319cd1ead46fd0f0fab \
+    --hash=sha256:d5d9edfdc5a3a01d06062d677b121081629782edf0e05ca1be14f15bb947eeee \
-    --hash=sha256:5159c4975931a1a78bf6602bbebaa366747fce0a56cb2111f44789d2c45e379f \
+    --hash=sha256:e269ab7a50bf0fa6fe6a88ea7dcc7a1079ae9450d9ab9b7730ac32916d55508b \
-    --hash=sha256:87e26d8b89127c25659e962c61a4c655ec7445d19150daea0759516884ecb8b4 \
+    --hash=sha256:e7fd33a3474cbe18fd5b5620784a0fa21fcae3e402b1806e29c6b450c7f61706
-    --hash=sha256:891b7e142885e17a894d9d22b0349b92bb2da4769b4e675665d0331c08719be5 \
-    --hash=sha256:8d919034420378132d074bf89df148d0193e9780c9fe7c0e495e895b8af4d8a2 \
-    --hash=sha256:9c890978e2b37dd0dc1bd952da9a5d9f245d4807bee33e3517e4119c48d66f8c \
-    --hash=sha256:a37433ce8cdb35fc9e6e47e1606fa1bfd6d70440879038dca7d8dd023197eaa9 \
-    --hash=sha256:c626029841ada34c030b94a00c573a0c7575fe66489cde148785b6535397d675 \
-    --hash=sha256:cfec9d001a83dc73580143f3c77e898cf7ad78b27bb5e64dbe9652668fcafec7 \
-    --hash=sha256:efaf1b18ea6c1f577b1371c0159edbe4749558bfe983e13aa24d0a0c01e1ad7b
-pip==19.3.1 \
-    --hash=sha256:21207d76c1031e517668898a6b46a9fb1501c7a4710ef5dfd6a40ad9e6757ea7 \
-    --hash=sha256:6917c65fc3769ecdc61405d3dfd97afdedd75808d200b2838d7d961cebc0c2c7
-protobuf==3.11.1 \
-    --hash=sha256:0265379852b9e1f76af6d3d3fe4b3c383a595cc937594bda8565cf69a96baabd \
-    --hash=sha256:200b77e51f17fbc1d3049045f5835f60405dec3a00fe876b9b986592e46d908c \
-    --hash=sha256:29bd1ed46b2536ad8959401a2f02d2d7b5a309f8e97518e4f92ca6c5ba74dbed \
-    --hash=sha256:3175d45698edb9a07c1a78a1a4850e674ce8988f20596580158b1d0921d0f057 \
-    --hash=sha256:34a7270940f86da7a28be466ac541c89b6dbf144a6348b9cf7ac6f56b71006ce \
-    --hash=sha256:38cbc830a4a5ba9956763b0f37090bfd14dd74e72762be6225de2ceac55f4d03 \
-    --hash=sha256:665194f5ad386511ac8d8a0bd57b9ab37b8dd2cd71969458777318e774b9cd46 \
-    --hash=sha256:839bad7d115c77cdff29b488fae6a3ab503ce9a4192bd4c42302a6ea8e5d0f33 \
-    --hash=sha256:934a9869a7f3b0d84eca460e386fba1f7ba2a0c1a120a2648bc41fadf50efd1c \
-    --hash=sha256:aecdf12ef6dc7fd91713a6da93a86c2f2a8fe54840a3b1670853a2b7402e77c9 \
-    --hash=sha256:c4e90bc27c0691c76e09b5dc506133451e52caee1472b8b3c741b7c912ce43ef \
-    --hash=sha256:c65d135ea2d85d40309e268106dab02d3bea723db2db21c23ecad4163ced210b \
-    --hash=sha256:c98dea04a1ff41a70aff2489610f280004831798cb36a068013eed04c698903d \
-    --hash=sha256:d9049aa194378a426f0b2c784e2054565bf6f754d20fcafdee7102a6250556e8 \
-    --hash=sha256:e028fee51c96de4e81924484c77111dfdea14010ecfc906ea5b252209b0c4de6 \
-    --hash=sha256:e84ad26fb50091b1ea676403c0dd2bd47663099454aa6d88000b1dafecab0941 \
-    --hash=sha256:e88a924b591b06d0191620e9c8aa75297b3111066bb09d49a24bae1054a10c13
 pyaes==1.6.1 \
     --hash=sha256:02c1b1405c38d3c370b085fb952dd8bea3fadcee6411ad99f312cc129c536d8f
-pycryptodomex==3.9.4 \
+PySocks==1.6.8 \
-    --hash=sha256:0943b65fb41b7403a9def6214061fdd9ab9afd0bbc581e553c72eebe60bded36 \
+    --hash=sha256:3fe52c55890a248676fd69dc9e3c4e811718b777834bcaab7a8125cf9deac672
-    --hash=sha256:0a1dbb5c4d975a4ea568fb7686550aa225d94023191fb0cca8747dc5b5d77857 \
+qrcode==6.0 \
-    --hash=sha256:0f43f1608518347fdcb9c8f443fa5cabedd33f94188b13e4196a3a7ba90d169c \
+    --hash=sha256:037b0db4c93f44586e37f84c3da3f763874fcac85b2974a69a98e399ac78e1bf \
-    --hash=sha256:11ce5fec5990e34e3981ed14897ba601c83957b577d77d395f1f8f878a179f98 \
+    --hash=sha256:de4ffc15065e6ff20a551ad32b6b41264f3c75275675406ddfa8e3530d154be3
-    --hash=sha256:17a09e38fdc91e4857cf5a7ce82f3c0b229c3977490f2146513e366923fc256b \
+requests==2.18.4 \
-    --hash=sha256:22d970cee5c096b9123415e183ae03702b2cd4d3ba3f0ced25c4e1aba3967167 \
+    --hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \
-    --hash=sha256:2a1793efcbae3a2264c5e0e492a2629eb10d895d6e5f17dbbd00eb8b489c6bda \
+    --hash=sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e
-    --hash=sha256:30a8a148a0fe482cec1aaf942bbd0ade56ec197c14fe058b2a94318c57e1f991 \
+setuptools==39.1.0 \
-    --hash=sha256:32fbbaf964c5184d3f3e349085b0536dd28184b02e2b014fc900f58bbc126339 \
+    --hash=sha256:0cb8b8625bfdcc2d43ea4b9cdba0b39b2b7befc04f3088897031082aa16ce186 \
-    --hash=sha256:347d67faee36d449dc9632da411cc318df52959079062627f1243001b10dc227 \
+    --hash=sha256:c5484e13b89927b44fd15897f7ce19dded8e7f035466a4fa7b946c0bdd86edd7
-    --hash=sha256:45f4b4e5461a041518baabc52340c249b60833aa84cea6377dc8016a2b33c666 \
+six==1.11.0 \
-    --hash=sha256:4717daec0035034b002d31c42e55431c970e3e38a78211f43990e1b7eaf19e28 \
+    --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \
-    --hash=sha256:51a1ac9e7dda81da444fed8be558a60ec88dfc73b2aa4b0efa310e87acb75838 \
+    --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb
-    --hash=sha256:53e9dcc8f14783f6300b70da325a50ac1b0a3dbaee323bd9dc3f71d409c197a1 \
+urllib3==1.22 \
-    --hash=sha256:5519a2ed776e193688b7ddb61ab709303f6eb7d1237081e298283c72acc44271 \
+    --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \
-    --hash=sha256:583450e8e80a0885c453211ed2bd69ceea634d8c904f23ff8687f677fe810e95 \
+    --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
-    --hash=sha256:60f862bd2a07133585a4fc2ce2b1a8ec24746b07ac44307d22ef2b767cb03435 \
+wheel==0.31.0 \
-    --hash=sha256:612091f1d3c84e723bec7cb855cf77576e646045744794c9a3f75ba80737762f \
+    --hash=sha256:1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce \
-    --hash=sha256:629a87b87c8203b8789ccefc7f2f2faecd2daaeb56bdd0b4e44cd89565f2db07 \
+    --hash=sha256:9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107
-    --hash=sha256:6e56ec4c8938fb388b6f250ddd5e21c15e8f25a76e0ad0e2abae9afee09e67b4 \
+colorama==0.3.9 \
-    --hash=sha256:8e8092651844a11ec7fa534395f3dfe99256ce4edca06f128efc9d770d6e1dc1 \
+    --hash=sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda \
-    --hash=sha256:8f5f260629876603e08f3ce95c8ccd9b6b83bf9a921c41409046796267f7adc5 \
+    --hash=sha256:48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1
-    --hash=sha256:9a6b74f38613f54c56bd759b411a352258f47489bbefd1d57c930a291498b35b \
+bitstring==3.1.5
-    --hash=sha256:a5a13ebb52c4cd065fb673d8c94f39f30823428a4de19e1f3f828b63a8882d1e \
+cryptography
-    --hash=sha256:a77ca778a476829876a3a70ae880073379160e4a465d057e3c4e1c79acdf1b8a \
-    --hash=sha256:a9f7be3d19f79429c2118fd61bc2ec4fa095e93b56fb3a5f3009822402c4380f \
-    --hash=sha256:dc15a467c4f9e4b43748ba2f97aea66f67812bfd581818284c47cadc81d4caec \
-    --hash=sha256:e13cdeea23059f7577c230fd580d2c8178e67ebe10e360041abe86c33c316f1c \
-    --hash=sha256:e45b85c8521bca6bdfaf57e4987743ade53e9f03529dd3adbc9524094c6d55c4 \
-    --hash=sha256:e87f17867b260f57c88487f943eb4d46c90532652bb37046e764842c3b66cbb1 \
-    --hash=sha256:ee40a5b156f6c1192bc3082e9d73d0479904433cdda83110546cd67f5a15a5be \
-    --hash=sha256:ef63ffde3b267043579af8830fc97fc3b9b8a526a24e3ba23af9989d4e9e689a
-pyrsistent==0.15.6 \
-    --hash=sha256:f3b280d030afb652f79d67c5586157c5c1355c9a58dfc7940566e28d28f3df1b
-QDarkStyle==2.6.8 \
-    --hash=sha256:037a54bf0aa5153f8055b65b8b36ac0d0f7648f2fd906c011a4da22eb0f582a2 \
-    --hash=sha256:fd1abae37d3a0a004089178da7c0b26ec5eb29f965b3e573853b8f280b614dea
-qrcode==6.1 \
-    --hash=sha256:3996ee560fc39532910603704c82980ff6d4d5d629f9c3f25f34174ce8606cf5 \
-    --hash=sha256:505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369
-setuptools==42.0.2 \
-    --hash=sha256:c5b372090d7c8709ce79a6a66872a91e518f7d65af97fca78135e1cb10d4b940 \
-    --hash=sha256:c8abd0f3574bc23afd2f6fd2c415ba7d9e097c8a99b845473b0d957ba1e2dac6
-six==1.13.0 \
-    --hash=sha256:1f1b7d42e254082a9db6279deae68afb421ceba6158efa6131de7b3003ee93fd \
-    --hash=sha256:30f610279e8b2578cab6db20741130331735c781b56053c59c4076da27f06b66
-typing-extensions==3.7.4.1 \
-    --hash=sha256:091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2 \
-    --hash=sha256:910f4656f54de5993ad9304959ce9bb903f90aadc7c67a0bef07e678014e892d \
-    --hash=sha256:cf8b63fedea4d89bab840ecbb93e75578af28f76f66c35889bd7065f5af88575
-wheel==0.33.6 \
-    --hash=sha256:10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646 \
-    --hash=sha256:f4da1763d3becf2e2cd92a14a7c920f0f00eca30fdde9ea992c836685b9faf28
-yarl==1.4.1 \
-    --hash=sha256:031e8f56cf085d3b3df6b6bce756369ea7052b82d35ea07b6045f209c819e0e5 \
-    --hash=sha256:074958fe4578ef3a3d0bdaf96bbc25e4c4db82b7ff523594776fcf3d3f16c531 \
-    --hash=sha256:2db667ee21f620b446a54a793e467714fc5a446fcc82d93a47e8bde01d69afab \
-    --hash=sha256:326f2dbaaa17b858ae86f261ae73a266fd820a561fc5142cee9d0fc58448fbd7 \
-    --hash=sha256:32a3885f542f74d0f4f87057050c6b45529ebd79d0639f56582e741521575bfe \
-    --hash=sha256:56126ef061b913c3eefecace3404ca88917265d0550b8e32bbbeab29e5c830bf \
-    --hash=sha256:589ac1e82add13fbdedc04eb0a83400db728e5f1af2bd273392088ca90de7062 \
-    --hash=sha256:6076bce2ecc6ebf6c92919d77762f80f4c9c6ecc9c1fbaa16567ec59ad7d6f1d \
-    --hash=sha256:63be649c535d18ab6230efbc06a07f7779cd4336a687672defe70c025349a47b \
-    --hash=sha256:6642cbc92eaffa586180f669adc772f5c34977e9e849e93f33dc142351e98c9c \
-    --hash=sha256:6fa05a25f2280e78a514041d4609d39962e7d51525f2439db9ad7a2ae7aac163 \
-    --hash=sha256:7ed006a220422c33ff0889288be24db56ff0a3008ffe9eaead58a690715ad09b \
-    --hash=sha256:80c9c213803b50899460cc355f47e66778c3c868f448b7b7de5b1f1858c82c2a \
-    --hash=sha256:8bae18e2129850e76969b57869dacc72a66cccdbeebce1a28d7f3d439c21a7a3 \
-    --hash=sha256:ab112fba996a8f48f427e26969f2066d50080df0c24007a8cc6d7ae865e19013 \
-    --hash=sha256:b1c178ef813940c9a5cbad42ab7b8b76ac08b594b0a6bad91063c968e0466efc \
-    --hash=sha256:d6eff151c3b23a56a5e4f496805619bc3bdf4f749f63a7a95ad50e8267c17475
-zipp==0.6.0 \
-    --hash=sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e \
-    --hash=sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335
-colorama==0.4.1 \
-    --hash=sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d \
-    --hash=sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48

contrib/freeze_packages.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 # Run this after a new release to update dependencies
 
-set -e
-
 venv_dir=~/.electrum-venv
 contrib=$(dirname "$0")
 
@@ -10,7 +8,7 @@ which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit
 python3 -m hashin -h > /dev/null 2>&1 || { python3 -m pip install hashin; }
 other_python=$(which python3)
 
-for i in '' '-hw' '-binaries' '-wine-build'; do
+for i in '' '-hw' '-binaries'; do
     rm -rf "$venv_dir"
     virtualenv -p $(which python3) $venv_dir
 

contrib/make_apk

@@ -1,58 +1,7 @@
 #!/bin/bash
-
+pushd lib
-set -e
+VERSION=$(python -c "import version; print version.ELECTRUM_VERSION")".0"
-
-CONTRIB="$(dirname "$(readlink -e "$0")")"
-ROOT_FOLDER="$CONTRIB"/..
-PACKAGES="$ROOT_FOLDER"/packages/
-LOCALE="$ROOT_FOLDER"/electrum/locale/
-
-if [ ! -d "$LOCALE" ]; then
-  echo "Run pull_locale first!"
-  exit 1
-fi
-
-if [ ! -d "$PACKAGES" ]; then
-  echo "Run make_packages first!"
-  exit 1
-fi
-
-pushd ./electrum/gui/kivy/
-
-make theming
-
-if [[ -n "$1"  && "$1" == "release" ]] ; then
-    echo -n Keystore Password:
-    read -s password
-    export P4A_RELEASE_KEYSTORE=~/.keystore
-    export P4A_RELEASE_KEYSTORE_PASSWD=$password
-    export P4A_RELEASE_KEYALIAS_PASSWD=$password
-    export P4A_RELEASE_KEYALIAS=electrum
-    # build two apks
-    export APP_ANDROID_ARCH=armeabi-v7a
-    make release
-    export APP_ANDROID_ARCH=arm64-v8a
-    make release
-else
-    export P4A_DEBUG_KEYSTORE="$CONTRIB"/android_debug.keystore
-    export P4A_DEBUG_KEYSTORE_PASSWD=unsafepassword
-    export P4A_DEBUG_KEYALIAS_PASSWD=unsafepassword
-    export P4A_DEBUG_KEYALIAS=electrum
-    # create keystore if needed
-    if [ ! -f "$P4A_DEBUG_KEYSTORE" ]; then
-        keytool -genkey -v -keystore "$CONTRIB"/android_debug.keystore \
-            -alias "$P4A_DEBUG_KEYALIAS" -keyalg RSA -keysize 2048 -validity 10000 \
-            -dname "CN=mqttserver.ibm.com, OU=ID, O=IBM, L=Hursley, S=Hants, C=GB" \
-            -storepass "$P4A_DEBUG_KEYSTORE_PASSWD" \
-            -keypass "$P4A_DEBUG_KEYALIAS_PASSWD"
-    fi
-    # build two apks (only one on Travis CI)
-    export APP_ANDROID_ARCH=armeabi-v7a
-    make apk
-    if [ ! $CI ]; then
-        export APP_ANDROID_ARCH=arm64-v8a
-        make apk
-    fi
-fi
-
 popd
+echo $VERSION
+echo $VERSION > contrib/apk_version
+pushd ./gui/kivy/; make apk; popd

contrib/make_download

@@ -1,37 +1,21 @@
-#!/usr/bin/python3
+#!/usr/bin/python2
 import re
 import os
-import sys
-import importlib
 
-# load version.py; needlessly complicated alternative to "imp.load_source":
+from versions import version, version_win, version_mac, version_android, version_apk
-version_spec = importlib.util.spec_from_file_location('version', 'electrum/version.py')
+from versions import download_template, download_page
-version_module = importlib.util.module_from_spec(version_spec)
-version_spec.loader.exec_module(version_module)
-
-ELECTRUM_VERSION = version_module.ELECTRUM_VERSION
-APK_VERSION = version_module.APK_VERSION
-print("version", ELECTRUM_VERSION)
-
-dirname = sys.argv[1]
-print("directory", dirname)
-
-download_page = os.path.join(dirname, "panel-download.html")
-download_template = download_page + ".template"
 
 with open(download_template) as f:
     string = f.read()
 
-version = version_win = version_mac = version_android = ELECTRUM_VERSION
 string = string.replace("##VERSION##", version)
 string = string.replace("##VERSION_WIN##", version_win)
 string = string.replace("##VERSION_MAC##", version_mac)
 string = string.replace("##VERSION_ANDROID##", version_android)
-string = string.replace("##VERSION_APK##", APK_VERSION)
+string = string.replace("##VERSION_APK##", version_apk)
 
 files = {
     'tgz': "Electrum-%s.tar.gz" % version,
-    'appimage': "electrum-%s-x86_64.AppImage" % version,
     'zip': "Electrum-%s.zip" % version,
     'mac': "electrum-%s.dmg" % version_mac,
     'win': "electrum-%s.exe" % version_win,
@@ -63,3 +47,5 @@ for k, n in files.items():
 
 with open(download_page,'w') as f:
     f.write(string)
+
+

contrib/make_libsecp256k1.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-
-LIBSECP_VERSION="b408c6a8b287003d1ade5709e6f7bc3c7f1d5be7"
-
-set -e
-
-. $(dirname "$0")/build_tools_util.sh || (echo "Could not source build_tools_util.sh" && exit 1)
-
-here=$(dirname $(realpath "$0" 2> /dev/null || grealpath "$0"))
-CONTRIB="$here"
-PROJECT_ROOT="$CONTRIB/.."
-
-pkgname="secp256k1"
-info "Building $pkgname..."
-
-(
-    cd $CONTRIB
-    if [ ! -d secp256k1 ]; then
-        git clone https://github.com/bitcoin-core/secp256k1.git
-    fi
-    cd secp256k1
-    git reset --hard
-    git clean -f -x -q
-    git checkout $LIBSECP_VERSION
-
-    if ! [ -x configure ] ; then
-        echo "libsecp256k1_la_LDFLAGS = -no-undefined" >> Makefile.am
-        echo "LDFLAGS = -no-undefined" >> Makefile.am
-        ./autogen.sh || fail "Could not run autogen for $pkgname. Please make sure you have automake and libtool installed, and try again."
-    fi
-    if ! [ -r config.status ] ; then
-        ./configure \
-            $AUTOCONF_FLAGS \
-            --prefix="$here/$pkgname/dist" \
-            --enable-module-recovery \
-            --enable-experimental \
-            --enable-module-ecdh \
-            --disable-jni \
-            --disable-tests \
-            --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 install || fail "Could not install $pkgname"
-    . "$here/$pkgname/dist/lib/libsecp256k1.la"
-    host_strip "$here/$pkgname/dist/lib/$dlname"
-    cp -fpv "$here/$pkgname/dist/lib/$dlname" "$PROJECT_ROOT/electrum" || fail "Could not copy the $pkgname binary to its destination"
-    info "$dlname has been placed in the inner 'electrum' folder."
-)

contrib/make_locale

@@ -3,17 +3,13 @@ import os
 import subprocess
 import io
 import zipfile
-import sys
+import requests
-
-try:
-    import requests
-except ImportError as e:
-    sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install <module-name>'")
 
 os.chdir(os.path.dirname(os.path.realpath(__file__)))
 os.chdir('..')
 
-cmd = "find electrum -type f -name '*.py' -o -name '*.kv'"
+code_directories = 'gui plugins lib'
+cmd = "find {} -type f -name '*.py' -o -name '*.kv'".format(code_directories)
 
 files = subprocess.check_output(cmd, shell=True)
 
@@ -23,13 +19,13 @@ with open("app.fil", "wb") as f:
 print("Found {} files to translate".format(len(files.splitlines())))
 
 # Generate fresh translation template
-if not os.path.exists('electrum/locale'):
+if not os.path.exists('lib/locale'):
-    os.mkdir('electrum/locale')
+    os.mkdir('lib/locale')
-cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum/locale/messages.pot'
+cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=lib/locale/messages.pot'
 print('Generate template')
 os.system(cmd)
 
-os.chdir('electrum')
+os.chdir('lib')
 
 crowdin_identifier = 'electrum'
 crowdin_file_name = 'files[electrum-client/messages.pot]'
@@ -57,3 +53,31 @@ if crowdin_api_key:
     response = requests.request('GET', 'https://api.crowdin.com/api/project/' + crowdin_identifier + '/export?key=' + crowdin_api_key)
     print("", "export:", "-" * 20, response.text, "-" * 20, sep="\n")
 
+# Download & unzip
+print('Download translations')
+s = requests.request('GET', 'https://crowdin.com/download/project/' + crowdin_identifier + '.zip').content
+zfobj = zipfile.ZipFile(io.BytesIO(s))
+
+print('Unzip translations')
+for name in zfobj.namelist():
+    if not name.startswith('electrum-client/locale'):
+        continue
+    if name.endswith('/'):
+        if not os.path.exists(name[16:]):
+            os.mkdir(name[16:])
+    else:
+        with open(name[16:], 'wb') as output:
+            output.write(zfobj.read(name))
+
+# Convert .po to .mo
+print('Installing')
+for lang in os.listdir('locale'):
+    if lang.startswith('messages'):
+        continue
+    # Check LC_MESSAGES folder
+    mo_dir = 'locale/%s/LC_MESSAGES' % lang
+    if not os.path.exists(mo_dir):
+        os.mkdir(mo_dir)
+    cmd = 'msgfmt --output-file="%s/electrum.mo" "locale/%s/electrum.po"' % (mo_dir,lang)
+    print('Installing', lang)
+    os.system(cmd)

contrib/make_packages

@@ -1,10 +1,13 @@
 #!/bin/bash
 
-CONTRIB="$(dirname "$0")"
+contrib=$(dirname "$0")
-test -n "$CONTRIB" -a -d "$CONTRIB" || exit
+test -n "$contrib" -a -d "$contrib" || exit
 
-rm "$CONTRIB"/../packages/ -r
+whereis pip3
+if [ $? -ne 0 ] ; then echo "Install pip3" ; exit ; fi
+
+rm "$contrib"/../packages/ -r
 
 #Install pure python modules in electrum directory
-python3 -m pip install -r "$CONTRIB"/deterministic-build/requirements.txt -t "$CONTRIB"/../packages
+pip3 install -r $contrib/deterministic-build/requirements.txt -t $contrib/../packages
 

contrib/make_tgz

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-set -e
-
-CONTRIB="$(dirname "$(readlink -e "$0")")"
-ROOT_FOLDER="$CONTRIB"/..
-PACKAGES="$ROOT_FOLDER"/packages/
-LOCALE="$ROOT_FOLDER"/electrum/locale/
-
-if [ ! -d "$PACKAGES" ]; then
-  echo "Run make_packages first!"
-  exit 1
-fi
-
-git submodule update --init
-
-(
-    rm -rf "$LOCALE"
-    cd "$CONTRIB/deterministic-build/electrum-locale/"
-    if ! which msgfmt > /dev/null 2>&1; then
-        echo "Please install gettext"
-        exit 1
-    fi
-    for i in ./locale/*; do
-        dir="$ROOT_FOLDER"/electrum/$i/LC_MESSAGES
-        mkdir -p $dir
-        msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
-        cp $i/electrum.po "$ROOT_FOLDER"/electrum/$i/electrum.po
-    done
-)
-
-(
-    cd "$ROOT_FOLDER"
-
-    echo "'git clean -fd' would delete the following files: >>>"
-    git clean -fd --dry-run
-    echo "<<<"
-
-    # we could build the kivy atlas potentially?
-    #(cd electrum/gui/kivy/; make theming) || echo "building kivy atlas failed! skipping."
-
-    python3 setup.py --quiet sdist --format=zip,gztar
-)

contrib/osx/CalinsQRReader

@@ -1 +0,0 @@
-Subproject commit 59dfc03272751cd29ee311456fa34c40f7ebb7c0

contrib/osx/README.md

@@ -1,72 +0,0 @@
-Building Mac OS binaries
-========================
-
-✗ _This script does not produce reproducible output (yet!).
-   Please help us remedy this._
-
-This guide explains how to build Electrum binaries for macOS systems.
-
-
-## 1. Building the binary
-
-This needs to be done on a system running macOS or OS X. We use El Capitan (10.11.6) as building it
-on High Sierra (or later)
-makes the binaries [incompatible with older versions](https://github.com/pyinstaller/pyinstaller/issues/1191).
-
-Another factor for the minimum supported macOS version is the
-[bundled Qt version](https://github.com/spesmilo/electrum/issues/3685).
-
-Before starting, make sure that the Xcode command line tools are installed (e.g. you have `git`).
-
-#### 1.1a Get Xcode
-
-Building the QR scanner (CalinsQRReader) requires full Xcode (not just command line tools).
-
-The last Xcode version compatible with El Capitan is Xcode 8.2.1
-
-Get it from [here](https://developer.apple.com/download/more/).
-
-Unfortunately, you need an "Apple ID" account.
-
-After downloading, uncompress it.
-
-Make sure it is the "selected" xcode (e.g.):
-
-    sudo xcode-select -s $HOME/Downloads/Xcode.app/Contents/Developer/
-
-#### 1.1b Build QR scanner separately on newer Mac
-
-Alternatively, you can try building just the QR scanner on newer macOS.
-
-On newer Mac, run:
-
-    pushd contrib/osx/CalinsQRReader; xcodebuild; popd
-    cp -r contrib/osx/CalinsQRReader/build prebuilt_qr
-
-Move `prebuilt_qr` to El Capitan: `contrib/osx/CalinsQRReader/prebuilt_qr`.
-
-
-#### 1.2 Build Electrum
-
-    cd electrum
-    ./contrib/osx/make_osx
-    
-This creates both a folder named Electrum.app and the .dmg file.
-
-
-## 2. Building the image deterministically (WIP)
-The usual way to distribute macOS applications is to use image files containing the 
-application. Although these images can be created on a Mac with the built-in `hdiutil`,
-they are not deterministic.
-
-Instead, we use the toolchain that Bitcoin uses: genisoimage and libdmg-hfsplus.
-These tools do not work on macOS, so you need a separate Linux machine (or VM).
-
-Copy the Electrum.app directory over and install the dependencies, e.g.:
-
-    apt install libcap-dev cmake make gcc faketime
-    
-Then you can just invoke `package.sh` with the path to the app:
-
-    cd electrum
-    ./contrib/osx/package.sh ~/Electrum.app/

contrib/osx/base.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-. $(dirname "$0")/../build_tools_util.sh
-
-
-function DoCodeSignMaybe { # ARGS: infoName fileOrDirName codesignIdentity
-    infoName="$1"
-    file="$2"
-    identity="$3"
-    deep=""
-    if [ -z "$identity" ]; then
-        # we are ok with them not passing anything; master script calls us unconditionally even if no identity is specified
-        return
-    fi
-    if [ -d "$file" ]; then
-        deep="--deep"
-    fi
-    if [ -z "$infoName" ] || [ -z "$file" ] || [ -z "$identity" ] || [ ! -e "$file" ]; then
-        fail "Argument error to internal function DoCodeSignMaybe()"
-    fi
-    info "Code signing ${infoName}..."
-    codesign -f -v $deep -s "$identity" "$file" || fail "Could not code sign ${infoName}"
-}

contrib/osx/make_osx

@@ -1,152 +0,0 @@
-#!/usr/bin/env bash
-
-# Parameterize
-PYTHON_VERSION=3.7.6
-BUILDDIR=/tmp/electrum-build
-PACKAGE=Electrum
-GIT_REPO=https://github.com/spesmilo/electrum
-LIBSECP_VERSION="b408c6a8b287003d1ade5709e6f7bc3c7f1d5be7"
-
-export GCC_STRIP_BINARIES="1"
-
-. $(dirname "$0")/base.sh
-
-CONTRIB_OSX="$(dirname "$(realpath "$0")")"
-CONTRIB="$CONTRIB_OSX/.."
-ROOT_FOLDER="$CONTRIB/.."
-
-src_dir=$(dirname "$0")
-cd $src_dir/../..
-
-VERSION=`git describe --tags --dirty --always`
-
-which brew > /dev/null 2>&1 || fail "Please install brew from https://brew.sh/ to continue"
-which xcodebuild > /dev/null 2>&1 || fail "Please install Xcode and xcode command line tools to continue"
-
-# Code Signing: See https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html
-APP_SIGN=""
-if [ -n "$1" ]; then
-    # Test the identity is valid for signing by doing this hack. There is no other way to do this.
-    cp -f /bin/ls ./CODESIGN_TEST
-    codesign -s "$1" --dryrun -f ./CODESIGN_TEST > /dev/null 2>&1
-    res=$?
-    rm -f ./CODESIGN_TEST
-    if ((res)); then
-        fail "Code signing identity \"$1\" appears to be invalid."
-    fi
-    unset res
-    APP_SIGN="$1"
-    info "Code signing enabled using identity \"$APP_SIGN\""
-else
-    warn "Code signing DISABLED. Specify a valid macOS Developer identity installed on the system as the first argument to this script to enable signing."
-fi
-
-info "Installing Python $PYTHON_VERSION"
-export PATH="~/.pyenv/bin:~/.pyenv/shims:~/Library/Python/3.7/bin:$PATH"
-if [ -d "~/.pyenv" ]; then
-  pyenv update
-else
-  curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash > /dev/null 2>&1
-fi
-PYTHON_CONFIGURE_OPTS="--enable-framework" pyenv install -s $PYTHON_VERSION && \
-pyenv global $PYTHON_VERSION || \
-fail "Unable to use Python $PYTHON_VERSION"
-
-
-info "install dependencies specific to binaries"
-# note that this also installs pinned versions of both pip and setuptools
-python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \
-    || fail "Could not install pyinstaller"
-
-
-info "Installing pyinstaller"
-python3 -m pip install -I --user pyinstaller==3.6 || fail "Could not install pyinstaller"
-
-info "Using these versions for building $PACKAGE:"
-sw_vers
-python3 --version
-echo -n "Pyinstaller "
-pyinstaller --version
-
-rm -rf ./dist
-
-git submodule update --init
-
-rm  -rf $BUILDDIR > /dev/null 2>&1
-mkdir $BUILDDIR
-
-info "generating locale"
-(
-    if ! which msgfmt > /dev/null 2>&1; then
-        brew install gettext
-        brew link --force gettext
-    fi
-    cd "$CONTRIB"/deterministic-build/electrum-locale
-    for i in ./locale/*; do
-        dir="$ROOT_FOLDER"/electrum/$i/LC_MESSAGES
-        mkdir -p $dir
-        msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
-    done
-) || fail "failed generating locale"
-
-
-info "Downloading libusb..."
-curl https://homebrew.bintray.com/bottles/libusb-1.0.22.el_capitan.bottle.tar.gz | \
-tar xz --directory $BUILDDIR
-cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/osx
-echo "82c368dfd4da017ceb32b12ca885576f325503428a4966cc09302cbd62702493  contrib/osx/libusb-1.0.dylib" | \
-    shasum -a 256 -c || fail "libusb checksum mismatched"
-
-info "Preparing for building libsecp256k1"
-brew install autoconf automake libtool
-"$CONTRIB"/make_libsecp256k1.sh || fail "Could not build libsecp"
-cp "$ROOT_FOLDER"/electrum/libsecp256k1.0.dylib contrib/osx
-
-info "Building CalinsQRReader..."
-d=contrib/osx/CalinsQRReader
-pushd $d
-rm -fr build
-# prefer building using xcode ourselves. otherwise fallback to prebuilt binary
-xcodebuild || cp -r prebuilt_qr build || fail "Could not build CalinsQRReader"
-popd
-DoCodeSignMaybe "CalinsQRReader.app" "${d}/build/Release/CalinsQRReader.app" "$APP_SIGN" # If APP_SIGN is empty will be a noop
-
-
-info "Installing requirements..."
-python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements.txt --user || \
-fail "Could not install requirements"
-
-info "Installing hardware wallet requirements..."
-python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \
-fail "Could not install hardware wallet requirements"
-
-info "Building $PACKAGE..."
-python3 -m pip install --no-dependencies --user . > /dev/null || fail "Could not build $PACKAGE"
-
-info "Faking timestamps..."
-for d in ~/Library/Python/ ~/.pyenv .; do
-  pushd $d
-  find . -exec touch -t '200101220000' {} +
-  popd
-done
-
-info "Building binary"
-APP_SIGN="$APP_SIGN" pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary"
-
-info "Adding bitcoin URI types to Info.plist"
-plutil -insert 'CFBundleURLTypes' \
-	-xml '<array><dict> <key>CFBundleURLName</key> <string>bitcoin</string> <key>CFBundleURLSchemes</key> <array><string>bitcoin</string></array> </dict></array>' \
-	-- dist/$PACKAGE.app/Contents/Info.plist \
-	|| fail "Could not add keys to Info.plist. Make sure the program 'plutil' exists and is installed."
-
-DoCodeSignMaybe "app bundle" "dist/${PACKAGE}.app" "$APP_SIGN" # If APP_SIGN is empty will be a noop
-
-info "Creating .DMG"
-hdiutil create -fs HFS+ -volname $PACKAGE -srcfolder dist/$PACKAGE.app dist/electrum-$VERSION.dmg || fail "Could not create .DMG"
-
-DoCodeSignMaybe ".DMG" "dist/electrum-${VERSION}.dmg" "$APP_SIGN" # If APP_SIGN is empty will be a noop
-
-if [ -z "$APP_SIGN" ]; then
-    warn "App was built successfully but was not code signed. Users may get security warnings from macOS."
-    warn "Specify a valid code signing identity as the first argument to this script to enable code signing."
-fi

contrib/osx/osx.spec

@@ -1,160 +0,0 @@
-# -*- mode: python -*-
-
-from PyInstaller.utils.hooks import collect_data_files, collect_submodules, collect_dynamic_libs
-
-import sys, os
-
-PACKAGE='Electrum'
-PYPKG='electrum'
-MAIN_SCRIPT='run_electrum'
-ICONS_FILE=PYPKG + '/gui/icons/electrum.icns'
-APP_SIGN = os.environ.get('APP_SIGN', '')
-
-def fail(*msg):
-    RED='\033[0;31m'
-    NC='\033[0m' # No Color
-    print("\r🗯 {}ERROR:{}".format(RED, NC), *msg)
-    sys.exit(1)
-
-def codesign(identity, binary):
-    d = os.path.dirname(binary)
-    saved_dir=None
-    if d:
-        # switch to directory of the binary so codesign verbose messages don't include long path
-        saved_dir = os.path.abspath(os.path.curdir)
-        os.chdir(d)
-        binary = os.path.basename(binary)
-    os.system("codesign -v -f -s '{}' '{}'".format(identity, binary))==0 or fail("Could not code sign " + binary)
-    if saved_dir:
-        os.chdir(saved_dir)
-
-def monkey_patch_pyinstaller_for_codesigning(identity):
-    # Monkey-patch PyInstaller so that we app-sign all binaries *after* they are modified by PyInstaller
-    # If we app-sign before that point, the signature will be invalid because PyInstaller modifies
-    # @loader_path in the Mach-O loader table.
-    try:
-        import PyInstaller.depend.dylib
-        _saved_func = PyInstaller.depend.dylib.mac_set_relative_dylib_deps
-    except (ImportError, NameError, AttributeError):
-        # Hmm. Likely wrong PyInstaller version.
-        fail("Could not monkey-patch PyInstaller for code signing. Please ensure that you are using PyInstaller 3.4.")
-    _signed = set()
-    def my_func(fn, distname):
-        _saved_func(fn, distname)
-        if  (fn, distname) not in _signed:
-            codesign(identity, fn)
-            _signed.add((fn,distname)) # remember we signed it so we don't sign again
-    PyInstaller.depend.dylib.mac_set_relative_dylib_deps = my_func
-
-
-for i, x in enumerate(sys.argv):
-    if x == '--name':
-        VERSION = sys.argv[i+1]
-        break
-else:
-    raise Exception('no version')
-
-electrum = os.path.abspath(".") + "/"
-block_cipher = None
-
-# see https://github.com/pyinstaller/pyinstaller/issues/2005
-hiddenimports = []
-hiddenimports += collect_submodules('trezorlib')
-hiddenimports += collect_submodules('safetlib')
-hiddenimports += collect_submodules('btchip')
-hiddenimports += collect_submodules('keepkeylib')
-hiddenimports += collect_submodules('websocket')
-hiddenimports += collect_submodules('ckcc')
-hiddenimports += ['PyQt5.QtPrintSupport']  # needed by Revealer
-
-datas = [
-    (electrum + PYPKG + '/*.json', PYPKG),
-    (electrum + PYPKG + '/wordlist/english.txt', PYPKG + '/wordlist'),
-    (electrum + PYPKG + '/locale', PYPKG + '/locale'),
-    (electrum + PYPKG + '/plugins', PYPKG + '/plugins'),
-    (electrum + PYPKG + '/gui/icons', PYPKG + '/gui/icons'),
-]
-datas += collect_data_files('trezorlib')
-datas += collect_data_files('safetlib')
-datas += collect_data_files('btchip')
-datas += collect_data_files('keepkeylib')
-datas += collect_data_files('ckcc')
-datas += collect_data_files('jsonrpcserver')
-datas += collect_data_files('jsonrpcclient')
-
-# Add the QR Scanner helper app
-datas += [(electrum + "contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app", "./contrib/osx/CalinsQRReader/build/Release/CalinsQRReader.app")]
-
-# Add libusb so Trezor and Safe-T mini will work
-binaries = [(electrum + "contrib/osx/libusb-1.0.dylib", ".")]
-binaries += [(electrum + "contrib/osx/libsecp256k1.0.dylib", ".")]
-
-# Workaround for "Retro Look":
-binaries += [b for b in collect_dynamic_libs('PyQt5') if 'macstyle' in b[0]]
-
-# We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
-a = Analysis([electrum+ MAIN_SCRIPT,
-              electrum+'electrum/gui/qt/main_window.py',
-              electrum+'electrum/gui/text.py',
-              electrum+'electrum/util.py',
-              electrum+'electrum/wallet.py',
-              electrum+'electrum/simple_config.py',
-              electrum+'electrum/bitcoin.py',
-              electrum+'electrum/dnssec.py',
-              electrum+'electrum/commands.py',
-              electrum+'electrum/plugins/cosigner_pool/qt.py',
-              electrum+'electrum/plugins/email_requests/qt.py',
-              electrum+'electrum/plugins/trezor/qt.py',
-              electrum+'electrum/plugins/safe_t/client.py',
-              electrum+'electrum/plugins/safe_t/qt.py',
-              electrum+'electrum/plugins/keepkey/qt.py',
-              electrum+'electrum/plugins/ledger/qt.py',
-              electrum+'electrum/plugins/coldcard/qt.py',
-              ],
-             binaries=binaries,
-             datas=datas,
-             hiddenimports=hiddenimports,
-             hookspath=[])
-
-# http://stackoverflow.com/questions/19055089/pyinstaller-onefile-warning-pyconfig-h-when-importing-scipy-or-scipy-signal
-for d in a.datas:
-    if 'pyconfig' in d[0]:
-        a.datas.remove(d)
-        break
-
-# Strip out parts of Qt that we never use. Reduces binary size by tens of MBs. see #4815
-qt_bins2remove=('qtweb', 'qt3d', 'qtgame', 'qtdesigner', 'qtquick', 'qtlocation', 'qttest', 'qtxml')
-print("Removing Qt binaries:", *qt_bins2remove)
-for x in a.binaries.copy():
-    for r in qt_bins2remove:
-        if x[0].lower().startswith(r):
-            a.binaries.remove(x)
-            print('----> Removed x =', x)
-
-# If code signing, monkey-patch in a code signing step to pyinstaller. See: https://github.com/spesmilo/electrum/issues/4994
-if APP_SIGN:
-    monkey_patch_pyinstaller_for_codesigning(APP_SIGN)
-
-pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
-
-exe = EXE(pyz,
-          a.scripts,
-          a.binaries,
-          a.datas,
-          name=PACKAGE,
-          debug=False,
-          strip=False,
-          upx=True,
-          icon=electrum+ICONS_FILE,
-          console=False)
-
-app = BUNDLE(exe,
-             version = VERSION,
-             name=PACKAGE + '.app',
-             icon=electrum+ICONS_FILE,
-             bundle_identifier=None,
-             info_plist={
-                'NSHighResolutionCapable': 'True',
-                'NSSupportsAutomaticGraphicsSwitching': 'True'
-             }
-)

contrib/pull_locale

@@ -1,65 +0,0 @@
-#!/usr/bin/env python3
-import os
-import subprocess
-import io
-import zipfile
-import sys
-
-try:
-    import requests
-except ImportError as e:
-    sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install <module-name>'")
-
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-os.chdir('..')
-
-cmd = "find electrum -type f -name '*.py' -o -name '*.kv'"
-
-files = subprocess.check_output(cmd, shell=True)
-
-with open("app.fil", "wb") as f:
-    f.write(files)
-
-print("Found {} files to translate".format(len(files.splitlines())))
-
-# Generate fresh translation template
-if not os.path.exists('electrum/locale'):
-    os.mkdir('electrum/locale')
-cmd = 'xgettext -s --from-code UTF-8 --language Python --no-wrap -f app.fil --output=electrum/locale/messages.pot'
-print('Generate template')
-os.system(cmd)
-
-os.chdir('electrum')
-
-crowdin_identifier = 'electrum'
-crowdin_file_name = 'files[electrum-client/messages.pot]'
-locale_file_name = 'locale/messages.pot'
-
-# Download & unzip
-print('Download translations')
-s = requests.request('GET', 'https://crowdin.com/backend/download/project/' + crowdin_identifier + '.zip').content
-zfobj = zipfile.ZipFile(io.BytesIO(s))
-
-print('Unzip translations')
-for name in zfobj.namelist():
-    if not name.startswith('electrum-client/locale'):
-        continue
-    if name.endswith('/'):
-        if not os.path.exists(name[16:]):
-            os.mkdir(name[16:])
-    else:
-        with open(name[16:], 'wb') as output:
-            output.write(zfobj.read(name))
-
-# Convert .po to .mo
-print('Installing')
-for lang in os.listdir('locale'):
-    if lang.startswith('messages'):
-        continue
-    # Check LC_MESSAGES folder
-    mo_dir = 'locale/%s/LC_MESSAGES' % lang
-    if not os.path.exists(mo_dir):
-        os.mkdir(mo_dir)
-    cmd = 'msgfmt --output-file="%s/electrum.mo" "locale/%s/electrum.po"' % (mo_dir,lang)
-    print('Installing', lang)
-    os.system(cmd)

contrib/requirements/requirements-binaries.txt

@@ -1,2 +1,2 @@
-PyQt5<5.12
+PyQt5
-PyQt5-sip<=4.19.13
+pycryptodomex

contrib/requirements/requirements-hw.txt

@@ -1,16 +1,7 @@
-# Note: hidapi requires Cython as a build-time dependency (it is not needed at runtime).
-# For reproducible builds, the version of Cython must be pinned down.
-# Further, the pinned Cython must be installed before hidapi is built;
-# otherwise hidapi just downloads the latest Cython. To enforce order,
-# Cython must be listed before hidapi. Notably this also applies to
-# deterministic-build/requirements-hw.txt where items are lexicographically sorted.
-# Hence, we rely on "Cython" preceding "hidapi" lexicographically... :/
-# see https://github.com/spesmilo/electrum/issues/5859
 Cython>=0.27
-
+rlp==0.6.0
-trezor[hidapi]>=0.11.5
+trezor[hidapi]>=0.9.0
-safet>=0.1.5
+keepkey
-keepkey>=6.3.1
+btchip-python
-btchip-python>=0.1.26
+websocket-client
-ckcc-protocol>=0.7.7
 hidapi

contrib/requirements/requirements-wine-build.txt

@@ -1,7 +0,0 @@
-pip
-setuptools
-
-# needed by pyinstaller:
-pefile>=2017.8.1
-altgraph
-pywin32-ctypes>=0.2.0

contrib/requirements/requirements.txt

@@ -1,15 +1,11 @@
 pyaes>=0.1a1
-ecdsa>=0.14
+ecdsa>=0.9
+pbkdf2
+requests
 qrcode
 protobuf
 dnspython
-qdarkstyle<2.7
+jsonrpclib-pelix
-aiorpcx>=0.18,<0.19
+PySocks>=1.6.6
-aiohttp>=3.3.0,<4.0.0
-aiohttp_socks
-certifi
 bitstring
-pycryptodomex>=3.7
+cryptography
-jsonrpcserver
-jsonrpcclient
-attrs

contrib/sign_version

@@ -1,4 +0,0 @@
-#!/bin/bash
-version=`python3 -c "import electrum; print(electrum.version.ELECTRUM_VERSION)"`
-sig=`./run_electrum -w $SIGNING_WALLET signmessage $SIGNING_ADDRESS $version`
-echo "{ \"version\":\"$version\", \"signatures\":{ \"$SIGNING_ADDRESS\":\"$sig\"}}"

contrib/udev/20-hw1.rules

@@ -1,12 +0,0 @@
-# HW.1 / Nano
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2581", ATTRS{idProduct}=="1b7c|2b7c|3b7c|4b7c", TAG+="uaccess", TAG+="udev-acl"
-# Blue
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0000|0000|0001|0002|0003|0004|0005|0006|0007|0008|0009|000a|000b|000c|000d|000e|000f|0010|0011|0012|0013|0014|0015|0016|0017|0018|0019|001a|001b|001c|001d|001e|001f", TAG+="uaccess", TAG+="udev-acl"
-# Nano S
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0001|1000|1001|1002|1003|1004|1005|1006|1007|1008|1009|100a|100b|100c|100d|100e|100f|1010|1011|1012|1013|1014|1015|1016|1017|1018|1019|101a|101b|101c|101d|101e|101f", TAG+="uaccess", TAG+="udev-acl"
-# Aramis
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0002|2000|2001|2002|2003|2004|2005|2006|2007|2008|2009|200a|200b|200c|200d|200e|200f|2010|2011|2012|2013|2014|2015|2016|2017|2018|2019|201a|201b|201c|201d|201e|201f", TAG+="uaccess", TAG+="udev-acl"
-# HW2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0003|3000|3001|3002|3003|3004|3005|3006|3007|3008|3009|300a|300b|300c|300d|300e|300f|3010|3011|3012|3013|3014|3015|3016|3017|3018|3019|301a|301b|301c|301d|301e|301f", TAG+="uaccess", TAG+="udev-acl"
-# Nano X
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2c97", ATTRS{idProduct}=="0004|4000|4001|4002|4003|4004|4005|4006|4007|4008|4009|400a|400b|400c|400d|400e|400f|4010|4011|4012|4013|4014|4015|4016|4017|4018|4019|401a|401b|401c|401d|401e|401f", TAG+="uaccess", TAG+="udev-acl"

contrib/udev/51-coinkite.rules

@@ -1,16 +0,0 @@
-# Linux udev support file.
-#
-# This is a example udev file for HIDAPI devices which changes the permissions
-# to 0666 (world readable/writable) for a specific device on Linux systems.
-#
-# - Copy this file into /etc/udev/rules.d and unplug and re-plug your Coldcard.
-# - Udev does not have to be restarted.
-#
-
-# probably not needed:
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="d13e", ATTRS{idProduct}=="cc10", GROUP="plugdev", MODE="0666"
-
-# required:
-# from <https://github.com/signal11/hidapi/blob/master/udev/99-hid.rules>
-KERNEL=="hidraw*", ATTRS{idVendor}=="d13e", ATTRS{idProduct}=="cc10", GROUP="plugdev", MODE="0666"
-

contrib/udev/51-hid-digitalbitbox.rules

@@ -1 +0,0 @@
-SUBSYSTEM=="usb", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbb%n", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402"

contrib/udev/51-safe-t.rules

@@ -1,10 +0,0 @@
-# Put this file into /usr/lib/udev/rules.d or /etc/udev/rules.d
-
-# Archos Safe-T mini
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="6000", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="safe-tr%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="0e79", ATTRS{idProduct}=="6000",  MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-
-# Archos Safe-T mini Bootloader
-SUBSYSTEM=="usb", ATTR{idVendor}=="0e79", ATTR{idProduct}=="6001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="safe-t%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="0e79", ATTRS{idProduct}=="6001",  MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-

contrib/udev/51-trezor.rules

@@ -1,17 +0,0 @@
-# Trezor: The Original Hardware Wallet
-# https://trezor.io/
-#
-# Put this file into /etc/udev/rules.d
-#
-# If you are creating a distribution package,
-# put this into /usr/lib/udev/rules.d or /lib/udev/rules.d
-# depending on your distribution
-
-# Trezor
-SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-
-# Trezor v2
-SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c0", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="53c1", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"

contrib/udev/51-usb-keepkey.rules

@@ -1,11 +0,0 @@
-# KeepKey: Your Private Bitcoin Vault
-# http://www.keepkey.com/
-# Put this file into /usr/lib/udev/rules.d or /etc/udev/rules.d
-
-# KeepKey HID Firmware/Bootloader
-SUBSYSTEM=="usb", ATTR{idVendor}=="2b24", ATTR{idProduct}=="0001", MODE="0666", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="keepkey%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="2b24", ATTRS{idProduct}=="0001",  MODE="0666", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
-
-# KeepKey WebUSB Firmware/Bootloader
-SUBSYSTEM=="usb", ATTR{idVendor}=="2b24", ATTR{idProduct}=="0002", MODE="0666", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="keepkey%n"
-KERNEL=="hidraw*", ATTRS{idVendor}=="2b24", ATTRS{idProduct}=="0002",  MODE="0666", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"

contrib/udev/52-hid-digitalbitbox.rules

@@ -1 +0,0 @@
-KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="dbbf%n"

contrib/udev/README.md

@@ -1,24 +0,0 @@
-# udev rules
-
-This directory contains all of the udev rules for the supported devices
-as retrieved from vendor websites and repositories.
-These are necessary for the devices to be usable on Linux environments.
-
- - `20-hw1.rules` (Ledger): https://github.com/LedgerHQ/udev-rules/blob/master/20-hw1.rules
- - `51-coinkite.rules` (Coldcard): https://github.com/Coldcard/ckcc-protocol/blob/master/51-coinkite.rules
- - `51-hid-digitalbitbox.rules`, `52-hid-digitalbitbox.rules` (Digital Bitbox): https://shiftcrypto.ch/start_linux
- - `51-trezor.rules` (Trezor): https://github.com/trezor/trezor-common/blob/master/udev/51-trezor.rules
- - `51-usb-keepkey.rules` (Keepkey): https://github.com/keepkey/udev-rules/blob/master/51-usb-keepkey.rules
- - `51-safe-t.rules` (Archos): https://github.com/archos-safe-t/safe-t-common/blob/master/udev/51-safe-t.rules
-
-# Usage
-
-Apply these rules by copying them to `/etc/udev/rules.d/` and notifying `udevadm`.
-Your user will need to be added to the `plugdev` group, which needs to be created if it does not already exist.
-
-```
-$ sudo groupadd plugdev
-$ sudo usermod -aG plugdev $(whoami)
-$ sudo cp contrib/udev/*.rules /etc/udev/rules.d/
-$ sudo udevadm control --reload-rules && sudo udevadm trigger
-```

contrib/upload

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-
-host=$1
-version=`git describe --tags`
-echo $version
-
-here=$(dirname "$0")
-cd $here/../dist
-
-sftp -oBatchMode=no -b - thomasv@$host << !
-   cd electrum-downloads
-   mkdir $version
-   cd $version
-   mput *
-   bye
-!

electrum

@@ -25,28 +25,14 @@
 # SOFTWARE.
 import os
 import sys
-import warnings
-import asyncio
-
-MIN_PYTHON_VERSION = "3.6.1"  # FIXME duplicated from setup.py
-_min_python_version_tuple = tuple(map(int, (MIN_PYTHON_VERSION.split("."))))
-
-
-if sys.version_info[:3] < _min_python_version_tuple:
-    sys.exit("Error: Electrum requires Python version >= %s..." % MIN_PYTHON_VERSION)
-
 
 script_dir = os.path.dirname(os.path.realpath(__file__))
 is_bundle = getattr(sys, 'frozen', False)
 is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "electrum.desktop"))
 is_android = 'ANDROID_DATA' in os.environ
 
-if is_local:  # running from source
-    # developers should probably see all deprecation warnings.
-    warnings.simplefilter('default', DeprecationWarning)
-
 # move this back to gui/kivy/__init.py once plugins are moved
-os.environ['KIVY_DATA_DIR'] = os.path.abspath(os.path.dirname(__file__)) + '/electrum/gui/kivy/data/'
+os.environ['KIVY_DATA_DIR'] = os.path.abspath(os.path.dirname(__file__)) + '/gui/kivy/data/'
 
 if is_local or is_android:
     sys.path.insert(0, os.path.join(script_dir, 'packages'))
@@ -58,41 +44,47 @@ def check_imports():
         import dns
         import pyaes
         import ecdsa
-        import certifi
+        import requests
         import qrcode
+        import pbkdf2
         import google.protobuf
-        import aiorpcx
+        import jsonrpclib
     except ImportError as e:
-        sys.exit(f"Error: {str(e)}. Try 'sudo python3 -m pip install <module-name>'")
+        sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%str(e))
     # the following imports are for pyinstaller
     from google.protobuf import descriptor
     from google.protobuf import message
     from google.protobuf import reflection
     from google.protobuf import descriptor_pb2
+    from jsonrpclib import SimpleJSONRPCServer
     # make sure that certificates are here
-    assert os.path.exists(certifi.where())
+    assert os.path.exists(requests.utils.DEFAULT_CA_BUNDLE_PATH)
 
 
 if not is_android:
     check_imports()
 
+# load local module as electrum
+if is_local or is_android:
+    import imp
+    imp.load_module('electrum', *imp.find_module('lib'))
+    imp.load_module('electrum_gui', *imp.find_module('gui'))
+    imp.load_module('electrum_plugins', *imp.find_module('plugins'))
 
-from electrum.logging import get_logger, configure_logging
+
-from electrum import util
+
+from electrum import bitcoin, util
 from electrum import constants
-from electrum import SimpleConfig
+from electrum import SimpleConfig, Network
-from electrum.wallet_db import WalletDB
+from electrum.wallet import Wallet, Imported_Wallet
-from electrum.wallet import Wallet
 from electrum.storage import WalletStorage, get_derivation_used_for_hw_device_encryption
 from electrum.util import print_msg, print_stderr, json_encode, json_decode, UserCancelled
-from electrum.util import InvalidPassword
+from electrum.util import set_verbosity, InvalidPassword
 from electrum.commands import get_parser, known_commands, Commands, config_variables
 from electrum import daemon
 from electrum import keystore
-from electrum.util import create_and_start_event_loop
+from electrum.mnemonic import Mnemonic
-
+import electrum_plugins
-_logger = get_logger(__name__)
-
 
 # get password routine
 def prompt_password(prompt, confirm=True):
@@ -107,7 +99,105 @@ def prompt_password(prompt, confirm=True):
     return password
 
 
-def init_cmdline(config_options, wallet_path, server):
+
+def run_non_RPC(config):
+    cmdname = config.get('cmd')
+
+    storage = WalletStorage(config.get_wallet_path())
+    if storage.file_exists():
+        sys.exit("Error: Remove the existing wallet first!")
+
+    def password_dialog():
+        return prompt_password("Password (hit return if you do not wish to encrypt your wallet):")
+
+    if cmdname == 'restore':
+        text = config.get('text').strip()
+        passphrase = config.get('passphrase', '')
+        password = password_dialog() if keystore.is_private(text) else None
+        if keystore.is_address_list(text):
+            wallet = Imported_Wallet(storage)
+            for x in text.split():
+                wallet.import_address(x)
+        elif keystore.is_private_key_list(text):
+            k = keystore.Imported_KeyStore({})
+            storage.put('keystore', k.dump())
+            storage.put('use_encryption', bool(password))
+            wallet = Imported_Wallet(storage)
+            for x in text.split():
+                wallet.import_private_key(x, password)
+            storage.write()
+        else:
+            if keystore.is_seed(text):
+                k = keystore.from_seed(text, passphrase, False)
+            elif keystore.is_master_key(text):
+                k = keystore.from_master_key(text)
+            else:
+                sys.exit("Error: Seed or key not recognized")
+            if password:
+                k.update_password(None, password)
+            storage.put('keystore', k.dump())
+            storage.put('wallet_type', 'standard')
+            storage.put('use_encryption', bool(password))
+            storage.write()
+            wallet = Wallet(storage)
+        if not config.get('offline'):
+            network = Network(config)
+            network.start()
+            wallet.start_threads(network)
+            print_msg("Recovering wallet...")
+            wallet.synchronize()
+            wallet.wait_until_synchronized()
+            wallet.stop_threads()
+            # note: we don't wait for SPV
+            msg = "Recovery successful" if wallet.is_found() else "Found no history for this wallet"
+        else:
+            msg = "This wallet was restored offline. It may contain more addresses than displayed."
+        print_msg(msg)
+
+    elif cmdname == 'create':
+        password = password_dialog()
+        passphrase = config.get('passphrase', '')
+        seed_type = 'segwit' if config.get('segwit') else 'standard'
+        seed = Mnemonic('en').make_seed(seed_type)
+        k = keystore.from_seed(seed, passphrase, False)
+        storage.put('keystore', k.dump())
+        storage.put('wallet_type', 'standard')
+        wallet = Wallet(storage)
+        wallet.update_password(None, password, True)
+        wallet.synchronize()
+        print_msg("Your wallet generation seed is:\n\"%s\"" % seed)
+        print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
+
+    wallet.storage.write()
+    print_msg("Wallet saved in '%s'" % wallet.storage.path)
+    sys.exit(0)
+
+
+def init_daemon(config_options):
+    config = SimpleConfig(config_options)
+    storage = WalletStorage(config.get_wallet_path())
+    if not storage.file_exists():
+        print_msg("Error: Wallet file not found.")
+        print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
+        sys.exit(0)
+    if storage.is_encrypted():
+        if storage.is_encrypted_with_hw_device():
+            plugins = init_plugins(config, 'cmdline')
+            password = get_password_for_hw_device_encrypted_storage(plugins)
+        elif config.get('password'):
+            password = config.get('password')
+        else:
+            password = prompt_password('Password:', False)
+            if not password:
+                print_msg("Error: Password required")
+                sys.exit(1)
+    else:
+        password = None
+    config_options['password'] = password
+
+
+def init_cmdline(config_options, server):
+    config = SimpleConfig(config_options)
     cmdname = config.get('cmd')
     cmd = known_commands[cmdname]
 
@@ -122,12 +212,12 @@ def init_cmdline(config_options, wallet_path, server):
         cmd.requires_network = True
 
     # instantiate wallet for command-line
-    storage = WalletStorage(wallet_path)
+    storage = WalletStorage(config.get_wallet_path())
 
     if cmd.requires_wallet and not storage.file_exists():
         print_msg("Error: Wallet file not found.")
         print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
-        sys_exit(1)
+        sys.exit(0)
 
     # important warning
     if cmd.name in ['getprivatekeys']:
@@ -135,17 +225,9 @@ def init_cmdline(config_options, wallet_path, server):
         print_stderr("Exposing a single private key can compromise your entire wallet!")
         print_stderr("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
 
-    # will we need a password
-    if not storage.is_encrypted():
-        db = WalletDB(storage.read(), manual_upgrades=False)
-        use_encryption = db.get('use_encryption')
-    else:
-        use_encryption = True
-
     # commands needing password
-    if  ( (cmd.requires_wallet and storage.is_encrypted() and server is False)\
+    if (cmd.requires_wallet and storage.is_encrypted() and server is None)\
-       or (cmdname == 'load_wallet' and storage.is_encrypted())\
+       or (cmd.requires_password and (storage.get('use_encryption') or storage.is_encrypted())):
-       or (cmd.requires_password and use_encryption)):
         if storage.is_encrypted_with_hw_device():
             # this case is handled later in the control flow
             password = None
@@ -155,38 +237,38 @@ def init_cmdline(config_options, wallet_path, server):
             password = prompt_password('Password:', False)
             if not password:
                 print_msg("Error: Password required")
-                sys_exit(1)
+                sys.exit(1)
     else:
         password = None
 
-    config_options['password'] = config_options.get('password') or password
+    config_options['password'] = password
 
     if cmd.name == 'password':
         new_password = prompt_password('New password:')
         config_options['new_password'] = new_password
 
+    return cmd, password
+
 
 def get_connected_hw_devices(plugins):
-    supported_plugins = plugins.get_hardware_support()
+    support = plugins.get_hardware_support()
+    if not support:
+        print_msg('No hardware wallet support found on your system.')
+        sys.exit(1)
     # scan devices
     devices = []
     devmgr = plugins.device_manager
-    for splugin in supported_plugins:
+    for name, description, plugin in support:
-        name, plugin = splugin.name, splugin.plugin
-        if not plugin:
-            e = splugin.exception
-            _logger.error(f"{name}: error during plugin init: {repr(e)}")
-            continue
         try:
             u = devmgr.unpaired_device_infos(None, plugin)
-        except Exception as e:
+        except:
-            _logger.error(f'error getting device infos for {name}: {repr(e)}')
+            devmgr.print_error("error", name)
             continue
         devices += list(map(lambda x: (name, x), u))
     return devices
 
 
-def get_password_for_hw_device_encrypted_storage(plugins) -> str:
+def get_password_for_hw_device_encrypted_storage(plugins):
     devices = get_connected_hw_devices(plugins)
     if len(devices) == 0:
         print_msg("Error: No connected hw device found. Cannot decrypt this wallet.")
@@ -202,16 +284,14 @@ def get_password_for_hw_device_encrypted_storage(plugins) -> str:
         xpub = plugin.get_xpub(device_info.device.id_, derivation, 'standard', plugin.handler)
     except UserCancelled:
         sys.exit(0)
-    password = keystore.Xpub.get_pubkey_from_xpub(xpub, ()).hex()
+    password = keystore.Xpub.get_pubkey_from_xpub(xpub, ())
     return password
 
 
-async def run_offline_command(config, config_options, plugins):
+def run_offline_command(config, config_options, plugins):
     cmdname = config.get('cmd')
     cmd = known_commands[cmdname]
     password = config_options.get('password')
-    if 'wallet_path' in cmd.options and config_options.get('wallet_path') is None:
-        config_options['wallet_path'] = config.get_wallet_path()
     if cmd.requires_wallet:
         storage = WalletStorage(config.get_wallet_path())
         if storage.is_encrypted():
@@ -219,15 +299,13 @@ async def run_offline_command(config, config_options, plugins):
                 password = get_password_for_hw_device_encrypted_storage(plugins)
                 config_options['password'] = password
             storage.decrypt(password)
-        db = WalletDB(storage.read(), manual_upgrades=False)
+        wallet = Wallet(storage)
-        wallet = Wallet(db, storage, config=config)
-        config_options['wallet'] = wallet
     else:
         wallet = None
     # check password
     if cmd.requires_password and wallet.has_password():
         try:
-            wallet.check_password(password)
+            seed = wallet.check_password(password)
         except InvalidPassword:
             print_msg("Error: This password does not decode this wallet.")
             sys.exit(1)
@@ -241,25 +319,19 @@ async def run_offline_command(config, config_options, plugins):
     # options
     kwargs = {}
     for x in cmd.options:
-        kwargs[x] = (config_options.get(x) if x in ['wallet_path', 'wallet', 'password', 'new_password'] else config.get(x))
+        kwargs[x] = (config_options.get(x) if x in ['password', 'new_password'] else config.get(x))
-    cmd_runner = Commands(config=config)
+    cmd_runner = Commands(config, wallet, None)
     func = getattr(cmd_runner, cmd.name)
-    result = await func(*args, **kwargs)
+    result = func(*args, **kwargs)
     # save wallet
     if wallet:
-        wallet.save_db()
+        wallet.storage.write()
     return result
 
-
 def init_plugins(config, gui_name):
-    from electrum.plugin import Plugins
+    from electrum.plugins import Plugins
-    return Plugins(config, gui_name)
+    return Plugins(config, is_local or is_android, gui_name)
 
-def sys_exit(i):
-    # stop event loop and exit
-    loop.call_soon_threadsafe(stop_loop.set_result, 1)
-    loop_thread.join(timeout=1)
-    sys.exit(i)
 
 if __name__ == '__main__':
     # The hook will only be used in the Qt GUI right now
@@ -272,17 +344,6 @@ if __name__ == '__main__':
         sys.argv.remove('help')
         sys.argv.append('-h')
 
-    # old '-v' syntax
-    # Due to this workaround that keeps old -v working,
-    # more advanced usages of -v need to use '-v='.
-    # e.g. -v=debug,network=warning,interface=error
-    try:
-        i = sys.argv.index('-v')
-    except ValueError:
-        pass
-    else:
-        sys.argv[i] = '-v*'
-
     # read arguments from stdin pipe and prompt
     for i, arg in enumerate(sys.argv):
         if arg == '-':
@@ -303,7 +364,7 @@ if __name__ == '__main__':
     # config is an object passed to the various constructors (wallet, interface, gui)
     if is_android:
         config_options = {
-            'verbosity': '',
+            'verbose': True,
             'cmd': 'gui',
             'gui': 'kivy',
         }
@@ -323,8 +384,8 @@ if __name__ == '__main__':
     if config_options.get('portable'):
         config_options['electrum_path'] = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
 
-    if not config_options.get('verbosity'):
+    # kivy sometimes freezes when we write to sys.stderr
-        warnings.simplefilter('ignore', DeprecationWarning)
+    set_verbosity(config_options.get('verbose') and config_options.get('gui')!='kivy')
 
     # check uri
     uri = config_options.get('url')
@@ -332,102 +393,91 @@ if __name__ == '__main__':
         if not uri.startswith('bitcoin:'):
             print_stderr('unknown command:', uri)
             sys.exit(1)
+        config_options['url'] = uri
 
-    # singleton
+    # todo: defer this to gui
     config = SimpleConfig(config_options)
+    cmdname = config.get('cmd')
 
     if config.get('testnet'):
         constants.set_testnet()
     elif config.get('regtest'):
         constants.set_regtest()
-    elif config.get('simnet'):
+
+    if config.get('simnet'):
         constants.set_simnet()
 
-    cmdname = config.get('cmd')
+    # run non-RPC commands separately
-
+    if cmdname in ['create', 'restore']:
-    if cmdname == 'daemon' and config.get("detach"):
+        run_non_RPC(config)
-        # fork before creating the asyncio event loop
+        sys.exit(0)
-        pid = os.fork()
-        if pid:
-            print_stderr("starting daemon (PID %d)" % pid)
-            sys.exit(0)
-        else:
-            # redirect standard file descriptors
-            sys.stdout.flush()
-            sys.stderr.flush()
-            si = open(os.devnull, 'r')
-            so = open(os.devnull, 'w')
-            se = open(os.devnull, 'w')
-            os.dup2(si.fileno(), sys.stdin.fileno())
-            os.dup2(so.fileno(), sys.stdout.fileno())
-            os.dup2(se.fileno(), sys.stderr.fileno())
-
-    loop, stop_loop, loop_thread = create_and_start_event_loop()
 
     if cmdname == 'gui':
-        configure_logging(config)
+        fd, server = daemon.get_fd_or_server(config)
-        fd = daemon.get_file_descriptor(config)
         if fd is not None:
             plugins = init_plugins(config, config.get('gui', 'qt'))
-            d = daemon.Daemon(config, fd)
+            d = daemon.Daemon(config, fd, True)
-            try:
+            d.start()
-                d.run_gui(config, plugins)
+            d.init_gui(config, plugins)
-            except BaseException as e:
+            sys.exit(0)
-                _logger.exception('daemon.run_gui errored')
-                sys_exit(1)
-            else:
-                sys_exit(0)
         else:
-            result = daemon.request(config, 'gui', (config_options,))
+            result = server.gui(config_options)
 
     elif cmdname == 'daemon':
+        subcommand = config.get('subcommand')
+        if subcommand in ['load_wallet']:
+            init_daemon(config_options)
 
-        configure_logging(config)
+        if subcommand in [None, 'start']:
-        fd = daemon.get_file_descriptor(config)
+            fd, server = daemon.get_fd_or_server(config)
-        if fd is not None:
+            if fd is not None:
-            # run daemon
+                if subcommand == 'start':
-            init_plugins(config, 'cmdline')
+                    pid = os.fork()
-            d = daemon.Daemon(config, fd)
+                    if pid:
-            d.run_daemon()
+                        print_stderr("starting daemon (PID %d)" % pid)
-            sys_exit(0)
+                        sys.exit(0)
+                init_plugins(config, 'cmdline')
+                d = daemon.Daemon(config, fd, False)
+                d.start()
+                if config.get('websocket_server'):
+                    from electrum import websockets
+                    websockets.WebSocketServer(config, d.network).start()
+                if config.get('requests_dir'):
+                    path = os.path.join(config.get('requests_dir'), 'index.html')
+                    if not os.path.exists(path):
+                        print("Requests directory not configured.")
+                        print("You can configure it using https://github.com/spesmilo/electrum-merchant")
+                        sys.exit(1)
+                d.join()
+                sys.exit(0)
+            else:
+                result = server.daemon(config_options)
         else:
-            print_msg("Daemon already running")
+            server = daemon.get_server(config)
-            sys_exit(1)
+            if server is not None:
+                result = server.daemon(config_options)
+            else:
+                print_msg("Daemon not running")
+                sys.exit(1)
     else:
         # command line
-        cmd = known_commands[cmdname]
+        server = daemon.get_server(config)
-        wallet_path = config.get_wallet_path()
+        init_cmdline(config_options, server)
-        if not config.get('offline'):
+        if server is not None:
-            init_cmdline(config_options, wallet_path, True)
+            result = server.run_cmdline(config_options)
-            timeout = config.get('timeout', 60)
-            if timeout: timeout = int(timeout)
-            try:
-                result = daemon.request(config, 'run_cmdline', (config_options,), timeout)
-            except daemon.DaemonNotRunning:
-                print_msg("Daemon not running; try 'electrum daemon -d'")
-                if not cmd.requires_network:
-                    print_msg("To run this command without a daemon, use --offline")
-                sys_exit(1)
-            except Exception as e:
-                print_stderr(str(e) or repr(e))
-                sys_exit(1)
         else:
+            cmd = known_commands[cmdname]
             if cmd.requires_network:
-                print_msg("This command cannot be run offline")
+                print_msg("Daemon not running; try 'electrum daemon start'")
-                sys_exit(1)
+                sys.exit(1)
-            init_cmdline(config_options, wallet_path, False)
+            else:
-            plugins = init_plugins(config, 'cmdline')
+                plugins = init_plugins(config, 'cmdline')
-            coro = run_offline_command(config, config_options, plugins)
+                result = run_offline_command(config, config_options, plugins)
-            fut = asyncio.run_coroutine_threadsafe(coro, loop)
+                # print result
-            try:
-                result = fut.result()
-            except Exception as e:
-                print_stderr(str(e) or repr(e))
-                sys_exit(1)
     if isinstance(result, str):
         print_msg(result)
     elif type(result) is dict and result.get('error'):
         print_stderr(result.get('error'))
     elif result is not None:
         print_msg(json_encode(result))
-    sys_exit(0)
+    sys.exit(0)

electrum-env

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #
 # This script creates a virtualenv named 'env' and installs all
 # python dependencies before activating the env and running Electrum.
@@ -17,11 +17,11 @@ if [ -e ./env/bin/activate ]; then
 else
     virtualenv env -p `which python3`
     source ./env/bin/activate
-    python3 -m pip install .[fast]
+    python3 setup.py install
 fi
 
 export PYTHONPATH="/usr/local/lib/python${PYTHON_VER}/site-packages:$PYTHONPATH"
 
-./run_electrum "$@"
+./electrum "$@"
 
 deactivate

electrum.conf.sample

@@ -0,0 +1,16 @@
+# Configuration file for the Electrum client
+# Settings defined here are shared across wallets
+#
+# copy this file to /etc/electrum.conf if you want read-only settings
+
+[client]
+server = electrum.novit.ro:50001:t
+proxy = None
+gap_limit = 5
+# booleans use python syntax
+use_change = True
+gui = qt
+num_zeros = 2
+# default transaction fee is in Satoshis
+fee = 10000
+winpos-qt = [799, 226, 877, 435]

electrum.desktop

@@ -3,20 +3,19 @@
 
 [Desktop Entry]
 Comment=Lightweight Bitcoin Client
-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"
+Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum %u"
 GenericName[en_US]=Bitcoin Wallet
 GenericName=Bitcoin Wallet
 Icon=electrum
 Name[en_US]=Electrum Bitcoin Wallet
 Name=Electrum Bitcoin Wallet
 Categories=Finance;Network;
-StartupNotify=true
+StartupNotify=false
-StartupWMClass=electrum
 Terminal=false
 Type=Application
 MimeType=x-scheme-handler/bitcoin;
 Actions=Testnet;
 
 [Desktop Action Testnet]
-Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"
+Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum --testnet %u"
 Name=Testnet mode

electrum/__init__.py

@@ -1,30 +0,0 @@
-import sys
-import os
-
-# these are ~duplicated from run_electrum:
-is_bundle = getattr(sys, 'frozen', False)
-is_local = not is_bundle and os.path.exists(os.path.join(os.path.dirname(os.path.dirname(__file__)), "electrum.desktop"))
-
-# when running from source, on Windows, also search for DLLs in inner 'electrum' folder
-if is_local and os.name == 'nt':
-    if hasattr(os, 'add_dll_directory'):  # requires python 3.8+
-        os.add_dll_directory(os.path.dirname(__file__))
-
-
-from .version import ELECTRUM_VERSION
-from .util import format_satoshis
-from .wallet import Wallet
-from .storage import WalletStorage
-from .coinchooser import COIN_CHOOSERS
-from .network import Network, pick_random_server
-from .interface import Interface
-from .simple_config import SimpleConfig
-from . import bitcoin
-from . import transaction
-from . import daemon
-from .transaction import Transaction
-from .plugin import BasePlugin
-from .commands import Commands, known_commands
-
-
-__version__ = ELECTRUM_VERSION

electrum/address_synchronizer.py

@@ -1,863 +0,0 @@
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2018 The Electrum Developers
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import asyncio
-import threading
-import asyncio
-import itertools
-from collections import defaultdict
-from typing import TYPE_CHECKING, Dict, Optional, Set, Tuple, NamedTuple, Sequence, List
-
-from . import bitcoin
-from .bitcoin import COINBASE_MATURITY
-from .util import profiler, bfh, TxMinedInfo
-from .transaction import Transaction, TxOutput, TxInput, PartialTxInput, TxOutpoint, PartialTransaction
-from .synchronizer import Synchronizer
-from .verifier import SPV
-from .blockchain import hash_header
-from .i18n import _
-from .logging import Logger
-
-if TYPE_CHECKING:
-    from .network import Network
-    from .wallet_db import WalletDB
-
-
-TX_HEIGHT_FUTURE = -3
-TX_HEIGHT_LOCAL = -2
-TX_HEIGHT_UNCONF_PARENT = -1
-TX_HEIGHT_UNCONFIRMED = 0
-
-class AddTransactionException(Exception):
-    pass
-
-
-class UnrelatedTransactionException(AddTransactionException):
-    def __str__(self):
-        return _("Transaction is unrelated to this wallet.")
-
-
-class HistoryItem(NamedTuple):
-    txid: str
-    tx_mined_status: TxMinedInfo
-    delta: Optional[int]
-    fee: Optional[int]
-    balance: Optional[int]
-
-
-class AddressSynchronizer(Logger):
-    """
-    inherited by wallet
-    """
-
-    def __init__(self, db: 'WalletDB'):
-        self.db = db
-        self.network = None  # type: Network
-        Logger.__init__(self)
-        # verifier (SPV) and synchronizer are started in start_network
-        self.synchronizer = None  # type: Synchronizer
-        self.verifier = None  # type: SPV
-        # locks: if you need to take multiple ones, acquire them in the order they are defined here!
-        self.lock = threading.RLock()
-        self.transaction_lock = threading.RLock()
-        self.future_tx = {}  # type: Dict[str, int]  # txid -> blocks remaining
-        # Transactions pending verification.  txid -> tx_height. Access with self.lock.
-        self.unverified_tx = defaultdict(int)
-        # true when synchronized
-        self.up_to_date = False
-        # thread local storage for caching stuff
-        self.threadlocal_cache = threading.local()
-
-        self._get_addr_balance_cache = {}
-
-        self.load_and_cleanup()
-
-    def with_transaction_lock(func):
-        def func_wrapper(self, *args, **kwargs):
-            with self.transaction_lock:
-                return func(self, *args, **kwargs)
-        return func_wrapper
-
-    def load_and_cleanup(self):
-        self.load_local_history()
-        self.check_history()
-        self.load_unverified_transactions()
-        self.remove_local_transactions_we_dont_have()
-
-    def is_mine(self, address: Optional[str]) -> bool:
-        if not address: return False
-        return self.db.is_addr_in_history(address)
-
-    def get_addresses(self):
-        return sorted(self.db.get_history())
-
-    def get_address_history(self, addr: str) -> Sequence[Tuple[str, int]]:
-        """Returns the history for the address, in the format that would be returned by a server.
-
-        Note: The difference between db.get_addr_history and this method is that
-        db.get_addr_history stores the response from a server, so it only includes txns
-        a server sees, i.e. that does not contain local and future txns.
-        """
-        h = []
-        # we need self.transaction_lock but get_tx_height will take self.lock
-        # so we need to take that too here, to enforce order of locks
-        with self.lock, self.transaction_lock:
-            related_txns = self._history_local.get(addr, set())
-            for tx_hash in related_txns:
-                tx_height = self.get_tx_height(tx_hash).height
-                h.append((tx_hash, tx_height))
-        return h
-
-    def get_address_history_len(self, addr: str) -> int:
-        """Return number of transactions where address is involved."""
-        return len(self._history_local.get(addr, ()))
-
-    def get_txin_address(self, txin: TxInput) -> Optional[str]:
-        if isinstance(txin, PartialTxInput):
-            if txin.address:
-                return txin.address
-        prevout_hash = txin.prevout.txid.hex()
-        prevout_n = txin.prevout.out_idx
-        for addr in self.db.get_txo_addresses(prevout_hash):
-            l = self.db.get_txo_addr(prevout_hash, addr)
-            for n, v, is_cb in l:
-                if n == prevout_n:
-                    return addr
-        return None
-
-    def get_txout_address(self, txo: TxOutput) -> Optional[str]:
-        return txo.address
-
-    def load_unverified_transactions(self):
-        # review transactions that are in the history
-        for addr in self.db.get_history():
-            hist = self.db.get_addr_history(addr)
-            for tx_hash, tx_height in hist:
-                # add it in case it was previously unconfirmed
-                self.add_unverified_tx(tx_hash, tx_height)
-
-    def start_network(self, network):
-        self.network = network
-        if self.network is not None:
-            self.synchronizer = Synchronizer(self)
-            self.verifier = SPV(self.network, self)
-            self.network.register_callback(self.on_blockchain_updated, ['blockchain_updated'])
-
-    def on_blockchain_updated(self, event, *args):
-        self._get_addr_balance_cache = {}  # invalidate cache
-
-    def stop_threads(self):
-        if self.network:
-            if self.synchronizer:
-                asyncio.run_coroutine_threadsafe(self.synchronizer.stop(), self.network.asyncio_loop)
-                self.synchronizer = None
-            if self.verifier:
-                asyncio.run_coroutine_threadsafe(self.verifier.stop(), self.network.asyncio_loop)
-                self.verifier = None
-            self.network.unregister_callback(self.on_blockchain_updated)
-            self.db.put('stored_height', self.get_local_height())
-
-    def add_address(self, address):
-        if not self.db.get_addr_history(address):
-            self.db.history[address] = []
-            self.set_up_to_date(False)
-        if self.synchronizer:
-            self.synchronizer.add(address)
-
-    def get_conflicting_transactions(self, tx_hash, tx: Transaction, include_self=False):
-        """Returns a set of transaction hashes from the wallet history that are
-        directly conflicting with tx, i.e. they have common outpoints being
-        spent with tx.
-
-        include_self specifies whether the tx itself should be reported as a
-        conflict (if already in wallet history)
-        """
-        conflicting_txns = set()
-        with self.transaction_lock:
-            for txin in tx.inputs():
-                if txin.is_coinbase_input():
-                    continue
-                prevout_hash = txin.prevout.txid.hex()
-                prevout_n = txin.prevout.out_idx
-                spending_tx_hash = self.db.get_spent_outpoint(prevout_hash, prevout_n)
-                if spending_tx_hash is None:
-                    continue
-                # this outpoint has already been spent, by spending_tx
-                # annoying assert that has revealed several bugs over time:
-                assert self.db.get_transaction(spending_tx_hash), "spending tx not in wallet db"
-                conflicting_txns |= {spending_tx_hash}
-            if tx_hash in conflicting_txns:
-                # this tx is already in history, so it conflicts with itself
-                if len(conflicting_txns) > 1:
-                    raise Exception('Found conflicting transactions already in wallet history.')
-                if not include_self:
-                    conflicting_txns -= {tx_hash}
-            return conflicting_txns
-
-    def add_transaction(self, tx: Transaction, *, allow_unrelated=False) -> bool:
-        """Returns whether the tx was successfully added to the wallet history."""
-        assert tx, tx
-        # note: tx.is_complete() is not necessarily True; tx might be partial
-        # but it *needs* to have a txid:
-        tx_hash = tx.txid()
-        if tx_hash is None:
-            raise Exception("cannot add tx without txid to wallet history")
-        # we need self.transaction_lock but get_tx_height will take self.lock
-        # so we need to take that too here, to enforce order of locks
-        with self.lock, self.transaction_lock:
-            # NOTE: returning if tx in self.transactions might seem like a good idea
-            # BUT we track is_mine inputs in a txn, and during subsequent calls
-            # of add_transaction tx, we might learn of more-and-more inputs of
-            # being is_mine, as we roll the gap_limit forward
-            is_coinbase = tx.inputs()[0].is_coinbase_input()
-            tx_height = self.get_tx_height(tx_hash).height
-            if not allow_unrelated:
-                # note that during sync, if the transactions are not properly sorted,
-                # it could happen that we think tx is unrelated but actually one of the inputs is is_mine.
-                # this is the main motivation for allow_unrelated
-                is_mine = any([self.is_mine(self.get_txin_address(txin)) for txin in tx.inputs()])
-                is_for_me = any([self.is_mine(self.get_txout_address(txo)) for txo in tx.outputs()])
-                if not is_mine and not is_for_me:
-                    raise UnrelatedTransactionException()
-            # Find all conflicting transactions.
-            # In case of a conflict,
-            #     1. confirmed > mempool > local
-            #     2. this new txn has priority over existing ones
-            # When this method exits, there must NOT be any conflict, so
-            # either keep this txn and remove all conflicting (along with dependencies)
-            #     or drop this txn
-            conflicting_txns = self.get_conflicting_transactions(tx_hash, tx)
-            if conflicting_txns:
-                existing_mempool_txn = any(
-                    self.get_tx_height(tx_hash2).height in (TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT)
-                    for tx_hash2 in conflicting_txns)
-                existing_confirmed_txn = any(
-                    self.get_tx_height(tx_hash2).height > 0
-                    for tx_hash2 in conflicting_txns)
-                if existing_confirmed_txn and tx_height <= 0:
-                    # this is a non-confirmed tx that conflicts with confirmed txns; drop.
-                    return False
-                if existing_mempool_txn and tx_height == TX_HEIGHT_LOCAL:
-                    # this is a local tx that conflicts with non-local txns; drop.
-                    return False
-                # keep this txn and remove all conflicting
-                to_remove = set()
-                to_remove |= conflicting_txns
-                for conflicting_tx_hash in conflicting_txns:
-                    to_remove |= self.get_depending_transactions(conflicting_tx_hash)
-                for tx_hash2 in to_remove:
-                    self.remove_transaction(tx_hash2)
-            # add inputs
-            def add_value_from_prev_output():
-                # note: this nested loop takes linear time in num is_mine outputs of prev_tx
-                for addr in self.db.get_txo_addresses(prevout_hash):
-                    outputs = self.db.get_txo_addr(prevout_hash, addr)
-                    # note: instead of [(n, v, is_cb), ...]; we could store: {n -> (v, is_cb)}
-                    for n, v, is_cb in outputs:
-                        if n == prevout_n:
-                            if addr and self.is_mine(addr):
-                                self.db.add_txi_addr(tx_hash, addr, ser, v)
-                                self._get_addr_balance_cache.pop(addr, None)  # invalidate cache
-                            return
-            for txi in tx.inputs():
-                if txi.is_coinbase_input():
-                    continue
-                prevout_hash = txi.prevout.txid.hex()
-                prevout_n = txi.prevout.out_idx
-                ser = txi.prevout.to_str()
-                self.db.set_spent_outpoint(prevout_hash, prevout_n, tx_hash)
-                add_value_from_prev_output()
-            # add outputs
-            for n, txo in enumerate(tx.outputs()):
-                v = txo.value
-                ser = tx_hash + ':%d'%n
-                scripthash = bitcoin.script_to_scripthash(txo.scriptpubkey.hex())
-                self.db.add_prevout_by_scripthash(scripthash, prevout=TxOutpoint.from_str(ser), value=v)
-                addr = self.get_txout_address(txo)
-                if addr and self.is_mine(addr):
-                    self.db.add_txo_addr(tx_hash, addr, n, v, is_coinbase)
-                    self._get_addr_balance_cache.pop(addr, None)  # invalidate cache
-                    # give v to txi that spends me
-                    next_tx = self.db.get_spent_outpoint(tx_hash, n)
-                    if next_tx is not None:
-                        self.db.add_txi_addr(next_tx, addr, ser, v)
-                        self._add_tx_to_local_history(next_tx)
-            # add to local history
-            self._add_tx_to_local_history(tx_hash)
-            # save
-            self.db.add_transaction(tx_hash, tx)
-            self.db.add_num_inputs_to_tx(tx_hash, len(tx.inputs()))
-            return True
-
-    def remove_transaction(self, tx_hash: str) -> None:
-        def remove_from_spent_outpoints():
-            # undo spends in spent_outpoints
-            if tx is not None:
-                # if we have the tx, this branch is faster
-                for txin in tx.inputs():
-                    if txin.is_coinbase_input():
-                        continue
-                    prevout_hash = txin.prevout.txid.hex()
-                    prevout_n = txin.prevout.out_idx
-                    self.db.remove_spent_outpoint(prevout_hash, prevout_n)
-            else:
-                # expensive but always works
-                for prevout_hash, prevout_n in self.db.list_spent_outpoints():
-                    spending_txid = self.db.get_spent_outpoint(prevout_hash, prevout_n)
-                    if spending_txid == tx_hash:
-                        self.db.remove_spent_outpoint(prevout_hash, prevout_n)
-
-        with self.lock, self.transaction_lock:
-            self.logger.info(f"removing tx from history {tx_hash}")
-            tx = self.db.remove_transaction(tx_hash)
-            remove_from_spent_outpoints()
-            self._remove_tx_from_local_history(tx_hash)
-            for addr in itertools.chain(self.db.get_txi_addresses(tx_hash), self.db.get_txo_addresses(tx_hash)):
-                self._get_addr_balance_cache.pop(addr, None)  # invalidate cache
-            self.db.remove_txi(tx_hash)
-            self.db.remove_txo(tx_hash)
-            self.db.remove_tx_fee(tx_hash)
-            self.db.remove_verified_tx(tx_hash)
-            self.unverified_tx.pop(tx_hash, None)
-            if tx:
-                for idx, txo in enumerate(tx.outputs()):
-                    scripthash = bitcoin.script_to_scripthash(txo.scriptpubkey.hex())
-                    prevout = TxOutpoint(bfh(tx_hash), idx)
-                    self.db.remove_prevout_by_scripthash(scripthash, prevout=prevout, value=txo.value)
-
-    def get_depending_transactions(self, tx_hash):
-        """Returns all (grand-)children of tx_hash in this wallet."""
-        with self.transaction_lock:
-            children = set()
-            for n in self.db.get_spent_outpoints(tx_hash):
-                other_hash = self.db.get_spent_outpoint(tx_hash, n)
-                children.add(other_hash)
-                children |= self.get_depending_transactions(other_hash)
-            return children
-
-    def receive_tx_callback(self, tx_hash: str, tx: Transaction, tx_height: int) -> None:
-        self.add_unverified_tx(tx_hash, tx_height)
-        self.add_transaction(tx, allow_unrelated=True)
-
-    def receive_history_callback(self, addr: str, hist, tx_fees: Dict[str, int]):
-        with self.lock:
-            old_hist = self.get_address_history(addr)
-            for tx_hash, height in old_hist:
-                if (tx_hash, height) not in hist:
-                    # make tx local
-                    self.unverified_tx.pop(tx_hash, None)
-                    self.db.remove_verified_tx(tx_hash)
-                    if self.verifier:
-                        self.verifier.remove_spv_proof_for_tx(tx_hash)
-            self.db.set_addr_history(addr, hist)
-
-        for tx_hash, tx_height in hist:
-            # add it in case it was previously unconfirmed
-            self.add_unverified_tx(tx_hash, tx_height)
-            # if addr is new, we have to recompute txi and txo
-            tx = self.db.get_transaction(tx_hash)
-            if tx is None:
-                continue
-            self.add_transaction(tx, allow_unrelated=True)
-
-        # Store fees
-        for tx_hash, fee_sat in tx_fees.items():
-            self.db.add_tx_fee_from_server(tx_hash, fee_sat)
-
-    @profiler
-    def load_local_history(self):
-        self._history_local = {}  # type: Dict[str, Set[str]]  # address -> set(txid)
-        self._address_history_changed_events = defaultdict(asyncio.Event)  # address -> Event
-        for txid in itertools.chain(self.db.list_txi(), self.db.list_txo()):
-            self._add_tx_to_local_history(txid)
-
-    @profiler
-    def check_history(self):
-        hist_addrs_mine = list(filter(lambda k: self.is_mine(k), self.db.get_history()))
-        hist_addrs_not_mine = list(filter(lambda k: not self.is_mine(k), self.db.get_history()))
-        for addr in hist_addrs_not_mine:
-            self.db.remove_addr_history(addr)
-        for addr in hist_addrs_mine:
-            hist = self.db.get_addr_history(addr)
-            for tx_hash, tx_height in hist:
-                if self.db.get_txi_addresses(tx_hash) or self.db.get_txo_addresses(tx_hash):
-                    continue
-                tx = self.db.get_transaction(tx_hash)
-                if tx is not None:
-                    self.add_transaction(tx, allow_unrelated=True)
-
-    def remove_local_transactions_we_dont_have(self):
-        for txid in itertools.chain(self.db.list_txi(), self.db.list_txo()):
-            tx_height = self.get_tx_height(txid).height
-            if tx_height == TX_HEIGHT_LOCAL and not self.db.get_transaction(txid):
-                self.remove_transaction(txid)
-
-    def clear_history(self):
-        with self.lock:
-            with self.transaction_lock:
-                self.db.clear_history()
-
-    def get_txpos(self, tx_hash):
-        """Returns (height, txpos) tuple, even if the tx is unverified."""
-        with self.lock:
-            verified_tx_mined_info = self.db.get_verified_tx(tx_hash)
-            if verified_tx_mined_info:
-                return verified_tx_mined_info.height, verified_tx_mined_info.txpos
-            elif tx_hash in self.unverified_tx:
-                height = self.unverified_tx[tx_hash]
-                return (height, -1) if height > 0 else ((1e9 - height), -1)
-            else:
-                return (1e9+1, -1)
-
-    def with_local_height_cached(func):
-        # get local height only once, as it's relatively expensive.
-        # take care that nested calls work as expected
-        def f(self, *args, **kwargs):
-            orig_val = getattr(self.threadlocal_cache, 'local_height', None)
-            self.threadlocal_cache.local_height = orig_val or self.get_local_height()
-            try:
-                return func(self, *args, **kwargs)
-            finally:
-                self.threadlocal_cache.local_height = orig_val
-        return f
-
-    @with_local_height_cached
-    def get_history(self, *, domain=None) -> Sequence[HistoryItem]:
-        # get domain
-        if domain is None:
-            domain = self.get_addresses()
-        domain = set(domain)
-        # 1. Get the history of each address in the domain, maintain the
-        #    delta of a tx as the sum of its deltas on domain addresses
-        tx_deltas = defaultdict(int)
-        for addr in domain:
-            h = self.get_address_history(addr)
-            for tx_hash, height in h:
-                delta = self.get_tx_delta(tx_hash, addr)
-                if delta is None or tx_deltas[tx_hash] is None:
-                    tx_deltas[tx_hash] = None
-                else:
-                    tx_deltas[tx_hash] += delta
-        # 2. create sorted history
-        history = []
-        for tx_hash in tx_deltas:
-            delta = tx_deltas[tx_hash]
-            tx_mined_status = self.get_tx_height(tx_hash)
-            fee = self.get_tx_fee(tx_hash)
-            history.append((tx_hash, tx_mined_status, delta, fee))
-        history.sort(key = lambda x: self.get_txpos(x[0]), reverse=True)
-        # 3. add balance
-        c, u, x = self.get_balance(domain)
-        balance = c + u + x
-        h2 = []
-        for tx_hash, tx_mined_status, delta, fee in history:
-            h2.append(HistoryItem(txid=tx_hash,
-                                  tx_mined_status=tx_mined_status,
-                                  delta=delta,
-                                  fee=fee,
-                                  balance=balance))
-            if balance is None or delta is None:
-                balance = None
-            else:
-                balance -= delta
-        h2.reverse()
-        # fixme: this may happen if history is incomplete
-        if balance not in [None, 0]:
-            self.logger.warning("history not synchronized")
-            return []
-
-        return h2
-
-    def _add_tx_to_local_history(self, txid):
-        with self.transaction_lock:
-            for addr in itertools.chain(self.db.get_txi_addresses(txid), self.db.get_txo_addresses(txid)):
-                cur_hist = self._history_local.get(addr, set())
-                cur_hist.add(txid)
-                self._history_local[addr] = cur_hist
-                self._mark_address_history_changed(addr)
-
-    def _remove_tx_from_local_history(self, txid):
-        with self.transaction_lock:
-            for addr in itertools.chain(self.db.get_txi_addresses(txid), self.db.get_txo_addresses(txid)):
-                cur_hist = self._history_local.get(addr, set())
-                try:
-                    cur_hist.remove(txid)
-                except KeyError:
-                    pass
-                else:
-                    self._history_local[addr] = cur_hist
-
-    def _mark_address_history_changed(self, addr: str) -> None:
-        # history for this address changed, wake up coroutines:
-        self._address_history_changed_events[addr].set()
-        # clear event immediately so that coroutines can wait() for the next change:
-        self._address_history_changed_events[addr].clear()
-
-    async def wait_for_address_history_to_change(self, addr: str) -> None:
-        """Wait until the server tells us about a new transaction related to addr.
-
-        Unconfirmed and confirmed transactions are not distinguished, and so e.g. SPV
-        is not taken into account.
-        """
-        assert self.is_mine(addr), "address needs to be is_mine to be watched"
-        await self._address_history_changed_events[addr].wait()
-
-    def add_unverified_tx(self, tx_hash, tx_height):
-        if self.db.is_in_verified_tx(tx_hash):
-            if tx_height in (TX_HEIGHT_UNCONFIRMED, TX_HEIGHT_UNCONF_PARENT):
-                with self.lock:
-                    self.db.remove_verified_tx(tx_hash)
-                if self.verifier:
-                    self.verifier.remove_spv_proof_for_tx(tx_hash)
-        else:
-            with self.lock:
-                # tx will be verified only if height > 0
-                self.unverified_tx[tx_hash] = tx_height
-
-    def remove_unverified_tx(self, tx_hash, tx_height):
-        with self.lock:
-            new_height = self.unverified_tx.get(tx_hash)
-            if new_height == tx_height:
-                self.unverified_tx.pop(tx_hash, None)
-
-    def add_verified_tx(self, tx_hash: str, info: TxMinedInfo):
-        # Remove from the unverified map and add to the verified map
-        with self.lock:
-            self.unverified_tx.pop(tx_hash, None)
-            self.db.add_verified_tx(tx_hash, info)
-        tx_mined_status = self.get_tx_height(tx_hash)
-        self.network.trigger_callback('verified', self, tx_hash, tx_mined_status)
-
-    def get_unverified_txs(self):
-        '''Returns a map from tx hash to transaction height'''
-        with self.lock:
-            return dict(self.unverified_tx)  # copy
-
-    def undo_verifications(self, blockchain, above_height):
-        '''Used by the verifier when a reorg has happened'''
-        txs = set()
-        with self.lock:
-            for tx_hash in self.db.list_verified_tx():
-                info = self.db.get_verified_tx(tx_hash)
-                tx_height = info.height
-                if tx_height > above_height:
-                    header = blockchain.read_header(tx_height)
-                    if not header or hash_header(header) != info.header_hash:
-                        self.db.remove_verified_tx(tx_hash)
-                        # NOTE: we should add these txns to self.unverified_tx,
-                        # but with what height?
-                        # If on the new fork after the reorg, the txn is at the
-                        # same height, we will not get a status update for the
-                        # address. If the txn is not mined or at a diff height,
-                        # we should get a status update. Unless we put tx into
-                        # unverified_tx, it will turn into local. So we put it
-                        # into unverified_tx with the old height, and if we get
-                        # a status update, that will overwrite it.
-                        self.unverified_tx[tx_hash] = tx_height
-                        txs.add(tx_hash)
-        return txs
-
-    def get_local_height(self) -> int:
-        """ return last known height if we are offline """
-        cached_local_height = getattr(self.threadlocal_cache, 'local_height', None)
-        if cached_local_height is not None:
-            return cached_local_height
-        return self.network.get_local_height() if self.network else self.db.get('stored_height', 0)
-
-    def add_future_tx(self, tx: Transaction, num_blocks: int) -> None:
-        assert num_blocks > 0, num_blocks
-        with self.lock:
-            tx_was_added = self.add_transaction(tx)
-            if tx_was_added:
-                self.future_tx[tx.txid()] = num_blocks
-            return tx_was_added
-
-    def get_tx_height(self, tx_hash: str) -> TxMinedInfo:
-        with self.lock:
-            verified_tx_mined_info = self.db.get_verified_tx(tx_hash)
-            if verified_tx_mined_info:
-                conf = max(self.get_local_height() - verified_tx_mined_info.height + 1, 0)
-                return verified_tx_mined_info._replace(conf=conf)
-            elif tx_hash in self.unverified_tx:
-                height = self.unverified_tx[tx_hash]
-                return TxMinedInfo(height=height, conf=0)
-            elif tx_hash in self.future_tx:
-                num_blocks_remainining = self.future_tx[tx_hash]
-                assert num_blocks_remainining > 0, num_blocks_remainining
-                return TxMinedInfo(height=TX_HEIGHT_FUTURE, conf=-num_blocks_remainining)
-            else:
-                # local transaction
-                return TxMinedInfo(height=TX_HEIGHT_LOCAL, conf=0)
-
-    def set_up_to_date(self, up_to_date):
-        with self.lock:
-            self.up_to_date = up_to_date
-        if self.network:
-            self.network.notify('status')
-
-    def is_up_to_date(self):
-        with self.lock: return self.up_to_date
-
-    def get_history_sync_state_details(self) -> Tuple[int, int]:
-        if self.synchronizer:
-            return self.synchronizer.num_requests_sent_and_answered()
-        else:
-            return 0, 0
-
-    @with_transaction_lock
-    def get_tx_delta(self, tx_hash, address):
-        """effect of tx on address"""
-        delta = 0
-        # substract the value of coins sent from address
-        d = self.db.get_txi_addr(tx_hash, address)
-        for n, v in d:
-            delta -= v
-        # add the value of the coins received at address
-        d = self.db.get_txo_addr(tx_hash, address)
-        for n, v, cb in d:
-            delta += v
-        return delta
-
-    @with_transaction_lock
-    def get_tx_value(self, txid):
-        """effect of tx on the entire domain"""
-        delta = 0
-        for addr in self.db.get_txi_addresses(txid):
-            d = self.db.get_txi_addr(txid, addr)
-            for n, v in d:
-                delta -= v
-        for addr in self.db.get_txo_addresses(txid):
-            d = self.db.get_txo_addr(txid, addr)
-            for n, v, cb in d:
-                delta += v
-        return delta
-
-    def get_wallet_delta(self, tx: Transaction):
-        """ effect of tx on wallet """
-        is_relevant = False  # "related to wallet?"
-        is_mine = False
-        is_pruned = False
-        is_partial = False
-        v_in = v_out = v_out_mine = 0
-        for txin in tx.inputs():
-            addr = self.get_txin_address(txin)
-            if self.is_mine(addr):
-                is_mine = True
-                is_relevant = True
-                d = self.db.get_txo_addr(txin.prevout.txid.hex(), addr)
-                for n, v, cb in d:
-                    if n == txin.prevout.out_idx:
-                        value = v
-                        break
-                else:
-                    value = None
-                if value is None:
-                    value = txin.value_sats()
-                if value is None:
-                    is_pruned = True
-                else:
-                    v_in += value
-            else:
-                is_partial = True
-        if not is_mine:
-            is_partial = False
-        for o in tx.outputs():
-            v_out += o.value
-            if self.is_mine(o.address):
-                v_out_mine += o.value
-                is_relevant = True
-        if is_pruned:
-            # some inputs are mine:
-            fee = None
-            if is_mine:
-                v = v_out_mine - v_out
-            else:
-                # no input is mine
-                v = v_out_mine
-        else:
-            v = v_out_mine - v_in
-            if is_partial:
-                # some inputs are mine, but not all
-                fee = None
-            else:
-                # all inputs are mine
-                fee = v_in - v_out
-        if not is_mine:
-            fee = None
-        return is_relevant, is_mine, v, fee
-
-    def get_tx_fee(self, txid: str) -> Optional[int]:
-        """ Returns tx_fee or None. Use server fee only if tx is unconfirmed and not mine"""
-        # check if stored fee is available
-        fee = self.db.get_tx_fee(txid, trust_server=False)
-        if fee is not None:
-            return fee
-        # delete server-sent fee for confirmed txns
-        confirmed = self.get_tx_height(txid).conf > 0
-        if confirmed:
-            self.db.add_tx_fee_from_server(txid, None)
-        # if all inputs are ismine, try to calc fee now;
-        # otherwise, return stored value
-        num_all_inputs = self.db.get_num_all_inputs_of_tx(txid)
-        if num_all_inputs is not None:
-            # check if tx is mine
-            num_ismine_inputs = self.db.get_num_ismine_inputs_of_tx(txid)
-            assert num_ismine_inputs <= num_all_inputs, (num_ismine_inputs, num_all_inputs)
-            # trust server if tx is unconfirmed and not mine
-            if num_ismine_inputs < num_all_inputs:
-                return None if confirmed else self.db.get_tx_fee(txid, trust_server=True)
-        # lookup tx and deserialize it.
-        # note that deserializing is expensive, hence above hacks
-        tx = self.db.get_transaction(txid)
-        if not tx:
-            return None
-        with self.lock, self.transaction_lock:
-            is_relevant, is_mine, v, fee = self.get_wallet_delta(tx)
-        # save result
-        self.db.add_tx_fee_we_calculated(txid, fee)
-        self.db.add_num_inputs_to_tx(txid, len(tx.inputs()))
-        return fee
-
-    def get_addr_io(self, address):
-        with self.lock, self.transaction_lock:
-            h = self.get_address_history(address)
-            received = {}
-            sent = {}
-            for tx_hash, height in h:
-                l = self.db.get_txo_addr(tx_hash, address)
-                for n, v, is_cb in l:
-                    received[tx_hash + ':%d'%n] = (height, v, is_cb)
-            for tx_hash, height in h:
-                l = self.db.get_txi_addr(tx_hash, address)
-                for txi, v in l:
-                    sent[txi] = height
-        return received, sent
-
-    def get_addr_utxo(self, address: str) -> Dict[TxOutpoint, PartialTxInput]:
-        coins, spent = self.get_addr_io(address)
-        for txi in spent:
-            coins.pop(txi)
-        out = {}
-        for prevout_str, v in coins.items():
-            tx_height, value, is_cb = v
-            prevout = TxOutpoint.from_str(prevout_str)
-            utxo = PartialTxInput(prevout=prevout,
-                                  is_coinbase_output=is_cb)
-            utxo._trusted_address = address
-            utxo._trusted_value_sats = value
-            utxo.block_height = tx_height
-            out[prevout] = utxo
-        return out
-
-    # return the total amount ever received by an address
-    def get_addr_received(self, address):
-        received, sent = self.get_addr_io(address)
-        return sum([v for height, v, is_cb in received.values()])
-
-    @with_local_height_cached
-    def get_addr_balance(self, address, *, excluded_coins: Set[str] = None):
-        """Return the balance of a bitcoin address:
-        confirmed and matured, unconfirmed, unmatured
-        """
-        if not excluded_coins:  # cache is only used if there are no excluded_coins
-            cached_value = self._get_addr_balance_cache.get(address)
-            if cached_value:
-                return cached_value
-        if excluded_coins is None:
-            excluded_coins = set()
-        assert isinstance(excluded_coins, set), f"excluded_coins should be set, not {type(excluded_coins)}"
-        received, sent = self.get_addr_io(address)
-        c = u = x = 0
-        mempool_height = self.get_local_height() + 1  # height of next block
-        for txo, (tx_height, v, is_cb) in received.items():
-            if txo in excluded_coins:
-                continue
-            if is_cb and tx_height + COINBASE_MATURITY > mempool_height:
-                x += v
-            elif tx_height > 0:
-                c += v
-            else:
-                u += v
-            if txo in sent:
-                if sent[txo] > 0:
-                    c -= v
-                else:
-                    u -= v
-        result = c, u, x
-        # cache result.
-        if not excluded_coins:
-            # Cache needs to be invalidated if a transaction is added to/
-            # removed from history; or on new blocks (maturity...)
-            self._get_addr_balance_cache[address] = result
-        return result
-
-    @with_local_height_cached
-    def get_utxos(self, domain=None, *, excluded_addresses=None,
-                  mature_only: bool = False, confirmed_only: bool = False,
-                  nonlocal_only: bool = False) -> Sequence[PartialTxInput]:
-        coins = []
-        if domain is None:
-            domain = self.get_addresses()
-        domain = set(domain)
-        if excluded_addresses:
-            domain = set(domain) - set(excluded_addresses)
-        mempool_height = self.get_local_height() + 1  # height of next block
-        for addr in domain:
-            utxos = self.get_addr_utxo(addr)
-            for utxo in utxos.values():
-                if confirmed_only and utxo.block_height <= 0:
-                    continue
-                if nonlocal_only and utxo.block_height == TX_HEIGHT_LOCAL:
-                    continue
-                if (mature_only and utxo.is_coinbase_output()
-                        and utxo.block_height + COINBASE_MATURITY > mempool_height):
-                    continue
-                coins.append(utxo)
-                continue
-        return coins
-
-    def get_balance(self, domain=None, *, excluded_addresses: Set[str] = None,
-                    excluded_coins: Set[str] = None) -> Tuple[int, int, int]:
-        if domain is None:
-            domain = self.get_addresses()
-        if excluded_addresses is None:
-            excluded_addresses = set()
-        assert isinstance(excluded_addresses, set), f"excluded_addresses should be set, not {type(excluded_addresses)}"
-        domain = set(domain) - excluded_addresses
-        cc = uu = xx = 0
-        for addr in domain:
-            c, u, x = self.get_addr_balance(addr, excluded_coins=excluded_coins)
-            cc += c
-            uu += u
-            xx += x
-        return cc, uu, xx
-
-    def is_used(self, address: str) -> bool:
-        return self.get_address_history_len(address) != 0
-
-    def is_empty(self, address: str) -> bool:
-        c, u, x = self.get_addr_balance(address)
-        return c+u+x == 0
-
-    def synchronize(self):
-        pass

electrum/bip32.py

@@ -1,403 +0,0 @@
-# Copyright (C) 2018 The Electrum developers
-# Distributed under the MIT software license, see the accompanying
-# file LICENCE or http://www.opensource.org/licenses/mit-license.php
-
-import hashlib
-from typing import List, Tuple, NamedTuple, Union, Iterable, Sequence, Optional
-
-from .util import bfh, bh2u, BitcoinException
-from . import constants
-from . import ecc
-from .crypto import hash_160, hmac_oneshot
-from .bitcoin import rev_hex, int_to_hex, EncodeBase58Check, DecodeBase58Check
-from .logging import get_logger
-
-
-_logger = get_logger(__name__)
-BIP32_PRIME = 0x80000000
-UINT32_MAX = (1 << 32) - 1
-
-
-def protect_against_invalid_ecpoint(func):
-    def func_wrapper(*args):
-        child_index = args[-1]
-        while True:
-            is_prime = child_index & BIP32_PRIME
-            try:
-                return func(*args[:-1], child_index=child_index)
-            except ecc.InvalidECPointException:
-                _logger.warning('bip32 protect_against_invalid_ecpoint: skipping index')
-                child_index += 1
-                is_prime2 = child_index & BIP32_PRIME
-                if is_prime != is_prime2: raise OverflowError()
-    return func_wrapper
-
-
-@protect_against_invalid_ecpoint
-def CKD_priv(parent_privkey: bytes, parent_chaincode: bytes, child_index: int) -> Tuple[bytes, bytes]:
-    """Child private key derivation function (from master private key)
-    If n is hardened (i.e. the 32nd bit is set), the resulting private key's
-    corresponding public key can NOT be determined without the master private key.
-    However, if n is not hardened, the resulting private key's corresponding
-    public key can be determined without the master private key.
-    """
-    if child_index < 0: raise ValueError('the bip32 index needs to be non-negative')
-    is_hardened_child = bool(child_index & BIP32_PRIME)
-    return _CKD_priv(parent_privkey=parent_privkey,
-                     parent_chaincode=parent_chaincode,
-                     child_index=bfh(rev_hex(int_to_hex(child_index, 4))),
-                     is_hardened_child=is_hardened_child)
-
-
-def _CKD_priv(parent_privkey: bytes, parent_chaincode: bytes,
-              child_index: bytes, is_hardened_child: bool) -> Tuple[bytes, bytes]:
-    try:
-        keypair = ecc.ECPrivkey(parent_privkey)
-    except ecc.InvalidECPointException as e:
-        raise BitcoinException('Impossible xprv (not within curve order)') from e
-    parent_pubkey = keypair.get_public_key_bytes(compressed=True)
-    if is_hardened_child:
-        data = bytes([0]) + parent_privkey + child_index
-    else:
-        data = parent_pubkey + child_index
-    I = hmac_oneshot(parent_chaincode, data, hashlib.sha512)
-    I_left = ecc.string_to_number(I[0:32])
-    child_privkey = (I_left + ecc.string_to_number(parent_privkey)) % ecc.CURVE_ORDER
-    if I_left >= ecc.CURVE_ORDER or child_privkey == 0:
-        raise ecc.InvalidECPointException()
-    child_privkey = int.to_bytes(child_privkey, length=32, byteorder='big', signed=False)
-    child_chaincode = I[32:]
-    return child_privkey, child_chaincode
-
-
-
-@protect_against_invalid_ecpoint
-def CKD_pub(parent_pubkey: bytes, parent_chaincode: bytes, child_index: int) -> Tuple[bytes, bytes]:
-    """Child public key derivation function (from public key only)
-    This function allows us to find the nth public key, as long as n is
-    not hardened. If n is hardened, we need the master private key to find it.
-    """
-    if child_index < 0: raise ValueError('the bip32 index needs to be non-negative')
-    if child_index & BIP32_PRIME: raise Exception('not possible to derive hardened child from parent pubkey')
-    return _CKD_pub(parent_pubkey=parent_pubkey,
-                    parent_chaincode=parent_chaincode,
-                    child_index=bfh(rev_hex(int_to_hex(child_index, 4))))
-
-
-# helper function, callable with arbitrary 'child_index' byte-string.
-# i.e.: 'child_index' does not need to fit into 32 bits here! (c.f. trustedcoin billing)
-def _CKD_pub(parent_pubkey: bytes, parent_chaincode: bytes, child_index: bytes) -> Tuple[bytes, bytes]:
-    I = hmac_oneshot(parent_chaincode, parent_pubkey + child_index, hashlib.sha512)
-    pubkey = ecc.ECPrivkey(I[0:32]) + ecc.ECPubkey(parent_pubkey)
-    if pubkey.is_at_infinity():
-        raise ecc.InvalidECPointException()
-    child_pubkey = pubkey.get_public_key_bytes(compressed=True)
-    child_chaincode = I[32:]
-    return child_pubkey, child_chaincode
-
-
-def xprv_header(xtype: str, *, net=None) -> bytes:
-    if net is None:
-        net = constants.net
-    return net.XPRV_HEADERS[xtype].to_bytes(length=4, byteorder="big")
-
-
-def xpub_header(xtype: str, *, net=None) -> bytes:
-    if net is None:
-        net = constants.net
-    return net.XPUB_HEADERS[xtype].to_bytes(length=4, byteorder="big")
-
-
-class InvalidMasterKeyVersionBytes(BitcoinException): pass
-
-
-class BIP32Node(NamedTuple):
-    xtype: str
-    eckey: Union[ecc.ECPubkey, ecc.ECPrivkey]
-    chaincode: bytes
-    depth: int = 0
-    fingerprint: bytes = b'\x00'*4  # as in serialized format, this is the *parent's* fingerprint
-    child_number: bytes = b'\x00'*4
-
-    @classmethod
-    def from_xkey(cls, xkey: str, *, net=None) -> 'BIP32Node':
-        if net is None:
-            net = constants.net
-        xkey = DecodeBase58Check(xkey)
-        if len(xkey) != 78:
-            raise BitcoinException('Invalid length for extended key: {}'
-                                   .format(len(xkey)))
-        depth = xkey[4]
-        fingerprint = xkey[5:9]
-        child_number = xkey[9:13]
-        chaincode = xkey[13:13 + 32]
-        header = int.from_bytes(xkey[0:4], byteorder='big')
-        if header in net.XPRV_HEADERS_INV:
-            headers_inv = net.XPRV_HEADERS_INV
-            is_private = True
-        elif header in net.XPUB_HEADERS_INV:
-            headers_inv = net.XPUB_HEADERS_INV
-            is_private = False
-        else:
-            raise InvalidMasterKeyVersionBytes(f'Invalid extended key format: {hex(header)}')
-        xtype = headers_inv[header]
-        if is_private:
-            eckey = ecc.ECPrivkey(xkey[13 + 33:])
-        else:
-            eckey = ecc.ECPubkey(xkey[13 + 32:])
-        return BIP32Node(xtype=xtype,
-                         eckey=eckey,
-                         chaincode=chaincode,
-                         depth=depth,
-                         fingerprint=fingerprint,
-                         child_number=child_number)
-
-    @classmethod
-    def from_rootseed(cls, seed: bytes, *, xtype: str) -> 'BIP32Node':
-        I = hmac_oneshot(b"Bitcoin seed", seed, hashlib.sha512)
-        master_k = I[0:32]
-        master_c = I[32:]
-        return BIP32Node(xtype=xtype,
-                         eckey=ecc.ECPrivkey(master_k),
-                         chaincode=master_c)
-
-    @classmethod
-    def from_bytes(cls, b: bytes) -> 'BIP32Node':
-        if len(b) != 78:
-            raise Exception(f"unexpected xkey raw bytes len {len(b)} != 78")
-        xkey = EncodeBase58Check(b)
-        return cls.from_xkey(xkey)
-
-    def to_xprv(self, *, net=None) -> str:
-        payload = self.to_xprv_bytes(net=net)
-        return EncodeBase58Check(payload)
-
-    def to_xprv_bytes(self, *, net=None) -> bytes:
-        if not self.is_private():
-            raise Exception("cannot serialize as xprv; private key missing")
-        payload = (xprv_header(self.xtype, net=net) +
-                   bytes([self.depth]) +
-                   self.fingerprint +
-                   self.child_number +
-                   self.chaincode +
-                   bytes([0]) +
-                   self.eckey.get_secret_bytes())
-        assert len(payload) == 78, f"unexpected xprv payload len {len(payload)}"
-        return payload
-
-    def to_xpub(self, *, net=None) -> str:
-        payload = self.to_xpub_bytes(net=net)
-        return EncodeBase58Check(payload)
-
-    def to_xpub_bytes(self, *, net=None) -> bytes:
-        payload = (xpub_header(self.xtype, net=net) +
-                   bytes([self.depth]) +
-                   self.fingerprint +
-                   self.child_number +
-                   self.chaincode +
-                   self.eckey.get_public_key_bytes(compressed=True))
-        assert len(payload) == 78, f"unexpected xpub payload len {len(payload)}"
-        return payload
-
-    def to_xkey(self, *, net=None) -> str:
-        if self.is_private():
-            return self.to_xprv(net=net)
-        else:
-            return self.to_xpub(net=net)
-
-    def to_bytes(self, *, net=None) -> bytes:
-        if self.is_private():
-            return self.to_xprv_bytes(net=net)
-        else:
-            return self.to_xpub_bytes(net=net)
-
-    def convert_to_public(self) -> 'BIP32Node':
-        if not self.is_private():
-            return self
-        pubkey = ecc.ECPubkey(self.eckey.get_public_key_bytes())
-        return self._replace(eckey=pubkey)
-
-    def is_private(self) -> bool:
-        return isinstance(self.eckey, ecc.ECPrivkey)
-
-    def subkey_at_private_derivation(self, path: Union[str, Iterable[int]]) -> 'BIP32Node':
-        if path is None:
-            raise Exception("derivation path must not be None")
-        if isinstance(path, str):
-            path = convert_bip32_path_to_list_of_uint32(path)
-        if not self.is_private():
-            raise Exception("cannot do bip32 private derivation; private key missing")
-        if not path:
-            return self
-        depth = self.depth
-        chaincode = self.chaincode
-        privkey = self.eckey.get_secret_bytes()
-        for child_index in path:
-            parent_privkey = privkey
-            privkey, chaincode = CKD_priv(privkey, chaincode, child_index)
-            depth += 1
-        parent_pubkey = ecc.ECPrivkey(parent_privkey).get_public_key_bytes(compressed=True)
-        fingerprint = hash_160(parent_pubkey)[0:4]
-        child_number = child_index.to_bytes(length=4, byteorder="big")
-        return BIP32Node(xtype=self.xtype,
-                         eckey=ecc.ECPrivkey(privkey),
-                         chaincode=chaincode,
-                         depth=depth,
-                         fingerprint=fingerprint,
-                         child_number=child_number)
-
-    def subkey_at_public_derivation(self, path: Union[str, Iterable[int]]) -> 'BIP32Node':
-        if path is None:
-            raise Exception("derivation path must not be None")
-        if isinstance(path, str):
-            path = convert_bip32_path_to_list_of_uint32(path)
-        if not path:
-            return self.convert_to_public()
-        depth = self.depth
-        chaincode = self.chaincode
-        pubkey = self.eckey.get_public_key_bytes(compressed=True)
-        for child_index in path:
-            parent_pubkey = pubkey
-            pubkey, chaincode = CKD_pub(pubkey, chaincode, child_index)
-            depth += 1
-        fingerprint = hash_160(parent_pubkey)[0:4]
-        child_number = child_index.to_bytes(length=4, byteorder="big")
-        return BIP32Node(xtype=self.xtype,
-                         eckey=ecc.ECPubkey(pubkey),
-                         chaincode=chaincode,
-                         depth=depth,
-                         fingerprint=fingerprint,
-                         child_number=child_number)
-
-    def calc_fingerprint_of_this_node(self) -> bytes:
-        """Returns the fingerprint of this node.
-        Note that self.fingerprint is of the *parent*.
-        """
-        # TODO cache this
-        return hash_160(self.eckey.get_public_key_bytes(compressed=True))[0:4]
-
-
-def xpub_type(x):
-    return BIP32Node.from_xkey(x).xtype
-
-
-def is_xpub(text):
-    try:
-        node = BIP32Node.from_xkey(text)
-        return not node.is_private()
-    except:
-        return False
-
-
-def is_xprv(text):
-    try:
-        node = BIP32Node.from_xkey(text)
-        return node.is_private()
-    except:
-        return False
-
-
-def xpub_from_xprv(xprv):
-    return BIP32Node.from_xkey(xprv).to_xpub()
-
-
-def convert_bip32_path_to_list_of_uint32(n: str) -> List[int]:
-    """Convert bip32 path to list of uint32 integers with prime flags
-    m/0/-1/1' -> [0, 0x80000001, 0x80000001]
-
-    based on code in trezorlib
-    """
-    if not n:
-        return []
-    if n.endswith("/"):
-        n = n[:-1]
-    n = n.split('/')
-    # cut leading "m" if present, but do not require it
-    if n[0] == "m":
-        n = n[1:]
-    path = []
-    for x in n:
-        if x == '':
-            # gracefully allow repeating "/" chars in path.
-            # makes concatenating paths easier
-            continue
-        prime = 0
-        if x.endswith("'") or x.endswith("h"):
-            x = x[:-1]
-            prime = BIP32_PRIME
-        if x.startswith('-'):
-            if prime:
-                raise ValueError(f"bip32 path child index is signalling hardened level in multiple ways")
-            prime = BIP32_PRIME
-        child_index = abs(int(x)) | prime
-        if child_index > UINT32_MAX:
-            raise ValueError(f"bip32 path child index too large: {child_index} > {UINT32_MAX}")
-        path.append(child_index)
-    return path
-
-
-def convert_bip32_intpath_to_strpath(path: Sequence[int]) -> str:
-    s = "m/"
-    for child_index in path:
-        if not isinstance(child_index, int):
-            raise TypeError(f"bip32 path child index must be int: {child_index}")
-        if not (0 <= child_index <= UINT32_MAX):
-            raise ValueError(f"bip32 path child index out of range: {child_index}")
-        prime = ""
-        if child_index & BIP32_PRIME:
-            prime = "'"
-            child_index = child_index ^ BIP32_PRIME
-        s += str(child_index) + prime + '/'
-    # cut trailing "/"
-    s = s[:-1]
-    return s
-
-
-def is_bip32_derivation(s: str) -> bool:
-    try:
-        if not (s == 'm' or s.startswith('m/')):
-            return False
-        convert_bip32_path_to_list_of_uint32(s)
-    except:
-        return False
-    else:
-        return True
-
-
-def normalize_bip32_derivation(s: Optional[str]) -> Optional[str]:
-    if s is None:
-        return None
-    if not is_bip32_derivation(s):
-        raise ValueError(f"invalid bip32 derivation: {s}")
-    ints = convert_bip32_path_to_list_of_uint32(s)
-    return convert_bip32_intpath_to_strpath(ints)
-
-
-def is_all_public_derivation(path: Union[str, Iterable[int]]) -> bool:
-    """Returns whether all levels in path use non-hardened derivation."""
-    if isinstance(path, str):
-        path = convert_bip32_path_to_list_of_uint32(path)
-    for child_index in path:
-        if child_index < 0:
-            raise ValueError('the bip32 index needs to be non-negative')
-        if child_index & BIP32_PRIME:
-            return False
-    return True
-
-
-def root_fp_and_der_prefix_from_xkey(xkey: str) -> Tuple[Optional[str], Optional[str]]:
-    """Returns the root bip32 fingerprint and the derivation path from the
-    root to the given xkey, if they can be determined. Otherwise (None, None).
-    """
-    node = BIP32Node.from_xkey(xkey)
-    derivation_prefix = None
-    root_fingerprint = None
-    assert node.depth >= 0, node.depth
-    if node.depth == 0:
-        derivation_prefix = 'm'
-        root_fingerprint = node.calc_fingerprint_of_this_node().hex().lower()
-    elif node.depth == 1:
-        child_number_int = int.from_bytes(node.child_number, 'big')
-        derivation_prefix = convert_bip32_intpath_to_strpath([child_number_int])
-        root_fingerprint = node.fingerprint.hex()
-    return root_fingerprint, derivation_prefix

electrum/bitcoin.py

@@ -1,680 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2011 thomasv@gitorious
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import hashlib
-from typing import List, Tuple, TYPE_CHECKING, Optional, Union
-from enum import IntEnum
-
-from .util import bfh, bh2u, BitcoinException, assert_bytes, to_bytes, inv_dict
-from . import version
-from . import segwit_addr
-from . import constants
-from . import ecc
-from .crypto import sha256d, sha256, hash_160, hmac_oneshot
-
-if TYPE_CHECKING:
-    from .network import Network
-
-
-################################## transactions
-
-COINBASE_MATURITY = 100
-COIN = 100000000
-TOTAL_COIN_SUPPLY_LIMIT_IN_BTC = 21000000
-
-# supported types of transaction outputs
-# TODO kill these with fire
-TYPE_ADDRESS = 0
-TYPE_PUBKEY  = 1
-TYPE_SCRIPT  = 2
-
-
-class opcodes(IntEnum):
-    # push value
-    OP_0 = 0x00
-    OP_FALSE = OP_0
-    OP_PUSHDATA1 = 0x4c
-    OP_PUSHDATA2 = 0x4d
-    OP_PUSHDATA4 = 0x4e
-    OP_1NEGATE = 0x4f
-    OP_RESERVED = 0x50
-    OP_1 = 0x51
-    OP_TRUE = OP_1
-    OP_2 = 0x52
-    OP_3 = 0x53
-    OP_4 = 0x54
-    OP_5 = 0x55
-    OP_6 = 0x56
-    OP_7 = 0x57
-    OP_8 = 0x58
-    OP_9 = 0x59
-    OP_10 = 0x5a
-    OP_11 = 0x5b
-    OP_12 = 0x5c
-    OP_13 = 0x5d
-    OP_14 = 0x5e
-    OP_15 = 0x5f
-    OP_16 = 0x60
-
-    # control
-    OP_NOP = 0x61
-    OP_VER = 0x62
-    OP_IF = 0x63
-    OP_NOTIF = 0x64
-    OP_VERIF = 0x65
-    OP_VERNOTIF = 0x66
-    OP_ELSE = 0x67
-    OP_ENDIF = 0x68
-    OP_VERIFY = 0x69
-    OP_RETURN = 0x6a
-
-    # stack ops
-    OP_TOALTSTACK = 0x6b
-    OP_FROMALTSTACK = 0x6c
-    OP_2DROP = 0x6d
-    OP_2DUP = 0x6e
-    OP_3DUP = 0x6f
-    OP_2OVER = 0x70
-    OP_2ROT = 0x71
-    OP_2SWAP = 0x72
-    OP_IFDUP = 0x73
-    OP_DEPTH = 0x74
-    OP_DROP = 0x75
-    OP_DUP = 0x76
-    OP_NIP = 0x77
-    OP_OVER = 0x78
-    OP_PICK = 0x79
-    OP_ROLL = 0x7a
-    OP_ROT = 0x7b
-    OP_SWAP = 0x7c
-    OP_TUCK = 0x7d
-
-    # splice ops
-    OP_CAT = 0x7e
-    OP_SUBSTR = 0x7f
-    OP_LEFT = 0x80
-    OP_RIGHT = 0x81
-    OP_SIZE = 0x82
-
-    # bit logic
-    OP_INVERT = 0x83
-    OP_AND = 0x84
-    OP_OR = 0x85
-    OP_XOR = 0x86
-    OP_EQUAL = 0x87
-    OP_EQUALVERIFY = 0x88
-    OP_RESERVED1 = 0x89
-    OP_RESERVED2 = 0x8a
-
-    # numeric
-    OP_1ADD = 0x8b
-    OP_1SUB = 0x8c
-    OP_2MUL = 0x8d
-    OP_2DIV = 0x8e
-    OP_NEGATE = 0x8f
-    OP_ABS = 0x90
-    OP_NOT = 0x91
-    OP_0NOTEQUAL = 0x92
-
-    OP_ADD = 0x93
-    OP_SUB = 0x94
-    OP_MUL = 0x95
-    OP_DIV = 0x96
-    OP_MOD = 0x97
-    OP_LSHIFT = 0x98
-    OP_RSHIFT = 0x99
-
-    OP_BOOLAND = 0x9a
-    OP_BOOLOR = 0x9b
-    OP_NUMEQUAL = 0x9c
-    OP_NUMEQUALVERIFY = 0x9d
-    OP_NUMNOTEQUAL = 0x9e
-    OP_LESSTHAN = 0x9f
-    OP_GREATERTHAN = 0xa0
-    OP_LESSTHANOREQUAL = 0xa1
-    OP_GREATERTHANOREQUAL = 0xa2
-    OP_MIN = 0xa3
-    OP_MAX = 0xa4
-
-    OP_WITHIN = 0xa5
-
-    # crypto
-    OP_RIPEMD160 = 0xa6
-    OP_SHA1 = 0xa7
-    OP_SHA256 = 0xa8
-    OP_HASH160 = 0xa9
-    OP_HASH256 = 0xaa
-    OP_CODESEPARATOR = 0xab
-    OP_CHECKSIG = 0xac
-    OP_CHECKSIGVERIFY = 0xad
-    OP_CHECKMULTISIG = 0xae
-    OP_CHECKMULTISIGVERIFY = 0xaf
-
-    # expansion
-    OP_NOP1 = 0xb0
-    OP_CHECKLOCKTIMEVERIFY = 0xb1
-    OP_NOP2 = OP_CHECKLOCKTIMEVERIFY
-    OP_CHECKSEQUENCEVERIFY = 0xb2
-    OP_NOP3 = OP_CHECKSEQUENCEVERIFY
-    OP_NOP4 = 0xb3
-    OP_NOP5 = 0xb4
-    OP_NOP6 = 0xb5
-    OP_NOP7 = 0xb6
-    OP_NOP8 = 0xb7
-    OP_NOP9 = 0xb8
-    OP_NOP10 = 0xb9
-
-    OP_INVALIDOPCODE = 0xff
-
-    def hex(self) -> str:
-        return bytes([self]).hex()
-
-
-def rev_hex(s: str) -> str:
-    return bh2u(bfh(s)[::-1])
-
-
-def int_to_hex(i: int, length: int=1) -> str:
-    """Converts int to little-endian hex string.
-    `length` is the number of bytes available
-    """
-    if not isinstance(i, int):
-        raise TypeError('{} instead of int'.format(i))
-    range_size = pow(256, length)
-    if i < -(range_size//2) or i >= range_size:
-        raise OverflowError('cannot convert int {} to hex ({} bytes)'.format(i, length))
-    if i < 0:
-        # two's complement
-        i = range_size + i
-    s = hex(i)[2:].rstrip('L')
-    s = "0"*(2*length - len(s)) + s
-    return rev_hex(s)
-
-def script_num_to_hex(i: int) -> str:
-    """See CScriptNum in Bitcoin Core.
-    Encodes an integer as hex, to be used in script.
-
-    ported from https://github.com/bitcoin/bitcoin/blob/8cbc5c4be4be22aca228074f087a374a7ec38be8/src/script/script.h#L326
-    """
-    if i == 0:
-        return ''
-
-    result = bytearray()
-    neg = i < 0
-    absvalue = abs(i)
-    while absvalue > 0:
-        result.append(absvalue & 0xff)
-        absvalue >>= 8
-
-    if result[-1] & 0x80:
-        result.append(0x80 if neg else 0x00)
-    elif neg:
-        result[-1] |= 0x80
-
-    return bh2u(result)
-
-
-def var_int(i: int) -> str:
-    # https://en.bitcoin.it/wiki/Protocol_specification#Variable_length_integer
-    # https://github.com/bitcoin/bitcoin/blob/efe1ee0d8d7f82150789f1f6840f139289628a2b/src/serialize.h#L247
-    # "CompactSize"
-    assert i >= 0, i
-    if i<0xfd:
-        return int_to_hex(i)
-    elif i<=0xffff:
-        return "fd"+int_to_hex(i,2)
-    elif i<=0xffffffff:
-        return "fe"+int_to_hex(i,4)
-    else:
-        return "ff"+int_to_hex(i,8)
-
-
-def witness_push(item: str) -> str:
-    """Returns data in the form it should be present in the witness.
-    hex -> hex
-    """
-    return var_int(len(item) // 2) + item
-
-
-def _op_push(i: int) -> str:
-    if i < opcodes.OP_PUSHDATA1:
-        return int_to_hex(i)
-    elif i <= 0xff:
-        return opcodes.OP_PUSHDATA1.hex() + int_to_hex(i, 1)
-    elif i <= 0xffff:
-        return opcodes.OP_PUSHDATA2.hex() + int_to_hex(i, 2)
-    else:
-        return opcodes.OP_PUSHDATA4.hex() + int_to_hex(i, 4)
-
-
-def push_script(data: str) -> str:
-    """Returns pushed data to the script, automatically
-    choosing canonical opcodes depending on the length of the data.
-    hex -> hex
-
-    ported from https://github.com/btcsuite/btcd/blob/fdc2bc867bda6b351191b5872d2da8270df00d13/txscript/scriptbuilder.go#L128
-    """
-    data = bfh(data)
-    data_len = len(data)
-
-    # "small integer" opcodes
-    if data_len == 0 or data_len == 1 and data[0] == 0:
-        return opcodes.OP_0.hex()
-    elif data_len == 1 and data[0] <= 16:
-        return bh2u(bytes([opcodes.OP_1 - 1 + data[0]]))
-    elif data_len == 1 and data[0] == 0x81:
-        return opcodes.OP_1NEGATE.hex()
-
-    return _op_push(data_len) + bh2u(data)
-
-
-def add_number_to_script(i: int) -> bytes:
-    return bfh(push_script(script_num_to_hex(i)))
-
-
-def relayfee(network: 'Network' = None) -> int:
-    from .simple_config import FEERATE_DEFAULT_RELAY, FEERATE_MAX_RELAY
-    if network and network.relay_fee is not None:
-        fee = network.relay_fee
-    else:
-        fee = FEERATE_DEFAULT_RELAY
-    fee = min(fee, FEERATE_MAX_RELAY)
-    fee = max(fee, 0)
-    return fee
-
-
-def dust_threshold(network: 'Network'=None) -> int:
-    # Change <= dust threshold is added to the tx fee
-    return 182 * 3 * relayfee(network) // 1000
-
-
-def hash_encode(x: bytes) -> str:
-    return bh2u(x[::-1])
-
-
-def hash_decode(x: str) -> bytes:
-    return bfh(x)[::-1]
-
-
-############ functions from pywallet #####################
-
-def hash160_to_b58_address(h160: bytes, addrtype: int) -> str:
-    s = bytes([addrtype]) + h160
-    s = s + sha256d(s)[0:4]
-    return base_encode(s, base=58)
-
-
-def b58_address_to_hash160(addr: str) -> Tuple[int, bytes]:
-    addr = to_bytes(addr, 'ascii')
-    _bytes = DecodeBase58Check(addr)
-    if len(_bytes) != 21:
-        raise Exception(f'expected 21 payload bytes in base58 address. got: {len(_bytes)}')
-    return _bytes[0], _bytes[1:21]
-
-
-def hash160_to_p2pkh(h160: bytes, *, net=None) -> str:
-    if net is None: net = constants.net
-    return hash160_to_b58_address(h160, net.ADDRTYPE_P2PKH)
-
-def hash160_to_p2sh(h160: bytes, *, net=None) -> str:
-    if net is None: net = constants.net
-    return hash160_to_b58_address(h160, net.ADDRTYPE_P2SH)
-
-def public_key_to_p2pkh(public_key: bytes, *, net=None) -> str:
-    if net is None: net = constants.net
-    return hash160_to_p2pkh(hash_160(public_key), net=net)
-
-def hash_to_segwit_addr(h: bytes, witver: int, *, net=None) -> str:
-    if net is None: net = constants.net
-    return segwit_addr.encode(net.SEGWIT_HRP, witver, h)
-
-def public_key_to_p2wpkh(public_key: bytes, *, net=None) -> str:
-    if net is None: net = constants.net
-    return hash_to_segwit_addr(hash_160(public_key), witver=0, net=net)
-
-def script_to_p2wsh(script: str, *, net=None) -> str:
-    if net is None: net = constants.net
-    return hash_to_segwit_addr(sha256(bfh(script)), witver=0, net=net)
-
-def p2wpkh_nested_script(pubkey: str) -> str:
-    pkh = bh2u(hash_160(bfh(pubkey)))
-    return '00' + push_script(pkh)
-
-def p2wsh_nested_script(witness_script: str) -> str:
-    wsh = bh2u(sha256(bfh(witness_script)))
-    return '00' + push_script(wsh)
-
-def pubkey_to_address(txin_type: str, pubkey: str, *, net=None) -> str:
-    if net is None: net = constants.net
-    if txin_type == 'p2pkh':
-        return public_key_to_p2pkh(bfh(pubkey), net=net)
-    elif txin_type == 'p2wpkh':
-        return public_key_to_p2wpkh(bfh(pubkey), net=net)
-    elif txin_type == 'p2wpkh-p2sh':
-        scriptSig = p2wpkh_nested_script(pubkey)
-        return hash160_to_p2sh(hash_160(bfh(scriptSig)), net=net)
-    else:
-        raise NotImplementedError(txin_type)
-
-
-# TODO this method is confusingly named
-def redeem_script_to_address(txin_type: str, scriptcode: str, *, net=None) -> str:
-    if net is None: net = constants.net
-    if txin_type == 'p2sh':
-        # given scriptcode is a redeem_script
-        return hash160_to_p2sh(hash_160(bfh(scriptcode)), net=net)
-    elif txin_type == 'p2wsh':
-        # given scriptcode is a witness_script
-        return script_to_p2wsh(scriptcode, net=net)
-    elif txin_type == 'p2wsh-p2sh':
-        # given scriptcode is a witness_script
-        redeem_script = p2wsh_nested_script(scriptcode)
-        return hash160_to_p2sh(hash_160(bfh(redeem_script)), net=net)
-    else:
-        raise NotImplementedError(txin_type)
-
-
-def script_to_address(script: str, *, net=None) -> str:
-    from .transaction import get_address_from_output_script
-    return get_address_from_output_script(bfh(script), net=net)
-
-
-def address_to_script(addr: str, *, net=None) -> str:
-    if net is None: net = constants.net
-    if not is_address(addr, net=net):
-        raise BitcoinException(f"invalid bitcoin address: {addr}")
-    witver, witprog = segwit_addr.decode(net.SEGWIT_HRP, addr)
-    if witprog is not None:
-        if not (0 <= witver <= 16):
-            raise BitcoinException(f'impossible witness version: {witver}')
-        script = bh2u(add_number_to_script(witver))
-        script += push_script(bh2u(bytes(witprog)))
-        return script
-    addrtype, hash_160_ = b58_address_to_hash160(addr)
-    if addrtype == net.ADDRTYPE_P2PKH:
-        script = pubkeyhash_to_p2pkh_script(bh2u(hash_160_))
-    elif addrtype == net.ADDRTYPE_P2SH:
-        script = opcodes.OP_HASH160.hex()
-        script += push_script(bh2u(hash_160_))
-        script += opcodes.OP_EQUAL.hex()
-    else:
-        raise BitcoinException(f'unknown address type: {addrtype}')
-    return script
-
-def address_to_scripthash(addr: str) -> str:
-    script = address_to_script(addr)
-    return script_to_scripthash(script)
-
-def script_to_scripthash(script: str) -> str:
-    h = sha256(bfh(script))[0:32]
-    return bh2u(bytes(reversed(h)))
-
-def public_key_to_p2pk_script(pubkey: str) -> str:
-    return push_script(pubkey) + opcodes.OP_CHECKSIG.hex()
-
-def pubkeyhash_to_p2pkh_script(pubkey_hash160: str) -> str:
-    script = bytes([opcodes.OP_DUP, opcodes.OP_HASH160]).hex()
-    script += push_script(pubkey_hash160)
-    script += bytes([opcodes.OP_EQUALVERIFY, opcodes.OP_CHECKSIG]).hex()
-    return script
-
-
-__b58chars = b'123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz'
-assert len(__b58chars) == 58
-
-__b43chars = b'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ$*+-./:'
-assert len(__b43chars) == 43
-
-
-def base_encode(v: bytes, *, base: int) -> str:
-    """ encode v, which is a string of bytes, to base58."""
-    assert_bytes(v)
-    if base not in (58, 43):
-        raise ValueError('not supported base: {}'.format(base))
-    chars = __b58chars
-    if base == 43:
-        chars = __b43chars
-    long_value = 0
-    power_of_base = 1
-    for c in v[::-1]:
-        # naive but slow variant:   long_value += (256**i) * c
-        long_value += power_of_base * c
-        power_of_base <<= 8
-    result = bytearray()
-    while long_value >= base:
-        div, mod = divmod(long_value, base)
-        result.append(chars[mod])
-        long_value = div
-    result.append(chars[long_value])
-    # Bitcoin does a little leading-zero-compression:
-    # leading 0-bytes in the input become leading-1s
-    nPad = 0
-    for c in v:
-        if c == 0x00:
-            nPad += 1
-        else:
-            break
-    result.extend([chars[0]] * nPad)
-    result.reverse()
-    return result.decode('ascii')
-
-
-def base_decode(v: Union[bytes, str], *, base: int, length: int = None) -> Optional[bytes]:
-    """ decode v into a string of len bytes."""
-    # assert_bytes(v)
-    v = to_bytes(v, 'ascii')
-    if base not in (58, 43):
-        raise ValueError('not supported base: {}'.format(base))
-    chars = __b58chars
-    if base == 43:
-        chars = __b43chars
-    long_value = 0
-    power_of_base = 1
-    for c in v[::-1]:
-        digit = chars.find(bytes([c]))
-        if digit == -1:
-            raise ValueError('Forbidden character {} for base {}'.format(c, base))
-        # naive but slow variant:   long_value += digit * (base**i)
-        long_value += digit * power_of_base
-        power_of_base *= base
-    result = bytearray()
-    while long_value >= 256:
-        div, mod = divmod(long_value, 256)
-        result.append(mod)
-        long_value = div
-    result.append(long_value)
-    nPad = 0
-    for c in v:
-        if c == chars[0]:
-            nPad += 1
-        else:
-            break
-    result.extend(b'\x00' * nPad)
-    if length is not None and len(result) != length:
-        return None
-    result.reverse()
-    return bytes(result)
-
-
-class InvalidChecksum(Exception):
-    pass
-
-
-def EncodeBase58Check(vchIn: bytes) -> str:
-    hash = sha256d(vchIn)
-    return base_encode(vchIn + hash[0:4], base=58)
-
-
-def DecodeBase58Check(psz: Union[bytes, str]) -> bytes:
-    vchRet = base_decode(psz, base=58)
-    payload = vchRet[0:-4]
-    csum_found = vchRet[-4:]
-    csum_calculated = sha256d(payload)[0:4]
-    if csum_calculated != csum_found:
-        raise InvalidChecksum(f'calculated {bh2u(csum_calculated)}, found {bh2u(csum_found)}')
-    else:
-        return payload
-
-
-# backwards compat
-# extended WIF for segwit (used in 3.0.x; but still used internally)
-# the keys in this dict should be a superset of what Imported Wallets can import
-WIF_SCRIPT_TYPES = {
-    'p2pkh':0,
-    'p2wpkh':1,
-    'p2wpkh-p2sh':2,
-    'p2sh':5,
-    'p2wsh':6,
-    'p2wsh-p2sh':7
-}
-WIF_SCRIPT_TYPES_INV = inv_dict(WIF_SCRIPT_TYPES)
-
-
-def is_segwit_script_type(txin_type: str) -> bool:
-    return txin_type in ('p2wpkh', 'p2wpkh-p2sh', 'p2wsh', 'p2wsh-p2sh')
-
-
-def serialize_privkey(secret: bytes, compressed: bool, txin_type: str,
-                      internal_use: bool=False) -> str:
-    # we only export secrets inside curve range
-    secret = ecc.ECPrivkey.normalize_secret_bytes(secret)
-    if internal_use:
-        prefix = bytes([(WIF_SCRIPT_TYPES[txin_type] + constants.net.WIF_PREFIX) & 255])
-    else:
-        prefix = bytes([constants.net.WIF_PREFIX])
-    suffix = b'\01' if compressed else b''
-    vchIn = prefix + secret + suffix
-    base58_wif = EncodeBase58Check(vchIn)
-    if internal_use:
-        return base58_wif
-    else:
-        return '{}:{}'.format(txin_type, base58_wif)
-
-
-def deserialize_privkey(key: str) -> Tuple[str, bytes, bool]:
-    if is_minikey(key):
-        return 'p2pkh', minikey_to_private_key(key), False
-
-    txin_type = None
-    if ':' in key:
-        txin_type, key = key.split(sep=':', maxsplit=1)
-        if txin_type not in WIF_SCRIPT_TYPES:
-            raise BitcoinException('unknown script type: {}'.format(txin_type))
-    try:
-        vch = DecodeBase58Check(key)
-    except BaseException:
-        neutered_privkey = str(key)[:3] + '..' + str(key)[-2:]
-        raise BitcoinException("cannot deserialize privkey {}"
-                               .format(neutered_privkey))
-
-    if txin_type is None:
-        # keys exported in version 3.0.x encoded script type in first byte
-        prefix_value = vch[0] - constants.net.WIF_PREFIX
-        try:
-            txin_type = WIF_SCRIPT_TYPES_INV[prefix_value]
-        except KeyError:
-            raise BitcoinException('invalid prefix ({}) for WIF key (1)'.format(vch[0]))
-    else:
-        # all other keys must have a fixed first byte
-        if vch[0] != constants.net.WIF_PREFIX:
-            raise BitcoinException('invalid prefix ({}) for WIF key (2)'.format(vch[0]))
-
-    if len(vch) not in [33, 34]:
-        raise BitcoinException('invalid vch len for WIF key: {}'.format(len(vch)))
-    compressed = False
-    if len(vch) == 34:
-        if vch[33] == 0x01:
-            compressed = True
-        else:
-            raise BitcoinException(f'invalid WIF key. length suggests compressed pubkey, '
-                                   f'but last byte is {vch[33]} != 0x01')
-
-    if is_segwit_script_type(txin_type) and not compressed:
-        raise BitcoinException('only compressed public keys can be used in segwit scripts')
-
-    secret_bytes = vch[1:33]
-    # we accept secrets outside curve range; cast into range here:
-    secret_bytes = ecc.ECPrivkey.normalize_secret_bytes(secret_bytes)
-    return txin_type, secret_bytes, compressed
-
-
-def is_compressed_privkey(sec: str) -> bool:
-    return deserialize_privkey(sec)[2]
-
-
-def address_from_private_key(sec: str) -> str:
-    txin_type, privkey, compressed = deserialize_privkey(sec)
-    public_key = ecc.ECPrivkey(privkey).get_public_key_hex(compressed=compressed)
-    return pubkey_to_address(txin_type, public_key)
-
-def is_segwit_address(addr: str, *, net=None) -> bool:
-    if net is None: net = constants.net
-    try:
-        witver, witprog = segwit_addr.decode(net.SEGWIT_HRP, addr)
-    except Exception as e:
-        return False
-    return witprog is not None
-
-def is_b58_address(addr: str, *, net=None) -> bool:
-    if net is None: net = constants.net
-    try:
-        # test length, checksum, encoding:
-        addrtype, h = b58_address_to_hash160(addr)
-    except Exception as e:
-        return False
-    if addrtype not in [net.ADDRTYPE_P2PKH, net.ADDRTYPE_P2SH]:
-        return False
-    return True
-
-def is_address(addr: str, *, net=None) -> bool:
-    if net is None: net = constants.net
-    return is_segwit_address(addr, net=net) \
-           or is_b58_address(addr, net=net)
-
-
-def is_private_key(key: str, *, raise_on_error=False) -> bool:
-    try:
-        deserialize_privkey(key)
-        return True
-    except BaseException as e:
-        if raise_on_error:
-            raise
-        return False
-
-
-########### end pywallet functions #######################
-
-def is_minikey(text: str) -> bool:
-    # Minikeys are typically 22 or 30 characters, but this routine
-    # permits any length of 20 or more provided the minikey is valid.
-    # A valid minikey must begin with an 'S', be in base58, and when
-    # suffixed with '?' have its SHA256 hash begin with a zero byte.
-    # They are widely used in Casascius physical bitcoins.
-    return (len(text) >= 20 and text[0] == 'S'
-            and all(ord(c) in __b58chars for c in text)
-            and sha256(text + '?')[0] == 0x00)
-
-def minikey_to_private_key(text: str) -> bytes:
-    return sha256(text)

electrum/blockchain.py

@@ -1,634 +0,0 @@
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2012 thomasv@ecdsa.org
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-import os
-import threading
-from typing import Optional, Dict, Mapping, Sequence
-
-from . import util
-from .bitcoin import hash_encode, int_to_hex, rev_hex
-from .crypto import sha256d
-from . import constants
-from .util import bfh, bh2u
-from .simple_config import SimpleConfig
-from .logging import get_logger, Logger
-
-
-_logger = get_logger(__name__)
-
-HEADER_SIZE = 80  # bytes
-MAX_TARGET = 0x00000000FFFF0000000000000000000000000000000000000000000000000000
-
-
-class MissingHeader(Exception):
-    pass
-
-class InvalidHeader(Exception):
-    pass
-
-def serialize_header(header_dict: dict) -> str:
-    s = int_to_hex(header_dict['version'], 4) \
-        + rev_hex(header_dict['prev_block_hash']) \
-        + rev_hex(header_dict['merkle_root']) \
-        + int_to_hex(int(header_dict['timestamp']), 4) \
-        + int_to_hex(int(header_dict['bits']), 4) \
-        + int_to_hex(int(header_dict['nonce']), 4)
-    return s
-
-def deserialize_header(s: bytes, height: int) -> dict:
-    if not s:
-        raise InvalidHeader('Invalid header: {}'.format(s))
-    if len(s) != HEADER_SIZE:
-        raise InvalidHeader('Invalid header length: {}'.format(len(s)))
-    hex_to_int = lambda s: int.from_bytes(s, byteorder='little')
-    h = {}
-    h['version'] = hex_to_int(s[0:4])
-    h['prev_block_hash'] = hash_encode(s[4:36])
-    h['merkle_root'] = hash_encode(s[36:68])
-    h['timestamp'] = hex_to_int(s[68:72])
-    h['bits'] = hex_to_int(s[72:76])
-    h['nonce'] = hex_to_int(s[76:80])
-    h['block_height'] = height
-    return h
-
-def hash_header(header: dict) -> str:
-    if header is None:
-        return '0' * 64
-    if header.get('prev_block_hash') is None:
-        header['prev_block_hash'] = '00'*32
-    return hash_raw_header(serialize_header(header))
-
-
-def hash_raw_header(header: str) -> str:
-    return hash_encode(sha256d(bfh(header)))
-
-
-# key: blockhash hex at forkpoint
-# the chain at some key is the best chain that includes the given hash
-blockchains = {}  # type: Dict[str, Blockchain]
-blockchains_lock = threading.RLock()
-
-
-def read_blockchains(config: 'SimpleConfig'):
-    best_chain = Blockchain(config=config,
-                            forkpoint=0,
-                            parent=None,
-                            forkpoint_hash=constants.net.GENESIS,
-                            prev_hash=None)
-    blockchains[constants.net.GENESIS] = best_chain
-    # consistency checks
-    if best_chain.height() > constants.net.max_checkpoint():
-        header_after_cp = best_chain.read_header(constants.net.max_checkpoint()+1)
-        if not header_after_cp or not best_chain.can_connect(header_after_cp, check_height=False):
-            _logger.info("[blockchain] deleting best chain. cannot connect header after last cp to last cp.")
-            os.unlink(best_chain.path())
-            best_chain.update_size()
-    # forks
-    fdir = os.path.join(util.get_headers_dir(config), 'forks')
-    util.make_dir(fdir)
-    # files are named as: fork2_{forkpoint}_{prev_hash}_{first_hash}
-    l = filter(lambda x: x.startswith('fork2_') and '.' not in x, os.listdir(fdir))
-    l = sorted(l, key=lambda x: int(x.split('_')[1]))  # sort by forkpoint
-
-    def delete_chain(filename, reason):
-        _logger.info(f"[blockchain] deleting chain {filename}: {reason}")
-        os.unlink(os.path.join(fdir, filename))
-
-    def instantiate_chain(filename):
-        __, forkpoint, prev_hash, first_hash = filename.split('_')
-        forkpoint = int(forkpoint)
-        prev_hash = (64-len(prev_hash)) * "0" + prev_hash  # left-pad with zeroes
-        first_hash = (64-len(first_hash)) * "0" + first_hash
-        # forks below the max checkpoint are not allowed
-        if forkpoint <= constants.net.max_checkpoint():
-            delete_chain(filename, "deleting fork below max checkpoint")
-            return
-        # find parent (sorting by forkpoint guarantees it's already instantiated)
-        for parent in blockchains.values():
-            if parent.check_hash(forkpoint - 1, prev_hash):
-                break
-        else:
-            delete_chain(filename, "cannot find parent for chain")
-            return
-        b = Blockchain(config=config,
-                       forkpoint=forkpoint,
-                       parent=parent,
-                       forkpoint_hash=first_hash,
-                       prev_hash=prev_hash)
-        # consistency checks
-        h = b.read_header(b.forkpoint)
-        if first_hash != hash_header(h):
-            delete_chain(filename, "incorrect first hash for chain")
-            return
-        if not b.parent.can_connect(h, check_height=False):
-            delete_chain(filename, "cannot connect chain to parent")
-            return
-        chain_id = b.get_id()
-        assert first_hash == chain_id, (first_hash, chain_id)
-        blockchains[chain_id] = b
-
-    for filename in l:
-        instantiate_chain(filename)
-
-
-def get_best_chain() -> 'Blockchain':
-    return blockchains[constants.net.GENESIS]
-
-# block hash -> chain work; up to and including that block
-_CHAINWORK_CACHE = {
-    "0000000000000000000000000000000000000000000000000000000000000000": 0,  # virtual block at height -1
-}  # type: Dict[str, int]
-
-
-class Blockchain(Logger):
-    """
-    Manages blockchain headers and their verification
-    """
-
-    def __init__(self, config: SimpleConfig, forkpoint: int, parent: Optional['Blockchain'],
-                 forkpoint_hash: str, prev_hash: Optional[str]):
-        assert isinstance(forkpoint_hash, str) and len(forkpoint_hash) == 64, forkpoint_hash
-        assert (prev_hash is None) or (isinstance(prev_hash, str) and len(prev_hash) == 64), prev_hash
-        # assert (parent is None) == (forkpoint == 0)
-        if 0 < forkpoint <= constants.net.max_checkpoint():
-            raise Exception(f"cannot fork below max checkpoint. forkpoint: {forkpoint}")
-        Logger.__init__(self)
-        self.config = config
-        self.forkpoint = forkpoint  # height of first header
-        self.parent = parent
-        self._forkpoint_hash = forkpoint_hash  # blockhash at forkpoint. "first hash"
-        self._prev_hash = prev_hash  # blockhash immediately before forkpoint
-        self.lock = threading.RLock()
-        self.update_size()
-
-    def with_lock(func):
-        def func_wrapper(self, *args, **kwargs):
-            with self.lock:
-                return func(self, *args, **kwargs)
-        return func_wrapper
-
-    @property
-    def checkpoints(self):
-        return constants.net.CHECKPOINTS
-
-    def get_max_child(self) -> Optional[int]:
-        children = self.get_direct_children()
-        return max([x.forkpoint for x in children]) if children else None
-
-    def get_max_forkpoint(self) -> int:
-        """Returns the max height where there is a fork
-        related to this chain.
-        """
-        mc = self.get_max_child()
-        return mc if mc is not None else self.forkpoint
-
-    def get_direct_children(self) -> Sequence['Blockchain']:
-        with blockchains_lock:
-            return list(filter(lambda y: y.parent==self, blockchains.values()))
-
-    def get_parent_heights(self) -> Mapping['Blockchain', int]:
-        """Returns map: (parent chain -> height of last common block)"""
-        with blockchains_lock:
-            result = {self: self.height()}
-            chain = self
-            while True:
-                parent = chain.parent
-                if parent is None: break
-                result[parent] = chain.forkpoint - 1
-                chain = parent
-            return result
-
-    def get_height_of_last_common_block_with_chain(self, other_chain: 'Blockchain') -> int:
-        last_common_block_height = 0
-        our_parents = self.get_parent_heights()
-        their_parents = other_chain.get_parent_heights()
-        for chain in our_parents:
-            if chain in their_parents:
-                h = min(our_parents[chain], their_parents[chain])
-                last_common_block_height = max(last_common_block_height, h)
-        return last_common_block_height
-
-    @with_lock
-    def get_branch_size(self) -> int:
-        return self.height() - self.get_max_forkpoint() + 1
-
-    def get_name(self) -> str:
-        return self.get_hash(self.get_max_forkpoint()).lstrip('0')[0:10]
-
-    def check_header(self, header: dict) -> bool:
-        header_hash = hash_header(header)
-        height = header.get('block_height')
-        return self.check_hash(height, header_hash)
-
-    def check_hash(self, height: int, header_hash: str) -> bool:
-        """Returns whether the hash of the block at given height
-        is the given hash.
-        """
-        assert isinstance(header_hash, str) and len(header_hash) == 64, header_hash  # hex
-        try:
-            return header_hash == self.get_hash(height)
-        except Exception:
-            return False
-
-    def fork(parent, header: dict) -> 'Blockchain':
-        if not parent.can_connect(header, check_height=False):
-            raise Exception("forking header does not connect to parent chain")
-        forkpoint = header.get('block_height')
-        self = Blockchain(config=parent.config,
-                          forkpoint=forkpoint,
-                          parent=parent,
-                          forkpoint_hash=hash_header(header),
-                          prev_hash=parent.get_hash(forkpoint-1))
-        self.assert_headers_file_available(parent.path())
-        open(self.path(), 'w+').close()
-        self.save_header(header)
-        # put into global dict. note that in some cases
-        # save_header might have already put it there but that's OK
-        chain_id = self.get_id()
-        with blockchains_lock:
-            blockchains[chain_id] = self
-        return self
-
-    @with_lock
-    def height(self) -> int:
-        return self.forkpoint + self.size() - 1
-
-    @with_lock
-    def size(self) -> int:
-        return self._size
-
-    @with_lock
-    def update_size(self) -> None:
-        p = self.path()
-        self._size = os.path.getsize(p)//HEADER_SIZE if os.path.exists(p) else 0
-
-    @classmethod
-    def verify_header(cls, header: dict, prev_hash: str, target: int, expected_header_hash: str=None) -> None:
-        _hash = hash_header(header)
-        if expected_header_hash and expected_header_hash != _hash:
-            raise Exception("hash mismatches with expected: {} vs {}".format(expected_header_hash, _hash))
-        if prev_hash != header.get('prev_block_hash'):
-            raise Exception("prev hash mismatch: %s vs %s" % (prev_hash, header.get('prev_block_hash')))
-        if constants.net.TESTNET:
-            return
-        bits = cls.target_to_bits(target)
-        if bits != header.get('bits'):
-            raise Exception("bits mismatch: %s vs %s" % (bits, header.get('bits')))
-        block_hash_as_num = int.from_bytes(bfh(_hash), byteorder='big')
-        if block_hash_as_num > target:
-            raise Exception(f"insufficient proof of work: {block_hash_as_num} vs target {target}")
-
-    def verify_chunk(self, index: int, data: bytes) -> None:
-        num = len(data) // HEADER_SIZE
-        start_height = index * 2016
-        prev_hash = self.get_hash(start_height - 1)
-        target = self.get_target(index-1)
-        for i in range(num):
-            height = start_height + i
-            try:
-                expected_header_hash = self.get_hash(height)
-            except MissingHeader:
-                expected_header_hash = None
-            raw_header = data[i*HEADER_SIZE : (i+1)*HEADER_SIZE]
-            header = deserialize_header(raw_header, index*2016 + i)
-            self.verify_header(header, prev_hash, target, expected_header_hash)
-            prev_hash = hash_header(header)
-
-    @with_lock
-    def path(self):
-        d = util.get_headers_dir(self.config)
-        if self.parent is None:
-            filename = 'blockchain_headers'
-        else:
-            assert self.forkpoint > 0, self.forkpoint
-            prev_hash = self._prev_hash.lstrip('0')
-            first_hash = self._forkpoint_hash.lstrip('0')
-            basename = f'fork2_{self.forkpoint}_{prev_hash}_{first_hash}'
-            filename = os.path.join('forks', basename)
-        return os.path.join(d, filename)
-
-    @with_lock
-    def save_chunk(self, index: int, chunk: bytes):
-        assert index >= 0, index
-        chunk_within_checkpoint_region = index < len(self.checkpoints)
-        # chunks in checkpoint region are the responsibility of the 'main chain'
-        if chunk_within_checkpoint_region and self.parent is not None:
-            main_chain = get_best_chain()
-            main_chain.save_chunk(index, chunk)
-            return
-
-        delta_height = (index * 2016 - self.forkpoint)
-        delta_bytes = delta_height * HEADER_SIZE
-        # if this chunk contains our forkpoint, only save the part after forkpoint
-        # (the part before is the responsibility of the parent)
-        if delta_bytes < 0:
-            chunk = chunk[-delta_bytes:]
-            delta_bytes = 0
-        truncate = not chunk_within_checkpoint_region
-        self.write(chunk, delta_bytes, truncate)
-        self.swap_with_parent()
-
-    def swap_with_parent(self) -> None:
-        with self.lock, blockchains_lock:
-            # do the swap; possibly multiple ones
-            cnt = 0
-            while True:
-                old_parent = self.parent
-                if not self._swap_with_parent():
-                    break
-                # make sure we are making progress
-                cnt += 1
-                if cnt > len(blockchains):
-                    raise Exception(f'swapping fork with parent too many times: {cnt}')
-                # we might have become the parent of some of our former siblings
-                for old_sibling in old_parent.get_direct_children():
-                    if self.check_hash(old_sibling.forkpoint - 1, old_sibling._prev_hash):
-                        old_sibling.parent = self
-
-    def _swap_with_parent(self) -> bool:
-        """Check if this chain became stronger than its parent, and swap
-        the underlying files if so. The Blockchain instances will keep
-        'containing' the same headers, but their ids change and so
-        they will be stored in different files."""
-        if self.parent is None:
-            return False
-        if self.parent.get_chainwork() >= self.get_chainwork():
-            return False
-        self.logger.info(f"swapping {self.forkpoint} {self.parent.forkpoint}")
-        parent_branch_size = self.parent.height() - self.forkpoint + 1
-        forkpoint = self.forkpoint  # type: Optional[int]
-        parent = self.parent  # type: Optional[Blockchain]
-        child_old_id = self.get_id()
-        parent_old_id = parent.get_id()
-        # swap files
-        # child takes parent's name
-        # parent's new name will be something new (not child's old name)
-        self.assert_headers_file_available(self.path())
-        child_old_name = self.path()
-        with open(self.path(), 'rb') as f:
-            my_data = f.read()
-        self.assert_headers_file_available(parent.path())
-        assert forkpoint > parent.forkpoint, (f"forkpoint of parent chain ({parent.forkpoint}) "
-                                              f"should be at lower height than children's ({forkpoint})")
-        with open(parent.path(), 'rb') as f:
-            f.seek((forkpoint - parent.forkpoint)*HEADER_SIZE)
-            parent_data = f.read(parent_branch_size*HEADER_SIZE)
-        self.write(parent_data, 0)
-        parent.write(my_data, (forkpoint - parent.forkpoint)*HEADER_SIZE)
-        # swap parameters
-        self.parent, parent.parent = parent.parent, self  # type: Optional[Blockchain], Optional[Blockchain]
-        self.forkpoint, parent.forkpoint = parent.forkpoint, self.forkpoint
-        self._forkpoint_hash, parent._forkpoint_hash = parent._forkpoint_hash, hash_raw_header(bh2u(parent_data[:HEADER_SIZE]))
-        self._prev_hash, parent._prev_hash = parent._prev_hash, self._prev_hash
-        # parent's new name
-        os.replace(child_old_name, parent.path())
-        self.update_size()
-        parent.update_size()
-        # update pointers
-        blockchains.pop(child_old_id, None)
-        blockchains.pop(parent_old_id, None)
-        blockchains[self.get_id()] = self
-        blockchains[parent.get_id()] = parent
-        return True
-
-    def get_id(self) -> str:
-        return self._forkpoint_hash
-
-    def assert_headers_file_available(self, path):
-        if os.path.exists(path):
-            return
-        elif not os.path.exists(util.get_headers_dir(self.config)):
-            raise FileNotFoundError('Electrum headers_dir does not exist. Was it deleted while running?')
-        else:
-            raise FileNotFoundError('Cannot find headers file but headers_dir is there. Should be at {}'.format(path))
-
-    @with_lock
-    def write(self, data: bytes, offset: int, truncate: bool=True) -> None:
-        filename = self.path()
-        self.assert_headers_file_available(filename)
-        with open(filename, 'rb+') as f:
-            if truncate and offset != self._size * HEADER_SIZE:
-                f.seek(offset)
-                f.truncate()
-            f.seek(offset)
-            f.write(data)
-            f.flush()
-            os.fsync(f.fileno())
-        self.update_size()
-
-    @with_lock
-    def save_header(self, header: dict) -> None:
-        delta = header.get('block_height') - self.forkpoint
-        data = bfh(serialize_header(header))
-        # headers are only _appended_ to the end:
-        assert delta == self.size(), (delta, self.size())
-        assert len(data) == HEADER_SIZE
-        self.write(data, delta*HEADER_SIZE)
-        self.swap_with_parent()
-
-    @with_lock
-    def read_header(self, height: int) -> Optional[dict]:
-        if height < 0:
-            return
-        if height < self.forkpoint:
-            return self.parent.read_header(height)
-        if height > self.height():
-            return
-        delta = height - self.forkpoint
-        name = self.path()
-        self.assert_headers_file_available(name)
-        with open(name, 'rb') as f:
-            f.seek(delta * HEADER_SIZE)
-            h = f.read(HEADER_SIZE)
-            if len(h) < HEADER_SIZE:
-                raise Exception('Expected to read a full header. This was only {} bytes'.format(len(h)))
-        if h == bytes([0])*HEADER_SIZE:
-            return None
-        return deserialize_header(h, height)
-
-    def header_at_tip(self) -> Optional[dict]:
-        """Return latest header."""
-        height = self.height()
-        return self.read_header(height)
-
-    def get_hash(self, height: int) -> str:
-        def is_height_checkpoint():
-            within_cp_range = height <= constants.net.max_checkpoint()
-            at_chunk_boundary = (height+1) % 2016 == 0
-            return within_cp_range and at_chunk_boundary
-
-        if height == -1:
-            return '0000000000000000000000000000000000000000000000000000000000000000'
-        elif height == 0:
-            return constants.net.GENESIS
-        elif is_height_checkpoint():
-            index = height // 2016
-            h, t = self.checkpoints[index]
-            return h
-        else:
-            header = self.read_header(height)
-            if header is None:
-                raise MissingHeader(height)
-            return hash_header(header)
-
-    def get_target(self, index: int) -> int:
-        # compute target from chunk x, used in chunk x+1
-        if constants.net.TESTNET:
-            return 0
-        if index == -1:
-            return MAX_TARGET
-        if index < len(self.checkpoints):
-            h, t = self.checkpoints[index]
-            return t
-        # new target
-        first = self.read_header(index * 2016)
-        last = self.read_header(index * 2016 + 2015)
-        if not first or not last:
-            raise MissingHeader()
-        bits = last.get('bits')
-        target = self.bits_to_target(bits)
-        nActualTimespan = last.get('timestamp') - first.get('timestamp')
-        nTargetTimespan = 14 * 24 * 60 * 60
-        nActualTimespan = max(nActualTimespan, nTargetTimespan // 4)
-        nActualTimespan = min(nActualTimespan, nTargetTimespan * 4)
-        new_target = min(MAX_TARGET, (target * nActualTimespan) // nTargetTimespan)
-        # not any target can be represented in 32 bits:
-        new_target = self.bits_to_target(self.target_to_bits(new_target))
-        return new_target
-
-    @classmethod
-    def bits_to_target(cls, bits: int) -> int:
-        bitsN = (bits >> 24) & 0xff
-        if not (0x03 <= bitsN <= 0x1d):
-            raise Exception("First part of bits should be in [0x03, 0x1d]")
-        bitsBase = bits & 0xffffff
-        if not (0x8000 <= bitsBase <= 0x7fffff):
-            raise Exception("Second part of bits should be in [0x8000, 0x7fffff]")
-        return bitsBase << (8 * (bitsN-3))
-
-    @classmethod
-    def target_to_bits(cls, target: int) -> int:
-        c = ("%064x" % target)[2:]
-        while c[:2] == '00' and len(c) > 6:
-            c = c[2:]
-        bitsN, bitsBase = len(c) // 2, int.from_bytes(bfh(c[:6]), byteorder='big')
-        if bitsBase >= 0x800000:
-            bitsN += 1
-            bitsBase >>= 8
-        return bitsN << 24 | bitsBase
-
-    def chainwork_of_header_at_height(self, height: int) -> int:
-        """work done by single header at given height"""
-        chunk_idx = height // 2016 - 1
-        target = self.get_target(chunk_idx)
-        work = ((2 ** 256 - target - 1) // (target + 1)) + 1
-        return work
-
-    @with_lock
-    def get_chainwork(self, height=None) -> int:
-        if height is None:
-            height = max(0, self.height())
-        if constants.net.TESTNET:
-            # On testnet/regtest, difficulty works somewhat different.
-            # It's out of scope to properly implement that.
-            return height
-        last_retarget = height // 2016 * 2016 - 1
-        cached_height = last_retarget
-        while _CHAINWORK_CACHE.get(self.get_hash(cached_height)) is None:
-            if cached_height <= -1:
-                break
-            cached_height -= 2016
-        assert cached_height >= -1, cached_height
-        running_total = _CHAINWORK_CACHE[self.get_hash(cached_height)]
-        while cached_height < last_retarget:
-            cached_height += 2016
-            work_in_single_header = self.chainwork_of_header_at_height(cached_height)
-            work_in_chunk = 2016 * work_in_single_header
-            running_total += work_in_chunk
-            _CHAINWORK_CACHE[self.get_hash(cached_height)] = running_total
-        cached_height += 2016
-        work_in_single_header = self.chainwork_of_header_at_height(cached_height)
-        work_in_last_partial_chunk = (height % 2016 + 1) * work_in_single_header
-        return running_total + work_in_last_partial_chunk
-
-    def can_connect(self, header: dict, check_height: bool=True) -> bool:
-        if header is None:
-            return False
-        height = header['block_height']
-        if check_height and self.height() != height - 1:
-            return False
-        if height == 0:
-            return hash_header(header) == constants.net.GENESIS
-        try:
-            prev_hash = self.get_hash(height - 1)
-        except:
-            return False
-        if prev_hash != header.get('prev_block_hash'):
-            return False
-        try:
-            target = self.get_target(height // 2016 - 1)
-        except MissingHeader:
-            return False
-        try:
-            self.verify_header(header, prev_hash, target)
-        except BaseException as e:
-            return False
-        return True
-
-    def connect_chunk(self, idx: int, hexdata: str) -> bool:
-        assert idx >= 0, idx
-        try:
-            data = bfh(hexdata)
-            self.verify_chunk(idx, data)
-            self.save_chunk(idx, data)
-            return True
-        except BaseException as e:
-            self.logger.info(f'verify_chunk idx {idx} failed: {repr(e)}')
-            return False
-
-    def get_checkpoints(self):
-        # for each chunk, store the hash of the last block and the target after the chunk
-        cp = []
-        n = self.height() // 2016
-        for index in range(n):
-            h = self.get_hash((index+1) * 2016 -1)
-            target = self.get_target(index)
-            cp.append((h, target))
-        return cp
-
-
-def check_header(header: dict) -> Optional[Blockchain]:
-    if type(header) is not dict:
-        return None
-    with blockchains_lock: chains = list(blockchains.values())
-    for b in chains:
-        if b.check_header(header):
-            return b
-    return None
-
-
-def can_connect(header: dict) -> Optional[Blockchain]:
-    with blockchains_lock: chains = list(blockchains.values())
-    for b in chains:
-        if b.can_connect(header):
-            return b
-    return None

electrum/channel_db.py

@@ -1,637 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2018 The Electrum developers
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import time
-import random
-import os
-from collections import defaultdict
-from typing import Sequence, List, Tuple, Optional, Dict, NamedTuple, TYPE_CHECKING, Set
-import binascii
-import base64
-import asyncio
-
-
-from .sql_db import SqlDB, sql
-from . import constants
-from .util import bh2u, profiler, get_headers_dir, bfh, is_ip_address, list_enabled_bits
-from .logging import Logger
-from .lnutil import LN_GLOBAL_FEATURES_KNOWN_SET, LNPeerAddr, format_short_channel_id, ShortChannelID
-from .lnverifier import LNChannelVerifier, verify_sig_for_channel_update
-from .lnmsg import decode_msg
-
-if TYPE_CHECKING:
-    from .network import Network
-    from .lnchannel import Channel
-
-
-class UnknownEvenFeatureBits(Exception): pass
-
-def validate_features(features : int):
-    enabled_features = list_enabled_bits(features)
-    for fbit in enabled_features:
-        if (1 << fbit) not in LN_GLOBAL_FEATURES_KNOWN_SET and fbit % 2 == 0:
-            raise UnknownEvenFeatureBits()
-
-
-FLAG_DISABLE   = 1 << 1
-FLAG_DIRECTION = 1 << 0
-
-class ChannelInfo(NamedTuple):
-    short_channel_id: ShortChannelID
-    node1_id: bytes
-    node2_id: bytes
-    capacity_sat: Optional[int]
-
-    @staticmethod
-    def from_msg(payload: dict) -> 'ChannelInfo':
-        features = int.from_bytes(payload['features'], 'big')
-        validate_features(features)
-        channel_id = payload['short_channel_id']
-        node_id_1 = payload['node_id_1']
-        node_id_2 = payload['node_id_2']
-        assert list(sorted([node_id_1, node_id_2])) == [node_id_1, node_id_2]
-        capacity_sat = None
-        return ChannelInfo(
-            short_channel_id = ShortChannelID.normalize(channel_id),
-            node1_id = node_id_1,
-            node2_id = node_id_2,
-            capacity_sat = capacity_sat
-        )
-
-    @staticmethod
-    def from_raw_msg(raw: bytes) -> 'ChannelInfo':
-        payload_dict = decode_msg(raw)[1]
-        return ChannelInfo.from_msg(payload_dict)
-
-
-class Policy(NamedTuple):
-    key: bytes
-    cltv_expiry_delta: int
-    htlc_minimum_msat: int
-    htlc_maximum_msat: Optional[int]
-    fee_base_msat: int
-    fee_proportional_millionths: int
-    channel_flags: int
-    message_flags: int
-    timestamp: int
-
-    @staticmethod
-    def from_msg(payload: dict) -> 'Policy':
-        return Policy(
-            key                         = payload['short_channel_id'] + payload['start_node'],
-            cltv_expiry_delta           = int.from_bytes(payload['cltv_expiry_delta'], "big"),
-            htlc_minimum_msat           = int.from_bytes(payload['htlc_minimum_msat'], "big"),
-            htlc_maximum_msat           = int.from_bytes(payload['htlc_maximum_msat'], "big") if 'htlc_maximum_msat' in payload else None,
-            fee_base_msat               = int.from_bytes(payload['fee_base_msat'], "big"),
-            fee_proportional_millionths = int.from_bytes(payload['fee_proportional_millionths'], "big"),
-            message_flags               = int.from_bytes(payload['message_flags'], "big"),
-            channel_flags               = int.from_bytes(payload['channel_flags'], "big"),
-            timestamp                   = int.from_bytes(payload['timestamp'], "big")
-        )
-
-    def is_disabled(self):
-        return self.channel_flags & FLAG_DISABLE
-
-    @property
-    def short_channel_id(self) -> ShortChannelID:
-        return ShortChannelID.normalize(self.key[0:8])
-
-    @property
-    def start_node(self):
-        return self.key[8:]
-
-
-
-class NodeInfo(NamedTuple):
-    node_id: bytes
-    features: int
-    timestamp: int
-    alias: str
-
-    @staticmethod
-    def from_msg(payload):
-        node_id = payload['node_id']
-        features = int.from_bytes(payload['features'], "big")
-        validate_features(features)
-        addresses = NodeInfo.parse_addresses_field(payload['addresses'])
-        alias = payload['alias'].rstrip(b'\x00')
-        timestamp = int.from_bytes(payload['timestamp'], "big")
-        return NodeInfo(node_id=node_id, features=features, timestamp=timestamp, alias=alias), [
-            Address(host=host, port=port, node_id=node_id, last_connected_date=None) for host, port in addresses]
-
-    @staticmethod
-    def parse_addresses_field(addresses_field):
-        buf = addresses_field
-        def read(n):
-            nonlocal buf
-            data, buf = buf[0:n], buf[n:]
-            return data
-        addresses = []
-        while buf:
-            atype = ord(read(1))
-            if atype == 0:
-                pass
-            elif atype == 1:  # IPv4
-                ipv4_addr = '.'.join(map(lambda x: '%d' % x, read(4)))
-                port = int.from_bytes(read(2), 'big')
-                if is_ip_address(ipv4_addr) and port != 0:
-                    addresses.append((ipv4_addr, port))
-            elif atype == 2:  # IPv6
-                ipv6_addr = b':'.join([binascii.hexlify(read(2)) for i in range(8)])
-                ipv6_addr = ipv6_addr.decode('ascii')
-                port = int.from_bytes(read(2), 'big')
-                if is_ip_address(ipv6_addr) and port != 0:
-                    addresses.append((ipv6_addr, port))
-            elif atype == 3:  # onion v2
-                host = base64.b32encode(read(10)) + b'.onion'
-                host = host.decode('ascii').lower()
-                port = int.from_bytes(read(2), 'big')
-                addresses.append((host, port))
-            elif atype == 4:  # onion v3
-                host = base64.b32encode(read(35)) + b'.onion'
-                host = host.decode('ascii').lower()
-                port = int.from_bytes(read(2), 'big')
-                addresses.append((host, port))
-            else:
-                # unknown address type
-                # we don't know how long it is -> have to escape
-                # if there are other addresses we could have parsed later, they are lost.
-                break
-        return addresses
-
-
-class Address(NamedTuple):
-    node_id: bytes
-    host: str
-    port: int
-    last_connected_date: Optional[int]
-
-
-class CategorizedChannelUpdates(NamedTuple):
-    orphaned: List    # no channel announcement for channel update
-    expired: List     # update older than two weeks
-    deprecated: List  # update older than database entry
-    good: List        # good updates
-    to_delete: List   # database entries to delete
-
-
-# TODO It would make more sense to store the raw gossip messages in the db.
-#      That is pretty much a pre-requisite of actively participating in gossip.
-
-create_channel_info = """
-CREATE TABLE IF NOT EXISTS channel_info (
-short_channel_id VARCHAR(64),
-node1_id VARCHAR(66),
-node2_id VARCHAR(66),
-capacity_sat INTEGER,
-PRIMARY KEY(short_channel_id)
-)"""
-
-create_policy = """
-CREATE TABLE IF NOT EXISTS policy (
-key VARCHAR(66),
-cltv_expiry_delta INTEGER NOT NULL,
-htlc_minimum_msat INTEGER NOT NULL,
-htlc_maximum_msat INTEGER,
-fee_base_msat INTEGER NOT NULL,
-fee_proportional_millionths INTEGER NOT NULL,
-channel_flags INTEGER NOT NULL,
-message_flags INTEGER NOT NULL,
-timestamp INTEGER NOT NULL,
-PRIMARY KEY(key)
-)"""
-
-create_address = """
-CREATE TABLE IF NOT EXISTS address (
-node_id VARCHAR(66),
-host STRING(256),
-port INTEGER NOT NULL,
-timestamp INTEGER,
-PRIMARY KEY(node_id, host, port)
-)"""
-
-create_node_info = """
-CREATE TABLE IF NOT EXISTS node_info (
-node_id VARCHAR(66),
-features INTEGER NOT NULL,
-timestamp INTEGER NOT NULL,
-alias STRING(64),
-PRIMARY KEY(node_id)
-)"""
-
-
-class ChannelDB(SqlDB):
-
-    NUM_MAX_RECENT_PEERS = 20
-
-    def __init__(self, network: 'Network'):
-        path = os.path.join(get_headers_dir(network.config), 'channel_db')
-        super().__init__(network, path, commit_interval=100)
-        self.num_nodes = 0
-        self.num_channels = 0
-        self._channel_updates_for_private_channels = {}  # type: Dict[Tuple[bytes, bytes], dict]
-        self.ca_verifier = LNChannelVerifier(network, self)
-        # initialized in load_data
-        self._channels = {}  # type: Dict[bytes, ChannelInfo]
-        self._policies = {}  # type: Dict[Tuple[bytes, bytes], Policy]  # (node_id, scid) -> Policy
-        self._nodes = {}
-        # node_id -> (host, port, ts)
-        self._addresses = defaultdict(set)  # type: Dict[bytes, Set[Tuple[str, int, int]]]
-        self._channels_for_node = defaultdict(set)  # type: Dict[bytes, Set[ShortChannelID]]
-        self.data_loaded = asyncio.Event()
-        self.network = network # only for callback
-
-    def update_counts(self):
-        self.num_nodes = len(self._nodes)
-        self.num_channels = len(self._channels)
-        self.num_policies = len(self._policies)
-        self.network.trigger_callback('channel_db', self.num_nodes, self.num_channels, self.num_policies)
-
-    def get_channel_ids(self):
-        return set(self._channels.keys())
-
-    def add_recent_peer(self, peer: LNPeerAddr):
-        now = int(time.time())
-        node_id = peer.pubkey
-        self._addresses[node_id].add((peer.host, peer.port, now))
-        self.save_node_address(node_id, peer, now)
-
-    def get_200_randomly_sorted_nodes_not_in(self, node_ids):
-        unshuffled = set(self._nodes.keys()) - node_ids
-        return random.sample(unshuffled, min(200, len(unshuffled)))
-
-    def get_last_good_address(self, node_id) -> Optional[LNPeerAddr]:
-        r = self._addresses.get(node_id)
-        if not r:
-            return None
-        addr = sorted(list(r), key=lambda x: x[2])[0]
-        host, port, timestamp = addr
-        try:
-            return LNPeerAddr(host, port, node_id)
-        except ValueError:
-            return None
-
-    def get_recent_peers(self):
-        assert self.data_loaded.is_set(), "channelDB load_data did not finish yet!"
-        # FIXME this does not reliably return "recent" peers...
-        #       Also, the list() cast over the whole dict (thousands of elements),
-        #       is really inefficient.
-        r = [self.get_last_good_address(node_id)
-             for node_id in list(self._addresses.keys())[-self.NUM_MAX_RECENT_PEERS:]]
-        return list(reversed(r))
-
-    # note: currently channel announcements are trusted by default (trusted=True);
-    #       they are not verified. Verifying them would make the gossip sync
-    #       even slower; especially as servers will start throttling us.
-    #       It would probably put significant strain on servers if all clients
-    #       verified the complete gossip.
-    def add_channel_announcement(self, msg_payloads, *, trusted=True):
-        if type(msg_payloads) is dict:
-            msg_payloads = [msg_payloads]
-        added = 0
-        for msg in msg_payloads:
-            short_channel_id = ShortChannelID(msg['short_channel_id'])
-            if short_channel_id in self._channels:
-                continue
-            if constants.net.rev_genesis_bytes() != msg['chain_hash']:
-                self.logger.info("ChanAnn has unexpected chain_hash {}".format(bh2u(msg['chain_hash'])))
-                continue
-            try:
-                channel_info = ChannelInfo.from_msg(msg)
-            except UnknownEvenFeatureBits:
-                self.logger.info("unknown feature bits")
-                continue
-            if trusted:
-                added += 1
-                self.add_verified_channel_info(msg)
-            else:
-                added += self.ca_verifier.add_new_channel_info(short_channel_id, msg)
-
-        self.update_counts()
-        self.logger.debug('add_channel_announcement: %d/%d'%(added, len(msg_payloads)))
-
-    def add_verified_channel_info(self, msg: dict, *, capacity_sat: int = None) -> None:
-        try:
-            channel_info = ChannelInfo.from_msg(msg)
-        except UnknownEvenFeatureBits:
-            return
-        channel_info = channel_info._replace(capacity_sat=capacity_sat)
-        self._channels[channel_info.short_channel_id] = channel_info
-        self._channels_for_node[channel_info.node1_id].add(channel_info.short_channel_id)
-        self._channels_for_node[channel_info.node2_id].add(channel_info.short_channel_id)
-        self.save_channel(channel_info)
-
-    def print_change(self, old_policy: Policy, new_policy: Policy):
-        # print what changed between policies
-        if old_policy.cltv_expiry_delta != new_policy.cltv_expiry_delta:
-            self.logger.info(f'cltv_expiry_delta: {old_policy.cltv_expiry_delta} -> {new_policy.cltv_expiry_delta}')
-        if old_policy.htlc_minimum_msat != new_policy.htlc_minimum_msat:
-            self.logger.info(f'htlc_minimum_msat: {old_policy.htlc_minimum_msat} -> {new_policy.htlc_minimum_msat}')
-        if old_policy.htlc_maximum_msat != new_policy.htlc_maximum_msat:
-            self.logger.info(f'htlc_maximum_msat: {old_policy.htlc_maximum_msat} -> {new_policy.htlc_maximum_msat}')
-        if old_policy.fee_base_msat != new_policy.fee_base_msat:
-            self.logger.info(f'fee_base_msat: {old_policy.fee_base_msat} -> {new_policy.fee_base_msat}')
-        if old_policy.fee_proportional_millionths != new_policy.fee_proportional_millionths:
-            self.logger.info(f'fee_proportional_millionths: {old_policy.fee_proportional_millionths} -> {new_policy.fee_proportional_millionths}')
-        if old_policy.channel_flags != new_policy.channel_flags:
-            self.logger.info(f'channel_flags: {old_policy.channel_flags} -> {new_policy.channel_flags}')
-        if old_policy.message_flags != new_policy.message_flags:
-            self.logger.info(f'message_flags: {old_policy.message_flags} -> {new_policy.message_flags}')
-
-    def add_channel_updates(self, payloads, max_age=None, verify=True) -> CategorizedChannelUpdates:
-        orphaned = []
-        expired = []
-        deprecated = []
-        good = []
-        to_delete = []
-        # filter orphaned and expired first
-        known = []
-        now = int(time.time())
-        for payload in payloads:
-            short_channel_id = ShortChannelID(payload['short_channel_id'])
-            timestamp = int.from_bytes(payload['timestamp'], "big")
-            if max_age and now - timestamp > max_age:
-                expired.append(payload)
-                continue
-            channel_info = self._channels.get(short_channel_id)
-            if not channel_info:
-                orphaned.append(payload)
-                continue
-            flags = int.from_bytes(payload['channel_flags'], 'big')
-            direction = flags & FLAG_DIRECTION
-            start_node = channel_info.node1_id if direction == 0 else channel_info.node2_id
-            payload['start_node'] = start_node
-            known.append(payload)
-        # compare updates to existing database entries
-        for payload in known:
-            timestamp = int.from_bytes(payload['timestamp'], "big")
-            start_node = payload['start_node']
-            short_channel_id = ShortChannelID(payload['short_channel_id'])
-            key = (start_node, short_channel_id)
-            old_policy = self._policies.get(key)
-            if old_policy and timestamp <= old_policy.timestamp:
-                deprecated.append(payload)
-                continue
-            good.append(payload)
-            if verify:
-                self.verify_channel_update(payload)
-            policy = Policy.from_msg(payload)
-            self._policies[key] = policy
-            self.save_policy(policy)
-        #
-        self.update_counts()
-        return CategorizedChannelUpdates(
-            orphaned=orphaned,
-            expired=expired,
-            deprecated=deprecated,
-            good=good,
-            to_delete=to_delete,
-        )
-
-    def add_channel_update(self, payload):
-        # called from tests
-        self.add_channel_updates([payload], verify=False)
-
-    def create_database(self):
-        c = self.conn.cursor()
-        c.execute(create_node_info)
-        c.execute(create_address)
-        c.execute(create_policy)
-        c.execute(create_channel_info)
-        self.conn.commit()
-
-    @sql
-    def save_policy(self, policy):
-        c = self.conn.cursor()
-        c.execute("""REPLACE INTO policy (key, cltv_expiry_delta, htlc_minimum_msat, htlc_maximum_msat, fee_base_msat, fee_proportional_millionths, channel_flags, message_flags, timestamp) VALUES (?,?,?,?,?,?,?,?,?)""", list(policy))
-
-    @sql
-    def delete_policy(self, node_id, short_channel_id):
-        key = short_channel_id + node_id
-        c = self.conn.cursor()
-        c.execute("""DELETE FROM policy WHERE key=?""", (key,))
-
-    @sql
-    def save_channel(self, channel_info):
-        c = self.conn.cursor()
-        c.execute("REPLACE INTO channel_info (short_channel_id, node1_id, node2_id, capacity_sat) VALUES (?,?,?,?)", list(channel_info))
-
-    @sql
-    def delete_channel(self, short_channel_id):
-        c = self.conn.cursor()
-        c.execute("""DELETE FROM channel_info WHERE short_channel_id=?""", (short_channel_id,))
-
-    @sql
-    def save_node(self, node_info):
-        c = self.conn.cursor()
-        c.execute("REPLACE INTO node_info (node_id, features, timestamp, alias) VALUES (?,?,?,?)", list(node_info))
-
-    @sql
-    def save_node_address(self, node_id, peer, now):
-        c = self.conn.cursor()
-        c.execute("REPLACE INTO address (node_id, host, port, timestamp) VALUES (?,?,?,?)", (node_id, peer.host, peer.port, now))
-
-    @sql
-    def save_node_addresses(self, node_id, node_addresses):
-        c = self.conn.cursor()
-        for addr in node_addresses:
-            c.execute("SELECT * FROM address WHERE node_id=? AND host=? AND port=?", (addr.node_id, addr.host, addr.port))
-            r = c.fetchall()
-            if r == []:
-                c.execute("INSERT INTO address (node_id, host, port, timestamp) VALUES (?,?,?,?)", (addr.node_id, addr.host, addr.port, 0))
-
-    def verify_channel_update(self, payload):
-        short_channel_id = payload['short_channel_id']
-        short_channel_id = ShortChannelID(short_channel_id)
-        if constants.net.rev_genesis_bytes() != payload['chain_hash']:
-            raise Exception('wrong chain hash')
-        if not verify_sig_for_channel_update(payload, payload['start_node']):
-            raise Exception(f'failed verifying channel update for {short_channel_id}')
-
-    def add_node_announcement(self, msg_payloads):
-        if type(msg_payloads) is dict:
-            msg_payloads = [msg_payloads]
-        old_addr = None
-        new_nodes = {}
-        for msg_payload in msg_payloads:
-            try:
-                node_info, node_addresses = NodeInfo.from_msg(msg_payload)
-            except UnknownEvenFeatureBits:
-                continue
-            node_id = node_info.node_id
-            # Ignore node if it has no associated channel (DoS protection)
-            if node_id not in self._channels_for_node:
-                #self.logger.info('ignoring orphan node_announcement')
-                continue
-            node = self._nodes.get(node_id)
-            if node and node.timestamp >= node_info.timestamp:
-                continue
-            node = new_nodes.get(node_id)
-            if node and node.timestamp >= node_info.timestamp:
-                continue
-            # save
-            self._nodes[node_id] = node_info
-            self.save_node(node_info)
-            for addr in node_addresses:
-                self._addresses[node_id].add((addr.host, addr.port, 0))
-            self.save_node_addresses(node_id, node_addresses)
-
-        self.logger.debug("on_node_announcement: %d/%d"%(len(new_nodes), len(msg_payloads)))
-        self.update_counts()
-
-    def get_old_policies(self, delta):
-        now = int(time.time())
-        return list(k for k, v in list(self._policies.items()) if v.timestamp <= now - delta)
-
-    def prune_old_policies(self, delta):
-        l = self.get_old_policies(delta)
-        if l:
-            for k in l:
-                self._policies.pop(k)
-                self.delete_policy(*k)
-            self.update_counts()
-            self.logger.info(f'Deleting {len(l)} old policies')
-
-    def get_orphaned_channels(self):
-        ids = set(x[1] for x in self._policies.keys())
-        return list(x for x in self._channels.keys() if x not in ids)
-
-    def prune_orphaned_channels(self):
-        l = self.get_orphaned_channels()
-        if l:
-            for short_channel_id in l:
-                self.remove_channel(short_channel_id)
-            self.update_counts()
-            self.logger.info(f'Deleting {len(l)} orphaned channels')
-
-    def add_channel_update_for_private_channel(self, msg_payload: dict, start_node_id: bytes):
-        if not verify_sig_for_channel_update(msg_payload, start_node_id):
-            return  # ignore
-        short_channel_id = ShortChannelID(msg_payload['short_channel_id'])
-        msg_payload['start_node'] = start_node_id
-        self._channel_updates_for_private_channels[(start_node_id, short_channel_id)] = msg_payload
-
-    def remove_channel(self, short_channel_id: ShortChannelID):
-        channel_info = self._channels.pop(short_channel_id, None)
-        if channel_info:
-            self._channels_for_node[channel_info.node1_id].remove(channel_info.short_channel_id)
-            self._channels_for_node[channel_info.node2_id].remove(channel_info.short_channel_id)
-        # delete from database
-        self.delete_channel(short_channel_id)
-
-    def get_node_addresses(self, node_id):
-        return self._addresses.get(node_id)
-
-    @sql
-    @profiler
-    def load_data(self):
-        c = self.conn.cursor()
-        c.execute("""SELECT * FROM address""")
-        for x in c:
-            node_id, host, port, timestamp = x
-            self._addresses[node_id].add((str(host), int(port), int(timestamp or 0)))
-        c.execute("""SELECT * FROM channel_info""")
-        for x in c:
-            x = (ShortChannelID.normalize(x[0]), *x[1:])
-            ci = ChannelInfo(*x)
-            self._channels[ci.short_channel_id] = ci
-        c.execute("""SELECT * FROM node_info""")
-        for x in c:
-            ni = NodeInfo(*x)
-            self._nodes[ni.node_id] = ni
-        c.execute("""SELECT * FROM policy""")
-        for x in c:
-            p = Policy(*x)
-            self._policies[(p.start_node, p.short_channel_id)] = p
-        for channel_info in self._channels.values():
-            self._channels_for_node[channel_info.node1_id].add(channel_info.short_channel_id)
-            self._channels_for_node[channel_info.node2_id].add(channel_info.short_channel_id)
-        self.logger.info(f'load data {len(self._channels)} {len(self._policies)} {len(self._channels_for_node)}')
-        self.update_counts()
-        self.count_incomplete_channels()
-        self.data_loaded.set()
-
-    def count_incomplete_channels(self):
-        out = set()
-        for short_channel_id, ci in self._channels.items():
-            p1 = self.get_policy_for_node(short_channel_id, ci.node1_id)
-            p2 = self.get_policy_for_node(short_channel_id, ci.node2_id)
-            if p1 is None or p2 is not None:
-                out.add(short_channel_id)
-        self.logger.info(f'semi-orphaned: {len(out)}')
-
-    def get_policy_for_node(self, short_channel_id: bytes, node_id: bytes, *,
-                            my_channels: Dict[ShortChannelID, 'Channel'] = None) -> Optional['Policy']:
-        channel_info = self.get_channel_info(short_channel_id)
-        if channel_info is not None:  # publicly announced channel
-            policy = self._policies.get((node_id, short_channel_id))
-            if policy:
-                return policy
-        else:  # private channel
-            chan_upd_dict = self._channel_updates_for_private_channels.get((node_id, short_channel_id))
-            if chan_upd_dict:
-                return Policy.from_msg(chan_upd_dict)
-        # check if it's one of our own channels
-        if not my_channels:
-            return
-        chan = my_channels.get(short_channel_id)  # type: Optional[Channel]
-        if not chan:
-            return
-        if node_id == chan.node_id:  # incoming direction (to us)
-            remote_update_raw = chan.get_remote_update()
-            if not remote_update_raw:
-                return
-            now = int(time.time())
-            remote_update_decoded = decode_msg(remote_update_raw)[1]
-            remote_update_decoded['timestamp'] = now.to_bytes(4, byteorder="big")
-            remote_update_decoded['start_node'] = node_id
-            return Policy.from_msg(remote_update_decoded)
-        elif node_id == chan.get_local_pubkey():  # outgoing direction (from us)
-            local_update_decoded = decode_msg(chan.get_outgoing_gossip_channel_update())[1]
-            local_update_decoded['start_node'] = node_id
-            return Policy.from_msg(local_update_decoded)
-
-    def get_channel_info(self, short_channel_id: bytes, *,
-                         my_channels: Dict[ShortChannelID, 'Channel'] = None) -> Optional[ChannelInfo]:
-        ret = self._channels.get(short_channel_id)
-        if ret:
-            return ret
-        # check if it's one of our own channels
-        if not my_channels:
-            return
-        chan = my_channels.get(short_channel_id)  # type: Optional[Channel]
-        ci = ChannelInfo.from_raw_msg(chan.construct_channel_announcement_without_sigs())
-        return ci._replace(capacity_sat=chan.constraints.capacity)
-
-    def get_channels_for_node(self, node_id: bytes, *,
-                              my_channels: Dict[ShortChannelID, 'Channel'] = None) -> Set[bytes]:
-        """Returns the set of short channel IDs where node_id is one of the channel participants."""
-        relevant_channels = self._channels_for_node.get(node_id) or set()
-        relevant_channels = set(relevant_channels)  # copy
-        # add our own channels  # TODO maybe slow?
-        for chan in (my_channels.values() or []):
-            if node_id in (chan.node_id, chan.get_local_pubkey()):
-                relevant_channels.add(chan.short_channel_id)
-        return relevant_channels

electrum/coinchooser.py

@@ -1,490 +0,0 @@
-#!/usr/bin/env python
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2015 kyuupichan@gmail
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-from collections import defaultdict
-from math import floor, log10
-from typing import NamedTuple, List, Callable, Sequence, Union, Dict, Tuple
-from decimal import Decimal
-
-from .bitcoin import sha256, COIN, is_address
-from .transaction import Transaction, TxOutput, PartialTransaction, PartialTxInput, PartialTxOutput
-from .util import NotEnoughFunds
-from .logging import Logger
-
-
-# A simple deterministic PRNG.  Used to deterministically shuffle a
-# set of coins - the same set of coins should produce the same output.
-# Although choosing UTXOs "randomly" we want it to be deterministic,
-# so if sending twice from the same UTXO set we choose the same UTXOs
-# to spend.  This prevents attacks on users by malicious or stale
-# servers.
-class PRNG:
-    def __init__(self, seed):
-        self.sha = sha256(seed)
-        self.pool = bytearray()
-
-    def get_bytes(self, n):
-        while len(self.pool) < n:
-            self.pool.extend(self.sha)
-            self.sha = sha256(self.sha)
-        result, self.pool = self.pool[:n], self.pool[n:]
-        return result
-
-    def randint(self, start, end):
-        # Returns random integer in [start, end)
-        n = end - start
-        r = 0
-        p = 1
-        while p < n:
-            r = self.get_bytes(1)[0] + (r << 8)
-            p = p << 8
-        return start + (r % n)
-
-    def choice(self, seq):
-        return seq[self.randint(0, len(seq))]
-
-    def shuffle(self, x):
-        for i in reversed(range(1, len(x))):
-            # pick an element in x[:i+1] with which to exchange x[i]
-            j = self.randint(0, i+1)
-            x[i], x[j] = x[j], x[i]
-
-
-class Bucket(NamedTuple):
-    desc: str
-    weight: int                   # as in BIP-141
-    value: int                    # in satoshis
-    effective_value: int          # estimate of value left after subtracting fees. in satoshis
-    coins: List[PartialTxInput]   # UTXOs
-    min_height: int               # min block height where a coin was confirmed
-    witness: bool                 # whether any coin uses segwit
-
-
-class ScoredCandidate(NamedTuple):
-    penalty: float
-    tx: PartialTransaction
-    buckets: List[Bucket]
-
-
-def strip_unneeded(bkts: List[Bucket], sufficient_funds) -> List[Bucket]:
-    '''Remove buckets that are unnecessary in achieving the spend amount'''
-    if sufficient_funds([], bucket_value_sum=0):
-        # none of the buckets are needed
-        return []
-    bkts = sorted(bkts, key=lambda bkt: bkt.value, reverse=True)
-    bucket_value_sum = 0
-    for i in range(len(bkts)):
-        bucket_value_sum += (bkts[i]).value
-        if sufficient_funds(bkts[:i+1], bucket_value_sum=bucket_value_sum):
-            return bkts[:i+1]
-    raise Exception("keeping all buckets is still not enough")
-
-
-class CoinChooserBase(Logger):
-
-    enable_output_value_rounding = False
-
-    def __init__(self):
-        Logger.__init__(self)
-
-    def keys(self, coins: Sequence[PartialTxInput]) -> Sequence[str]:
-        raise NotImplementedError
-
-    def bucketize_coins(self, coins: Sequence[PartialTxInput], *, fee_estimator_vb):
-        keys = self.keys(coins)
-        buckets = defaultdict(list)  # type: Dict[str, List[PartialTxInput]]
-        for key, coin in zip(keys, coins):
-            buckets[key].append(coin)
-        # fee_estimator returns fee to be paid, for given vbytes.
-        # guess whether it is just returning a constant as follows.
-        constant_fee = fee_estimator_vb(2000) == fee_estimator_vb(200)
-
-        def make_Bucket(desc: str, coins: List[PartialTxInput]):
-            witness = any(Transaction.is_segwit_input(coin, guess_for_address=True) for coin in coins)
-            # note that we're guessing whether the tx uses segwit based
-            # on this single bucket
-            weight = sum(Transaction.estimated_input_weight(coin, witness)
-                         for coin in coins)
-            value = sum(coin.value_sats() for coin in coins)
-            min_height = min(coin.block_height for coin in coins)
-            assert min_height is not None
-            # the fee estimator is typically either a constant or a linear function,
-            # so the "function:" effective_value(bucket) will be homomorphic for addition
-            # i.e. effective_value(b1) + effective_value(b2) = effective_value(b1 + b2)
-            if constant_fee:
-                effective_value = value
-            else:
-                # when converting from weight to vBytes, instead of rounding up,
-                # keep fractional part, to avoid overestimating fee
-                fee = fee_estimator_vb(Decimal(weight) / 4)
-                effective_value = value - fee
-            return Bucket(desc=desc,
-                          weight=weight,
-                          value=value,
-                          effective_value=effective_value,
-                          coins=coins,
-                          min_height=min_height,
-                          witness=witness)
-
-        return list(map(make_Bucket, buckets.keys(), buckets.values()))
-
-    def penalty_func(self, base_tx, *,
-                     tx_from_buckets: Callable[[List[Bucket]], Tuple[PartialTransaction, List[PartialTxOutput]]]) \
-            -> Callable[[List[Bucket]], ScoredCandidate]:
-        raise NotImplementedError
-
-    def _change_amounts(self, tx: PartialTransaction, count: int, fee_estimator_numchange) -> List[int]:
-        # Break change up if bigger than max_change
-        output_amounts = [o.value for o in tx.outputs()]
-        # Don't split change of less than 0.02 BTC
-        max_change = max(max(output_amounts) * 1.25, 0.02 * COIN)
-
-        # Use N change outputs
-        for n in range(1, count + 1):
-            # How much is left if we add this many change outputs?
-            change_amount = max(0, tx.get_fee() - fee_estimator_numchange(n))
-            if change_amount // n <= max_change:
-                break
-
-        # Get a handle on the precision of the output amounts; round our
-        # change to look similar
-        def trailing_zeroes(val):
-            s = str(val)
-            return len(s) - len(s.rstrip('0'))
-
-        zeroes = [trailing_zeroes(i) for i in output_amounts]
-        min_zeroes = min(zeroes)
-        max_zeroes = max(zeroes)
-
-        if n > 1:
-            zeroes = range(max(0, min_zeroes - 1), (max_zeroes + 1) + 1)
-        else:
-            # if there is only one change output, this will ensure that we aim
-            # to have one that is exactly as precise as the most precise output
-            zeroes = [min_zeroes]
-
-        # Calculate change; randomize it a bit if using more than 1 output
-        remaining = change_amount
-        amounts = []
-        while n > 1:
-            average = remaining / n
-            amount = self.p.randint(int(average * 0.7), int(average * 1.3))
-            precision = min(self.p.choice(zeroes), int(floor(log10(amount))))
-            amount = int(round(amount, -precision))
-            amounts.append(amount)
-            remaining -= amount
-            n -= 1
-
-        # Last change output.  Round down to maximum precision but lose
-        # no more than 10**max_dp_to_round_for_privacy
-        # e.g. a max of 2 decimal places means losing 100 satoshis to fees
-        max_dp_to_round_for_privacy = 2 if self.enable_output_value_rounding else 0
-        N = int(pow(10, min(max_dp_to_round_for_privacy, zeroes[0])))
-        amount = (remaining // N) * N
-        amounts.append(amount)
-
-        assert sum(amounts) <= change_amount
-
-        return amounts
-
-    def _change_outputs(self, tx: PartialTransaction, change_addrs, fee_estimator_numchange,
-                        dust_threshold) -> List[PartialTxOutput]:
-        amounts = self._change_amounts(tx, len(change_addrs), fee_estimator_numchange)
-        assert min(amounts) >= 0
-        assert len(change_addrs) >= len(amounts)
-        assert all([isinstance(amt, int) for amt in amounts])
-        # If change is above dust threshold after accounting for the
-        # size of the change output, add it to the transaction.
-        amounts = [amount for amount in amounts if amount >= dust_threshold]
-        change = [PartialTxOutput.from_address_and_value(addr, amount)
-                  for addr, amount in zip(change_addrs, amounts)]
-        return change
-
-    def _construct_tx_from_selected_buckets(self, *, buckets: Sequence[Bucket],
-                                            base_tx: PartialTransaction, change_addrs,
-                                            fee_estimator_w, dust_threshold,
-                                            base_weight) -> Tuple[PartialTransaction, List[PartialTxOutput]]:
-        # make a copy of base_tx so it won't get mutated
-        tx = PartialTransaction.from_io(base_tx.inputs()[:], base_tx.outputs()[:])
-
-        tx.add_inputs([coin for b in buckets for coin in b.coins])
-        tx_weight = self._get_tx_weight(buckets, base_weight=base_weight)
-
-        # change is sent back to sending address unless specified
-        if not change_addrs:
-            change_addrs = [tx.inputs()[0].address]
-            # note: this is not necessarily the final "first input address"
-            # because the inputs had not been sorted at this point
-            assert is_address(change_addrs[0])
-
-        # This takes a count of change outputs and returns a tx fee
-        output_weight = 4 * Transaction.estimated_output_size(change_addrs[0])
-        fee_estimator_numchange = lambda count: fee_estimator_w(tx_weight + count * output_weight)
-        change = self._change_outputs(tx, change_addrs, fee_estimator_numchange, dust_threshold)
-        tx.add_outputs(change)
-
-        return tx, change
-
-    def _get_tx_weight(self, buckets: Sequence[Bucket], *, base_weight: int) -> int:
-        """Given a collection of buckets, return the total weight of the
-        resulting transaction.
-        base_weight is the weight of the tx that includes the fixed (non-change)
-        outputs and potentially some fixed inputs. Note that the change outputs
-        at this point are not yet known so they are NOT accounted for.
-        """
-        total_weight = base_weight + sum(bucket.weight for bucket in buckets)
-        is_segwit_tx = any(bucket.witness for bucket in buckets)
-        if is_segwit_tx:
-            total_weight += 2  # marker and flag
-            # non-segwit inputs were previously assumed to have
-            # a witness of '' instead of '00' (hex)
-            # note that mixed legacy/segwit buckets are already ok
-            num_legacy_inputs = sum((not bucket.witness) * len(bucket.coins)
-                                    for bucket in buckets)
-            total_weight += num_legacy_inputs
-
-        return total_weight
-
-    def make_tx(self, *, coins: Sequence[PartialTxInput], inputs: List[PartialTxInput],
-                outputs: List[PartialTxOutput], change_addrs: Sequence[str],
-                fee_estimator_vb: Callable, dust_threshold: int) -> PartialTransaction:
-        """Select unspent coins to spend to pay outputs.  If the change is
-        greater than dust_threshold (after adding the change output to
-        the transaction) it is kept, otherwise none is sent and it is
-        added to the transaction fee.
-
-        `inputs` and `outputs` are guaranteed to be a subset of the
-        inputs and outputs of the resulting transaction.
-        `coins` are further UTXOs we can choose from.
-
-        Note: fee_estimator_vb expects virtual bytes
-        """
-        assert outputs, 'tx outputs cannot be empty'
-
-        # Deterministic randomness from coins
-        utxos = [c.prevout.serialize_to_network() for c in coins]
-        self.p = PRNG(b''.join(sorted(utxos)))
-
-        # Copy the outputs so when adding change we don't modify "outputs"
-        base_tx = PartialTransaction.from_io(inputs[:], outputs[:])
-        input_value = base_tx.input_value()
-
-        # Weight of the transaction with no inputs and no change
-        # Note: this will use legacy tx serialization as the need for "segwit"
-        # would be detected from inputs. The only side effect should be that the
-        # marker and flag are excluded, which is compensated in get_tx_weight()
-        # FIXME calculation will be off by this (2 wu) in case of RBF batching
-        base_weight = base_tx.estimated_weight()
-        spent_amount = base_tx.output_value()
-
-        def fee_estimator_w(weight):
-            return fee_estimator_vb(Transaction.virtual_size_from_weight(weight))
-
-        def sufficient_funds(buckets, *, bucket_value_sum):
-            '''Given a list of buckets, return True if it has enough
-            value to pay for the transaction'''
-            # assert bucket_value_sum == sum(bucket.value for bucket in buckets)  # expensive!
-            total_input = input_value + bucket_value_sum
-            if total_input < spent_amount:  # shortcut for performance
-                return False
-            # note re performance: so far this was constant time
-            # what follows is linear in len(buckets)
-            total_weight = self._get_tx_weight(buckets, base_weight=base_weight)
-            return total_input >= spent_amount + fee_estimator_w(total_weight)
-
-        def tx_from_buckets(buckets):
-            return self._construct_tx_from_selected_buckets(buckets=buckets,
-                                                            base_tx=base_tx,
-                                                            change_addrs=change_addrs,
-                                                            fee_estimator_w=fee_estimator_w,
-                                                            dust_threshold=dust_threshold,
-                                                            base_weight=base_weight)
-
-        # Collect the coins into buckets
-        all_buckets = self.bucketize_coins(coins, fee_estimator_vb=fee_estimator_vb)
-        # Filter some buckets out. Only keep those that have positive effective value.
-        # Note that this filtering is intentionally done on the bucket level
-        # instead of per-coin, as each bucket should be either fully spent or not at all.
-        # (e.g. CoinChooserPrivacy ensures that same-address coins go into one bucket)
-        all_buckets = list(filter(lambda b: b.effective_value > 0, all_buckets))
-        # Choose a subset of the buckets
-        scored_candidate = self.choose_buckets(all_buckets, sufficient_funds,
-                                               self.penalty_func(base_tx, tx_from_buckets=tx_from_buckets))
-        tx = scored_candidate.tx
-
-        self.logger.info(f"using {len(tx.inputs())} inputs")
-        self.logger.info(f"using buckets: {[bucket.desc for bucket in scored_candidate.buckets]}")
-
-        return tx
-
-    def choose_buckets(self, buckets: List[Bucket],
-                       sufficient_funds: Callable,
-                       penalty_func: Callable[[List[Bucket]], ScoredCandidate]) -> ScoredCandidate:
-        raise NotImplemented('To be subclassed')
-
-
-class CoinChooserRandom(CoinChooserBase):
-
-    def bucket_candidates_any(self, buckets: List[Bucket], sufficient_funds) -> List[List[Bucket]]:
-        '''Returns a list of bucket sets.'''
-        if not buckets:
-            if sufficient_funds([], bucket_value_sum=0):
-                return [[]]
-            else:
-                raise NotEnoughFunds()
-
-        candidates = set()
-
-        # Add all singletons
-        for n, bucket in enumerate(buckets):
-            if sufficient_funds([bucket], bucket_value_sum=bucket.value):
-                candidates.add((n, ))
-
-        # And now some random ones
-        attempts = min(100, (len(buckets) - 1) * 10 + 1)
-        permutation = list(range(len(buckets)))
-        for i in range(attempts):
-            # Get a random permutation of the buckets, and
-            # incrementally combine buckets until sufficient
-            self.p.shuffle(permutation)
-            bkts = []
-            bucket_value_sum = 0
-            for count, index in enumerate(permutation):
-                bucket = buckets[index]
-                bkts.append(bucket)
-                bucket_value_sum += bucket.value
-                if sufficient_funds(bkts, bucket_value_sum=bucket_value_sum):
-                    candidates.add(tuple(sorted(permutation[:count + 1])))
-                    break
-            else:
-                # note: this assumes that the effective value of any bkt is >= 0
-                raise NotEnoughFunds()
-
-        candidates = [[buckets[n] for n in c] for c in candidates]
-        return [strip_unneeded(c, sufficient_funds) for c in candidates]
-
-    def bucket_candidates_prefer_confirmed(self, buckets: List[Bucket],
-                                           sufficient_funds) -> List[List[Bucket]]:
-        """Returns a list of bucket sets preferring confirmed coins.
-
-        Any bucket can be:
-        1. "confirmed" if it only contains confirmed coins; else
-        2. "unconfirmed" if it does not contain coins with unconfirmed parents
-        3. other: e.g. "unconfirmed parent" or "local"
-
-        This method tries to only use buckets of type 1, and if the coins there
-        are not enough, tries to use the next type but while also selecting
-        all buckets of all previous types.
-        """
-        conf_buckets = [bkt for bkt in buckets if bkt.min_height > 0]
-        unconf_buckets = [bkt for bkt in buckets if bkt.min_height == 0]
-        other_buckets = [bkt for bkt in buckets if bkt.min_height < 0]
-
-        bucket_sets = [conf_buckets, unconf_buckets, other_buckets]
-        already_selected_buckets = []
-        already_selected_buckets_value_sum = 0
-
-        for bkts_choose_from in bucket_sets:
-            try:
-                def sfunds(bkts, *, bucket_value_sum):
-                    bucket_value_sum += already_selected_buckets_value_sum
-                    return sufficient_funds(already_selected_buckets + bkts,
-                                            bucket_value_sum=bucket_value_sum)
-
-                candidates = self.bucket_candidates_any(bkts_choose_from, sfunds)
-                break
-            except NotEnoughFunds:
-                already_selected_buckets += bkts_choose_from
-                already_selected_buckets_value_sum += sum(bucket.value for bucket in bkts_choose_from)
-        else:
-            raise NotEnoughFunds()
-
-        candidates = [(already_selected_buckets + c) for c in candidates]
-        return [strip_unneeded(c, sufficient_funds) for c in candidates]
-
-    def choose_buckets(self, buckets, sufficient_funds, penalty_func):
-        candidates = self.bucket_candidates_prefer_confirmed(buckets, sufficient_funds)
-        scored_candidates = [penalty_func(cand) for cand in candidates]
-        winner = min(scored_candidates, key=lambda x: x.penalty)
-        self.logger.info(f"Total number of buckets: {len(buckets)}")
-        self.logger.info(f"Num candidates considered: {len(candidates)}. "
-                         f"Winning penalty: {winner.penalty}")
-        return winner
-
-
-class CoinChooserPrivacy(CoinChooserRandom):
-    """Attempts to better preserve user privacy.
-    First, if any coin is spent from a user address, all coins are.
-    Compared to spending from other addresses to make up an amount, this reduces
-    information leakage about sender holdings.  It also helps to
-    reduce blockchain UTXO bloat, and reduce future privacy loss that
-    would come from reusing that address' remaining UTXOs.
-    Second, it penalizes change that is quite different to the sent amount.
-    Third, it penalizes change that is too big.
-    """
-
-    def keys(self, coins):
-        return [coin.scriptpubkey.hex() for coin in coins]
-
-    def penalty_func(self, base_tx, *, tx_from_buckets):
-        min_change = min(o.value for o in base_tx.outputs()) * 0.75
-        max_change = max(o.value for o in base_tx.outputs()) * 1.33
-
-        def penalty(buckets: List[Bucket]) -> ScoredCandidate:
-            # Penalize using many buckets (~inputs)
-            badness = len(buckets) - 1
-            tx, change_outputs = tx_from_buckets(buckets)
-            change = sum(o.value for o in change_outputs)
-            # Penalize change not roughly in output range
-            if change == 0:
-                pass  # no change is great!
-            elif change < min_change:
-                badness += (min_change - change) / (min_change + 10000)
-                # Penalize really small change; under 1 mBTC ~= using 1 more input
-                if change < COIN / 1000:
-                    badness += 1
-            elif change > max_change:
-                badness += (change - max_change) / (max_change + 10000)
-                # Penalize large change; 5 BTC excess ~= using 1 more input
-                badness += change / (COIN * 5)
-            return ScoredCandidate(badness, tx, buckets)
-
-        return penalty
-
-
-COIN_CHOOSERS = {
-    'Privacy': CoinChooserPrivacy,
-}
-
-def get_name(config):
-    kind = config.get('coin_chooser')
-    if not kind in COIN_CHOOSERS:
-        kind = 'Privacy'
-    return kind
-
-def get_coin_chooser(config):
-    klass = COIN_CHOOSERS[get_name(config)]
-    coinchooser = klass()
-    coinchooser.enable_output_value_rounding = config.get('coin_chooser_output_rounding', False)
-    return coinchooser

electrum/crypto.py

@@ -1,218 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2018 The Electrum developers
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import base64
-import os
-import hashlib
-import hmac
-from typing import Union
-
-import pyaes
-
-from .util import assert_bytes, InvalidPassword, to_bytes, to_string, WalletFileException
-from .i18n import _
-
-
-try:
-    from Cryptodome.Cipher import AES
-except:
-    AES = None
-
-
-class InvalidPadding(Exception):
-    pass
-
-
-def append_PKCS7_padding(data: bytes) -> bytes:
-    assert_bytes(data)
-    padlen = 16 - (len(data) % 16)
-    return data + bytes([padlen]) * padlen
-
-
-def strip_PKCS7_padding(data: bytes) -> bytes:
-    assert_bytes(data)
-    if len(data) % 16 != 0 or len(data) == 0:
-        raise InvalidPadding("invalid length")
-    padlen = data[-1]
-    if not (0 < padlen <= 16):
-        raise InvalidPadding("invalid padding byte (out of range)")
-    for i in data[-padlen:]:
-        if i != padlen:
-            raise InvalidPadding("invalid padding byte (inconsistent)")
-    return data[0:-padlen]
-
-
-def aes_encrypt_with_iv(key: bytes, iv: bytes, data: bytes) -> bytes:
-    assert_bytes(key, iv, data)
-    data = append_PKCS7_padding(data)
-    if AES:
-        e = AES.new(key, AES.MODE_CBC, iv).encrypt(data)
-    else:
-        aes_cbc = pyaes.AESModeOfOperationCBC(key, iv=iv)
-        aes = pyaes.Encrypter(aes_cbc, padding=pyaes.PADDING_NONE)
-        e = aes.feed(data) + aes.feed()  # empty aes.feed() flushes buffer
-    return e
-
-
-def aes_decrypt_with_iv(key: bytes, iv: bytes, data: bytes) -> bytes:
-    assert_bytes(key, iv, data)
-    if AES:
-        cipher = AES.new(key, AES.MODE_CBC, iv)
-        data = cipher.decrypt(data)
-    else:
-        aes_cbc = pyaes.AESModeOfOperationCBC(key, iv=iv)
-        aes = pyaes.Decrypter(aes_cbc, padding=pyaes.PADDING_NONE)
-        data = aes.feed(data) + aes.feed()  # empty aes.feed() flushes buffer
-    try:
-        return strip_PKCS7_padding(data)
-    except InvalidPadding:
-        raise InvalidPassword()
-
-
-def EncodeAES_base64(secret: bytes, msg: bytes) -> bytes:
-    """Returns base64 encoded ciphertext."""
-    e = EncodeAES_bytes(secret, msg)
-    return base64.b64encode(e)
-
-
-def EncodeAES_bytes(secret: bytes, msg: bytes) -> bytes:
-    assert_bytes(msg)
-    iv = bytes(os.urandom(16))
-    ct = aes_encrypt_with_iv(secret, iv, msg)
-    return iv + ct
-
-
-def DecodeAES_base64(secret: bytes, ciphertext_b64: Union[bytes, str]) -> bytes:
-    ciphertext = bytes(base64.b64decode(ciphertext_b64))
-    return DecodeAES_bytes(secret, ciphertext)
-
-
-def DecodeAES_bytes(secret: bytes, ciphertext: bytes) -> bytes:
-    assert_bytes(ciphertext)
-    iv, e = ciphertext[:16], ciphertext[16:]
-    s = aes_decrypt_with_iv(secret, iv, e)
-    return s
-
-
-PW_HASH_VERSION_LATEST = 1
-KNOWN_PW_HASH_VERSIONS = (1, 2, )
-SUPPORTED_PW_HASH_VERSIONS = (1, )
-assert PW_HASH_VERSION_LATEST in KNOWN_PW_HASH_VERSIONS
-assert PW_HASH_VERSION_LATEST in SUPPORTED_PW_HASH_VERSIONS
-
-
-class UnexpectedPasswordHashVersion(InvalidPassword, WalletFileException):
-    def __init__(self, version):
-        self.version = version
-
-    def __str__(self):
-        return "{unexpected}: {version}\n{instruction}".format(
-            unexpected=_("Unexpected password hash version"),
-            version=self.version,
-            instruction=_('You are most likely using an outdated version of Electrum. Please update.'))
-
-
-class UnsupportedPasswordHashVersion(InvalidPassword, WalletFileException):
-    def __init__(self, version):
-        self.version = version
-
-    def __str__(self):
-        return "{unsupported}: {version}\n{instruction}".format(
-            unsupported=_("Unsupported password hash version"),
-            version=self.version,
-            instruction=f"To open this wallet, try 'git checkout password_v{self.version}'.\n"
-                        "Alternatively, restore from seed.")
-
-
-def _hash_password(password: Union[bytes, str], *, version: int) -> bytes:
-    pw = to_bytes(password, 'utf8')
-    if version not in SUPPORTED_PW_HASH_VERSIONS:
-        raise UnsupportedPasswordHashVersion(version)
-    if version == 1:
-        return sha256d(pw)
-    else:
-        assert version not in KNOWN_PW_HASH_VERSIONS
-        raise UnexpectedPasswordHashVersion(version)
-
-
-def pw_encode(data: str, password: Union[bytes, str, None], *, version: int) -> str:
-    if not password:
-        return data
-    if version not in KNOWN_PW_HASH_VERSIONS:
-        raise UnexpectedPasswordHashVersion(version)
-    # derive key from password
-    secret = _hash_password(password, version=version)
-    # encrypt given data
-    ciphertext = EncodeAES_bytes(secret, to_bytes(data, "utf8"))
-    ciphertext_b64 = base64.b64encode(ciphertext)
-    return ciphertext_b64.decode('utf8')
-
-
-def pw_decode(data: str, password: Union[bytes, str, None], *, version: int) -> str:
-    if password is None:
-        return data
-    if version not in KNOWN_PW_HASH_VERSIONS:
-        raise UnexpectedPasswordHashVersion(version)
-    data_bytes = bytes(base64.b64decode(data))
-    # derive key from password
-    secret = _hash_password(password, version=version)
-    # decrypt given data
-    try:
-        d = to_string(DecodeAES_bytes(secret, data_bytes), "utf8")
-    except Exception as e:
-        raise InvalidPassword() from e
-    return d
-
-
-def sha256(x: Union[bytes, str]) -> bytes:
-    x = to_bytes(x, 'utf8')
-    return bytes(hashlib.sha256(x).digest())
-
-
-def sha256d(x: Union[bytes, str]) -> bytes:
-    x = to_bytes(x, 'utf8')
-    out = bytes(sha256(sha256(x)))
-    return out
-
-
-def hash_160(x: bytes) -> bytes:
-    return ripemd(sha256(x))
-
-def ripemd(x):
-    try:
-        md = hashlib.new('ripemd160')
-        md.update(x)
-        return md.digest()
-    except BaseException:
-        from . import ripemd
-        md = ripemd.new(x)
-        return md.digest()
-
-def hmac_oneshot(key: bytes, msg: bytes, digest) -> bytes:
-    if hasattr(hmac, 'digest'):
-        # requires python 3.7+; faster
-        return hmac.digest(key, msg, digest)
-    else:
-        return hmac.new(key, msg, digest).digest()

electrum/daemon.py

@@ -1,525 +0,0 @@
-#!/usr/bin/env python
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2015 Thomas Voegtlin
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-import asyncio
-import ast
-import os
-import time
-import traceback
-import sys
-import threading
-from typing import Dict, Optional, Tuple, Iterable
-from base64 import b64decode, b64encode
-from collections import defaultdict
-
-import aiohttp
-from aiohttp import web, client_exceptions
-import jsonrpcclient
-import jsonrpcserver
-from jsonrpcserver import response
-from jsonrpcclient.clients.aiohttp_client import AiohttpClient
-from aiorpcx import TaskGroup
-
-from .network import Network
-from .util import (json_decode, to_bytes, to_string, profiler, standardize_path, constant_time_compare)
-from .util import PR_PAID, PR_EXPIRED, get_request_status
-from .util import log_exceptions, ignore_exceptions, randrange
-from .wallet import Wallet, Abstract_Wallet
-from .storage import WalletStorage
-from .wallet_db import WalletDB
-from .commands import known_commands, Commands
-from .simple_config import SimpleConfig
-from .exchange_rate import FxThread
-from .logging import get_logger, Logger
-
-
-_logger = get_logger(__name__)
-
-
-class DaemonNotRunning(Exception):
-    pass
-
-def get_lockfile(config: SimpleConfig):
-    return os.path.join(config.path, 'daemon')
-
-
-def remove_lockfile(lockfile):
-    os.unlink(lockfile)
-
-
-def get_file_descriptor(config: SimpleConfig):
-    '''Tries to create the lockfile, using O_EXCL to
-    prevent races.  If it succeeds it returns the FD.
-    Otherwise try and connect to the server specified in the lockfile.
-    If this succeeds, the server is returned.  Otherwise remove the
-    lockfile and try again.'''
-    lockfile = get_lockfile(config)
-    while True:
-        try:
-            return os.open(lockfile, os.O_CREAT | os.O_EXCL | os.O_WRONLY, 0o644)
-        except OSError:
-            pass
-        try:
-            request(config, 'ping')
-            return None
-        except DaemonNotRunning:
-            # Couldn't connect; remove lockfile and try again.
-            remove_lockfile(lockfile)
-
-
-
-def request(config: SimpleConfig, endpoint, args=(), timeout=60):
-    lockfile = get_lockfile(config)
-    while True:
-        create_time = None
-        try:
-            with open(lockfile) as f:
-                (host, port), create_time = ast.literal_eval(f.read())
-        except Exception:
-            raise DaemonNotRunning()
-        rpc_user, rpc_password = get_rpc_credentials(config)
-        server_url = 'http://%s:%d' % (host, port)
-        auth = aiohttp.BasicAuth(login=rpc_user, password=rpc_password)
-        loop = asyncio.get_event_loop()
-        async def request_coroutine():
-            async with aiohttp.ClientSession(auth=auth) as session:
-                server = AiohttpClient(session, server_url)
-                f = getattr(server, endpoint)
-                response = await f(*args)
-                return response.data.result
-        try:
-            fut = asyncio.run_coroutine_threadsafe(request_coroutine(), loop)
-            return fut.result(timeout=timeout)
-        except aiohttp.client_exceptions.ClientConnectorError as e:
-            _logger.info(f"failed to connect to JSON-RPC server {e}")
-            if not create_time or create_time < time.time() - 1.0:
-                raise DaemonNotRunning()
-        # Sleep a bit and try again; it might have just been started
-        time.sleep(1.0)
-
-
-def get_rpc_credentials(config: SimpleConfig) -> Tuple[str, str]:
-    rpc_user = config.get('rpcuser', None)
-    rpc_password = config.get('rpcpassword', None)
-    if rpc_user is None or rpc_password is None:
-        rpc_user = 'user'
-        bits = 128
-        nbytes = bits // 8 + (bits % 8 > 0)
-        pw_int = randrange(pow(2, bits))
-        pw_b64 = b64encode(
-            pw_int.to_bytes(nbytes, 'big'), b'-_')
-        rpc_password = to_string(pw_b64, 'ascii')
-        config.set_key('rpcuser', rpc_user)
-        config.set_key('rpcpassword', rpc_password, save=True)
-    elif rpc_password == '':
-        _logger.warning('RPC authentication is disabled.')
-    return rpc_user, rpc_password
-
-
-class WatchTowerServer(Logger):
-
-    def __init__(self, network):
-        Logger.__init__(self)
-        self.config = network.config
-        self.network = network
-        self.lnwatcher = network.local_watchtower
-        self.app = web.Application()
-        self.app.router.add_post("/", self.handle)
-        self.methods = jsonrpcserver.methods.Methods()
-        self.methods.add(self.get_ctn)
-        self.methods.add(self.add_sweep_tx)
-
-    async def handle(self, request):
-        request = await request.text()
-        self.logger.info(f'{request}')
-        response = await jsonrpcserver.async_dispatch(request, methods=self.methods)
-        if response.wanted:
-            return web.json_response(response.deserialized(), status=response.http_status)
-        else:
-            return web.Response()
-
-    async def run(self):
-        host = self.config.get('watchtower_host')
-        port = self.config.get('watchtower_port', 12345)
-        self.runner = web.AppRunner(self.app)
-        await self.runner.setup()
-        site = web.TCPSite(self.runner, host, port, ssl_context=self.config.get_ssl_context())
-        await site.start()
-
-    async def get_ctn(self, *args):
-        return await self.lnwatcher.sweepstore.get_ctn(*args)
-
-    async def add_sweep_tx(self, *args):
-        return await self.lnwatcher.sweepstore.add_sweep_tx(*args)
-
-
-class PayServer(Logger):
-
-    def __init__(self, daemon: 'Daemon'):
-        Logger.__init__(self)
-        self.daemon = daemon
-        self.config = daemon.config
-        self.pending = defaultdict(asyncio.Event)
-        self.daemon.network.register_callback(self.on_payment, ['payment_received'])
-
-    async def on_payment(self, evt, wallet, key, status):
-        if status == PR_PAID:
-            await self.pending[key].set()
-
-    @ignore_exceptions
-    @log_exceptions
-    async def run(self):
-        host = self.config.get('payserver_host', 'localhost')
-        port = self.config.get('payserver_port')
-        root = self.config.get('payserver_root', '/r')
-        app = web.Application()
-        app.add_routes([web.post('/api/create_invoice', self.create_request)])
-        app.add_routes([web.get('/api/get_invoice', self.get_request)])
-        app.add_routes([web.get('/api/get_status', self.get_status)])
-        app.add_routes([web.get('/bip70/{key}.bip70', self.get_bip70_request)])
-        app.add_routes([web.static(root, os.path.join(os.path.dirname(__file__), 'www'))])
-        runner = web.AppRunner(app)
-        await runner.setup()
-        site = web.TCPSite(runner, port=port, host=host, ssl_context=self.config.get_ssl_context())
-        await site.start()
-
-    async def create_request(self, request):
-        params = await request.post()
-        wallet = self.daemon.wallet
-        if 'amount_sat' not in params or not params['amount_sat'].isdigit():
-            raise web.HTTPUnsupportedMediaType()
-        amount = int(params['amount_sat'])
-        message = params['message'] or "donation"
-        payment_hash = await wallet.lnworker._add_invoice_coro(amount, message, 3600)
-        key = payment_hash.hex()
-        raise web.HTTPFound(self.root + '/pay?id=' + key)
-
-    async def get_request(self, r):
-        key = r.query_string
-        request = self.daemon.wallet.get_request(key)
-        return web.json_response(request)
-
-    async def get_bip70_request(self, r):
-        from .paymentrequest import make_request
-        key = r.match_info['key']
-        request = self.daemon.wallet.get_request(key)
-        if not request:
-            return web.HTTPNotFound()
-        pr = make_request(self.config, request)
-        return web.Response(body=pr.SerializeToString(), content_type='application/bitcoin-paymentrequest')
-
-    async def get_status(self, request):
-        ws = web.WebSocketResponse()
-        await ws.prepare(request)
-        key = request.query_string
-        info = self.daemon.wallet.get_request(key)
-        if not info:
-            await ws.send_str('unknown invoice')
-            await ws.close()
-            return ws
-        if info.get('status') == PR_PAID:
-            await ws.send_str(f'paid')
-            await ws.close()
-            return ws
-        if info.get('status') == PR_EXPIRED:
-            await ws.send_str(f'expired')
-            await ws.close()
-            return ws
-        while True:
-            try:
-                await asyncio.wait_for(self.pending[key].wait(), 1)
-                break
-            except asyncio.TimeoutError:
-                # send data on the websocket, to keep it alive
-                await ws.send_str('waiting')
-        await ws.send_str('paid')
-        await ws.close()
-        return ws
-
-
-class AuthenticationError(Exception):
-    pass
-
-class AuthenticationInvalidOrMissing(AuthenticationError):
-    pass
-
-class AuthenticationCredentialsInvalid(AuthenticationError):
-    pass
-
-class Daemon(Logger):
-
-    @profiler
-    def __init__(self, config: SimpleConfig, fd=None, *, listen_jsonrpc=True):
-        Logger.__init__(self)
-        self.auth_lock = asyncio.Lock()
-        self.running = False
-        self.running_lock = threading.Lock()
-        self.config = config
-        if fd is None and listen_jsonrpc:
-            fd = get_file_descriptor(config)
-            if fd is None:
-                raise Exception('failed to lock daemon; already running?')
-        self.asyncio_loop = asyncio.get_event_loop()
-        self.network = None
-        if not config.get('offline'):
-            self.network = Network(config, daemon=self)
-        self.fx = FxThread(config, self.network)
-        self.gui_object = None
-        # path -> wallet;   make sure path is standardized.
-        self._wallets = {}  # type: Dict[str, Abstract_Wallet]
-        daemon_jobs = []
-        # Setup JSONRPC server
-        if listen_jsonrpc:
-            daemon_jobs.append(self.start_jsonrpc(config, fd))
-        # request server
-        self.pay_server = None
-        if not config.get('offline') and self.config.get('run_payserver'):
-            self.pay_server = PayServer(self)
-            daemon_jobs.append(self.pay_server.run())
-        # server-side watchtower
-        self.watchtower = None
-        if not config.get('offline') and self.config.get('run_watchtower'):
-            self.watchtower = WatchTowerServer(self.network)
-            daemon_jobs.append(self.watchtower.run)
-        if self.network:
-            self.network.start(jobs=[self.fx.run])
-
-        self.taskgroup = TaskGroup()
-        asyncio.run_coroutine_threadsafe(self._run(jobs=daemon_jobs), self.asyncio_loop)
-
-    @log_exceptions
-    async def _run(self, jobs: Iterable = None):
-        if jobs is None:
-            jobs = []
-        try:
-            async with self.taskgroup as group:
-                [await group.spawn(job) for job in jobs]
-                await group.spawn(asyncio.Event().wait)  # run forever (until cancel)
-        except BaseException as e:
-            self.logger.exception('daemon.taskgroup died.')
-        finally:
-            self.logger.info("stopping daemon.taskgroup")
-
-    async def authenticate(self, headers):
-        if self.rpc_password == '':
-            # RPC authentication is disabled
-            return
-        auth_string = headers.get('Authorization', None)
-        if auth_string is None:
-            raise AuthenticationInvalidOrMissing('CredentialsMissing')
-        basic, _, encoded = auth_string.partition(' ')
-        if basic != 'Basic':
-            raise AuthenticationInvalidOrMissing('UnsupportedType')
-        encoded = to_bytes(encoded, 'utf8')
-        credentials = to_string(b64decode(encoded), 'utf8')
-        username, _, password = credentials.partition(':')
-        if not (constant_time_compare(username, self.rpc_user)
-                and constant_time_compare(password, self.rpc_password)):
-            await asyncio.sleep(0.050)
-            raise AuthenticationCredentialsInvalid('Invalid Credentials')
-
-    async def handle(self, request):
-        async with self.auth_lock:
-            try:
-                await self.authenticate(request.headers)
-            except AuthenticationInvalidOrMissing:
-                return web.Response(headers={"WWW-Authenticate": "Basic realm=Electrum"},
-                                    text='Unauthorized', status=401)
-            except AuthenticationCredentialsInvalid:
-                return web.Response(text='Forbidden', status=403)
-        request = await request.text()
-        response = await jsonrpcserver.async_dispatch(request, methods=self.methods)
-        if isinstance(response, jsonrpcserver.response.ExceptionResponse):
-            self.logger.error(f"error handling request: {request}", exc_info=response.exc)
-            # this exposes the error message to the client
-            response.message = str(response.exc)
-        if response.wanted:
-            return web.json_response(response.deserialized(), status=response.http_status)
-        else:
-            return web.Response()
-
-    async def start_jsonrpc(self, config: SimpleConfig, fd):
-        self.app = web.Application()
-        self.app.router.add_post("/", self.handle)
-        self.rpc_user, self.rpc_password = get_rpc_credentials(config)
-        self.methods = jsonrpcserver.methods.Methods()
-        self.methods.add(self.ping)
-        self.methods.add(self.gui)
-        self.cmd_runner = Commands(config=self.config, network=self.network, daemon=self)
-        for cmdname in known_commands:
-            self.methods.add(getattr(self.cmd_runner, cmdname))
-        self.methods.add(self.run_cmdline)
-        self.host = config.get('rpchost', '127.0.0.1')
-        self.port = config.get('rpcport', 0)
-        self.runner = web.AppRunner(self.app)
-        await self.runner.setup()
-        site = web.TCPSite(self.runner, self.host, self.port)
-        await site.start()
-        socket = site._server.sockets[0]
-        os.write(fd, bytes(repr((socket.getsockname(), time.time())), 'utf8'))
-        os.close(fd)
-
-    async def ping(self):
-        return True
-
-    async def gui(self, config_options):
-        if self.gui_object:
-            if hasattr(self.gui_object, 'new_window'):
-                path = self.config.get_wallet_path(use_gui_last_wallet=True)
-                self.gui_object.new_window(path, config_options.get('url'))
-                response = "ok"
-            else:
-                response = "error: current GUI does not support multiple windows"
-        else:
-            response = "Error: Electrum is running in daemon mode. Please stop the daemon first."
-        return response
-
-    def load_wallet(self, path, password, *, manual_upgrades=True) -> Optional[Abstract_Wallet]:
-        path = standardize_path(path)
-        # wizard will be launched if we return
-        if path in self._wallets:
-            wallet = self._wallets[path]
-            return wallet
-        storage = WalletStorage(path)
-        if not storage.file_exists():
-            return
-        if storage.is_encrypted():
-            if not password:
-                return
-            storage.decrypt(password)
-        # read data, pass it to db
-        db = WalletDB(storage.read(), manual_upgrades=manual_upgrades)
-        if db.requires_split():
-            return
-        if db.requires_upgrade():
-            return
-        if db.get_action():
-            return
-        wallet = Wallet(db, storage, config=self.config)
-        wallet.start_network(self.network)
-        self._wallets[path] = wallet
-        self.wallet = wallet
-        return wallet
-
-    def add_wallet(self, wallet: Abstract_Wallet) -> None:
-        path = wallet.storage.path
-        path = standardize_path(path)
-        self._wallets[path] = wallet
-
-    def get_wallet(self, path: str) -> Abstract_Wallet:
-        path = standardize_path(path)
-        return self._wallets.get(path)
-
-    def get_wallets(self) -> Dict[str, Abstract_Wallet]:
-        return dict(self._wallets)  # copy
-
-    def delete_wallet(self, path: str) -> bool:
-        self.stop_wallet(path)
-        if os.path.exists(path):
-            os.unlink(path)
-            return True
-        return False
-
-    def stop_wallet(self, path: str) -> bool:
-        """Returns True iff a wallet was found."""
-        path = standardize_path(path)
-        wallet = self._wallets.pop(path, None)
-        if not wallet:
-            return False
-        wallet.stop_threads()
-        return True
-
-    async def run_cmdline(self, config_options):
-        cmdname = config_options['cmd']
-        cmd = known_commands[cmdname]
-        # arguments passed to function
-        args = [config_options.get(x) for x in cmd.params]
-        # decode json arguments
-        args = [json_decode(i) for i in args]
-        # options
-        kwargs = {}
-        for x in cmd.options:
-            kwargs[x] = config_options.get(x)
-        if cmd.requires_wallet:
-            kwargs['wallet_path'] = config_options.get('wallet_path')
-        func = getattr(self.cmd_runner, cmd.name)
-        # fixme: not sure how to retrieve message in jsonrpcclient
-        try:
-            result = await func(*args, **kwargs)
-        except Exception as e:
-            result = {'error':str(e)}
-        return result
-
-    def run_daemon(self):
-        self.running = True
-        try:
-            while self.is_running():
-                time.sleep(0.1)
-        except KeyboardInterrupt:
-            self.running = False
-        self.on_stop()
-
-    def is_running(self):
-        with self.running_lock:
-            return self.running and not self.taskgroup.closed()
-
-    def stop(self):
-        with self.running_lock:
-            self.running = False
-
-    def on_stop(self):
-        if self.gui_object:
-            self.gui_object.stop()
-        # stop network/wallets
-        for k, wallet in self._wallets.items():
-            wallet.stop_threads()
-        if self.network:
-            self.logger.info("shutting down network")
-            self.network.stop()
-        self.logger.info("stopping taskgroup")
-        fut = asyncio.run_coroutine_threadsafe(self.taskgroup.cancel_remaining(), self.asyncio_loop)
-        try:
-            fut.result(timeout=2)
-        except (asyncio.TimeoutError, asyncio.CancelledError):
-            pass
-        self.logger.info("removing lockfile")
-        remove_lockfile(get_lockfile(self.config))
-        self.logger.info("stopped")
-
-    def run_gui(self, config, plugins):
-        threading.current_thread().setName('GUI')
-        gui_name = config.get('gui', 'qt')
-        if gui_name in ['lite', 'classic']:
-            gui_name = 'qt'
-        self.logger.info(f'launching GUI: {gui_name}')
-        try:
-            gui = __import__('electrum.gui.' + gui_name, fromlist=['electrum'])
-            self.gui_object = gui.ElectrumGui(config, self, plugins)
-            self.gui_object.main()
-        except BaseException as e:
-            self.logger.error(f'GUI raised exception: {repr(e)}. shutting down.')
-            raise
-        finally:
-            # app will exit now
-            self.on_stop()

electrum/dns_hacks.py

@@ -1,100 +0,0 @@
-# Copyright (C) 2020 The Electrum developers
-# Distributed under the MIT software license, see the accompanying
-# file LICENCE or http://www.opensource.org/licenses/mit-license.php
-
-import sys
-import socket
-import concurrent
-from concurrent import futures
-import ipaddress
-from typing import Optional
-
-import dns
-import dns.resolver
-
-from .logging import get_logger
-
-
-_logger = get_logger(__name__)
-
-_dns_threads_executor = None  # type: Optional[concurrent.futures.Executor]
-
-
-def configure_dns_depending_on_proxy(is_proxy: bool) -> None:
-    # Store this somewhere so we can un-monkey-patch:
-    if not hasattr(socket, "_getaddrinfo"):
-        socket._getaddrinfo = socket.getaddrinfo
-    if is_proxy:
-        # prevent dns leaks, see http://stackoverflow.com/questions/13184205/dns-over-proxy
-        socket.getaddrinfo = lambda *args: [(socket.AF_INET, socket.SOCK_STREAM, 6, '', (args[0], args[1]))]
-    else:
-        if sys.platform == 'win32':
-            # On Windows, socket.getaddrinfo takes a mutex, and might hold it for up to 10 seconds
-            # when dns-resolving. To speed it up drastically, we resolve dns ourselves, outside that lock.
-            # See https://github.com/spesmilo/electrum/issues/4421
-            _prepare_windows_dns_hack()
-            socket.getaddrinfo = _fast_getaddrinfo
-        else:
-            socket.getaddrinfo = socket._getaddrinfo
-
-
-def _prepare_windows_dns_hack():
-    # enable dns cache
-    resolver = dns.resolver.get_default_resolver()
-    if resolver.cache is None:
-        resolver.cache = dns.resolver.Cache()
-    # prepare threads
-    global _dns_threads_executor
-    if _dns_threads_executor is None:
-        _dns_threads_executor = concurrent.futures.ThreadPoolExecutor(max_workers=20,
-                                                                      thread_name_prefix='dns_resolver')
-
-
-def _fast_getaddrinfo(host, *args, **kwargs):
-    def needs_dns_resolving(host):
-        try:
-            ipaddress.ip_address(host)
-            return False  # already valid IP
-        except ValueError:
-            pass  # not an IP
-        if str(host) in ('localhost', 'localhost.',):
-            return False
-        return True
-
-    def resolve_with_dnspython(host):
-        addrs = []
-        expected_errors = (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer,
-                           concurrent.futures.CancelledError, concurrent.futures.TimeoutError)
-        ipv6_fut = _dns_threads_executor.submit(dns.resolver.query, host, dns.rdatatype.AAAA)
-        ipv4_fut = _dns_threads_executor.submit(dns.resolver.query, host, dns.rdatatype.A)
-        # try IPv6
-        try:
-            answers = ipv6_fut.result()
-            addrs += [str(answer) for answer in answers]
-        except expected_errors as e:
-            pass
-        except BaseException as e:
-            _logger.info(f'dnspython failed to resolve dns (AAAA) for {repr(host)} with error: {repr(e)}')
-        # try IPv4
-        try:
-            answers = ipv4_fut.result()
-            addrs += [str(answer) for answer in answers]
-        except expected_errors as e:
-            # dns failed for some reason, e.g. dns.resolver.NXDOMAIN this is normal.
-            # Simply report back failure; except if we already have some results.
-            if not addrs:
-                raise socket.gaierror(11001, 'getaddrinfo failed') from e
-        except BaseException as e:
-            # Possibly internal error in dnspython :( see #4483 and #5638
-            _logger.info(f'dnspython failed to resolve dns (A) for {repr(host)} with error: {repr(e)}')
-        if addrs:
-            return addrs
-        # Fall back to original socket.getaddrinfo to resolve dns.
-        return [host]
-
-    addrs = [host]
-    if needs_dns_resolving(host):
-        addrs = resolve_with_dnspython(host)
-    list_of_list_of_socketinfos = [socket._getaddrinfo(addr, *args, **kwargs) for addr in addrs]
-    list_of_socketinfos = [item for lst in list_of_list_of_socketinfos for item in lst]
-    return list_of_socketinfos

electrum/ecc.py

@@ -1,523 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Electrum - lightweight Bitcoin client
-# Copyright (C) 2018 The Electrum developers
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-import base64
-import hashlib
-import functools
-from typing import Union, Tuple, Optional
-from ctypes import (
-    byref, c_byte, c_int, c_uint, c_char_p, c_size_t, c_void_p, create_string_buffer,
-    CFUNCTYPE, POINTER, cast
-)
-
-from .util import bfh, bh2u, assert_bytes, to_bytes, InvalidPassword, profiler, randrange
-from .crypto import (sha256d, aes_encrypt_with_iv, aes_decrypt_with_iv, hmac_oneshot)
-from . import constants
-from .logging import get_logger
-from .ecc_fast import _libsecp256k1, SECP256K1_EC_UNCOMPRESSED
-
-_logger = get_logger(__name__)
-
-
-def string_to_number(b: bytes) -> int:
-    return int.from_bytes(b, byteorder='big', signed=False)
-
-
-def sig_string_from_der_sig(der_sig: bytes) -> bytes:
-    r, s = get_r_and_s_from_der_sig(der_sig)
-    return sig_string_from_r_and_s(r, s)
-
-
-def der_sig_from_sig_string(sig_string: bytes) -> bytes:
-    r, s = get_r_and_s_from_sig_string(sig_string)
-    return der_sig_from_r_and_s(r, s)
-
-
-def der_sig_from_r_and_s(r: int, s: int) -> bytes:
-    sig_string = (int.to_bytes(r, length=32, byteorder="big") +
-                  int.to_bytes(s, length=32, byteorder="big"))
-    sig = create_string_buffer(64)
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_parse_compact(_libsecp256k1.ctx, sig, sig_string)
-    if not ret:
-        raise Exception("Bad signature")
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_normalize(_libsecp256k1.ctx, sig, sig)
-    der_sig = create_string_buffer(80)  # this much space should be enough
-    der_sig_size = c_size_t(len(der_sig))
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_serialize_der(_libsecp256k1.ctx, der_sig, byref(der_sig_size), sig)
-    if not ret:
-        raise Exception("failed to serialize DER sig")
-    der_sig_size = der_sig_size.value
-    return bytes(der_sig)[:der_sig_size]
-
-
-def get_r_and_s_from_der_sig(der_sig: bytes) -> Tuple[int, int]:
-    assert isinstance(der_sig, bytes)
-    sig = create_string_buffer(64)
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_parse_der(_libsecp256k1.ctx, sig, der_sig, len(der_sig))
-    if not ret:
-        raise Exception("Bad signature")
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_normalize(_libsecp256k1.ctx, sig, sig)
-    compact_signature = create_string_buffer(64)
-    _libsecp256k1.secp256k1_ecdsa_signature_serialize_compact(_libsecp256k1.ctx, compact_signature, sig)
-    r = int.from_bytes(compact_signature[:32], byteorder="big")
-    s = int.from_bytes(compact_signature[32:], byteorder="big")
-    return r, s
-
-
-def get_r_and_s_from_sig_string(sig_string: bytes) -> Tuple[int, int]:
-    if not (isinstance(sig_string, bytes) and len(sig_string) == 64):
-        raise Exception("sig_string must be bytes, and 64 bytes exactly")
-    sig = create_string_buffer(64)
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_parse_compact(_libsecp256k1.ctx, sig, sig_string)
-    if not ret:
-        raise Exception("Bad signature")
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_normalize(_libsecp256k1.ctx, sig, sig)
-    compact_signature = create_string_buffer(64)
-    _libsecp256k1.secp256k1_ecdsa_signature_serialize_compact(_libsecp256k1.ctx, compact_signature, sig)
-    r = int.from_bytes(compact_signature[:32], byteorder="big")
-    s = int.from_bytes(compact_signature[32:], byteorder="big")
-    return r, s
-
-
-def sig_string_from_r_and_s(r: int, s: int) -> bytes:
-    sig_string = (int.to_bytes(r, length=32, byteorder="big") +
-                  int.to_bytes(s, length=32, byteorder="big"))
-    sig = create_string_buffer(64)
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_parse_compact(_libsecp256k1.ctx, sig, sig_string)
-    if not ret:
-        raise Exception("Bad signature")
-    ret = _libsecp256k1.secp256k1_ecdsa_signature_normalize(_libsecp256k1.ctx, sig, sig)
-    compact_signature = create_string_buffer(64)
-    _libsecp256k1.secp256k1_ecdsa_signature_serialize_compact(_libsecp256k1.ctx, compact_signature, sig)
-    return bytes(compact_signature)
-
-
-def _x_and_y_from_pubkey_bytes(pubkey: bytes) -> Tuple[int, int]:
-    assert isinstance(pubkey, bytes), f'pubkey must be bytes, not {type(pubkey)}'
-    pubkey_ptr = create_string_buffer(64)
-    ret = _libsecp256k1.secp256k1_ec_pubkey_parse(
-        _libsecp256k1.ctx, pubkey_ptr, pubkey, len(pubkey))
-    if not ret:
-        raise InvalidECPointException('public key could not be parsed or is invalid')
-
-    pubkey_serialized = create_string_buffer(65)
-    pubkey_size = c_size_t(65)
-    _libsecp256k1.secp256k1_ec_pubkey_serialize(
-        _libsecp256k1.ctx, pubkey_serialized, byref(pubkey_size), pubkey_ptr, SECP256K1_EC_UNCOMPRESSED)
-    pubkey_serialized = bytes(pubkey_serialized)
-    assert pubkey_serialized[0] == 0x04, pubkey_serialized
-    x = int.from_bytes(pubkey_serialized[1:33], byteorder='big', signed=False)
-    y = int.from_bytes(pubkey_serialized[33:65], byteorder='big', signed=False)
-    return x, y
-
-
-class InvalidECPointException(Exception):
-    """e.g. not on curve, or infinity"""
-
-
-@functools.total_ordering
-class ECPubkey(object):
-
-    def __init__(self, b: Optional[bytes]):
-        if b is not None:
-            assert isinstance(b, (bytes, bytearray)), f'pubkey must be bytes-like, not {type(b)}'
-            if isinstance(b, bytearray):
-                b = bytes(b)
-            self._x, self._y = _x_and_y_from_pubkey_bytes(b)
-        else:
-            self._x, self._y = None, None
-
-    @classmethod
-    def from_sig_string(cls, sig_string: bytes, recid: int, msg_hash: bytes) -> 'ECPubkey':
-        assert_bytes(sig_string)
-        if len(sig_string) != 64:
-            raise Exception(f'wrong encoding used for signature? len={len(sig_string)} (should be 64)')
-        if recid < 0 or recid > 3:
-            raise ValueError('recid is {}, but should be 0 <= recid <= 3'.format(recid))
-        sig65 = create_string_buffer(65)
-        ret = _libsecp256k1.secp256k1_ecdsa_recoverable_signature_parse_compact(
-            _libsecp256k1.ctx, sig65, sig_string, recid)
-        if not ret:
-            raise Exception('failed to parse signature')
-        pubkey = create_string_buffer(64)
-        ret = _libsecp256k1.secp256k1_ecdsa_recover(_libsecp256k1.ctx, pubkey, sig65, msg_hash)
-        if not ret:
-            raise InvalidECPointException('failed to recover public key')
-        return ECPubkey._from_libsecp256k1_pubkey_ptr(pubkey)
-
-    @classmethod
-    def from_signature65(cls, sig: bytes, msg_hash: bytes) -> Tuple['ECPubkey', bool]:
-        if len(sig) != 65:
-            raise Exception(f'wrong encoding used for signature? len={len(sig)} (should be 65)')
-        nV = sig[0]
-        if nV < 27 or nV >= 35:
-            raise Exception("Bad encoding")
-        if nV >= 31:
-            compressed = True
-            nV -= 4
-        else:
-            compressed = False
-        recid = nV - 27
-        return cls.from_sig_string(sig[1:], recid, msg_hash), compressed
-
-    @classmethod
-    def from_x_and_y(cls, x: int, y: int) -> 'ECPubkey':
-        _bytes = (b'\x04'
-                  + int.to_bytes(x, length=32, byteorder='big', signed=False)
-                  + int.to_bytes(y, length=32, byteorder='big', signed=False))
-        return ECPubkey(_bytes)
-
-    def get_public_key_bytes(self, compressed=True):
-        if self.is_at_infinity(): raise Exception('point is at infinity')
-        x = int.to_bytes(self.x(), length=32, byteorder='big', signed=False)
-        y = int.to_bytes(self.y(), length=32, byteorder='big', signed=False)
-        if compressed:
-            header = b'\x03' if self.y() & 1 else b'\x02'
-            return header + x
-        else:
-            header = b'\x04'
-            return header + x + y
-
-    def get_public_key_hex(self, compressed=True):
-        return bh2u(self.get_public_key_bytes(compressed))
-
-    def point(self) -> Tuple[int, int]:
-        return self.x(), self.y()
-
-    def x(self) -> int:
-        return self._x
-
-    def y(self) -> int:
-        return self._y
-
-    def _to_libsecp256k1_pubkey_ptr(self):
-        pubkey = create_string_buffer(64)
-        public_pair_bytes = self.get_public_key_bytes(compressed=False)
-        ret = _libsecp256k1.secp256k1_ec_pubkey_parse(
-            _libsecp256k1.ctx, pubkey, public_pair_bytes, len(public_pair_bytes))
-        if not ret:
-            raise Exception('public key could not be parsed or is invalid')
-        return pubkey
-
-    @classmethod
-    def _from_libsecp256k1_pubkey_ptr(cls, pubkey) -> 'ECPubkey':
-        pubkey_serialized = create_string_buffer(65)
-        pubkey_size = c_size_t(65)
-        _libsecp256k1.secp256k1_ec_pubkey_serialize(
-            _libsecp256k1.ctx, pubkey_serialized, byref(pubkey_size), pubkey, SECP256K1_EC_UNCOMPRESSED)
-        return ECPubkey(bytes(pubkey_serialized))
-
-    def __repr__(self):
-        if self.is_at_infinity():
-            return f"<ECPubkey infinity>"
-        return f"<ECPubkey {self.get_public_key_hex()}>"
-
-    def __mul__(self, other: int):
-        if not isinstance(other, int):
-            raise TypeError('multiplication not defined for ECPubkey and {}'.format(type(other)))
-
-        other %= CURVE_ORDER
-        if self.is_at_infinity() or other == 0:
-            return POINT_AT_INFINITY
-        pubkey = self._to_libsecp256k1_pubkey_ptr()
-
-        ret = _libsecp256k1.secp256k1_ec_pubkey_tweak_mul(_libsecp256k1.ctx, pubkey, other.to_bytes(32, byteorder="big"))
-        if not ret:
-            return POINT_AT_INFINITY
-        return ECPubkey._from_libsecp256k1_pubkey_ptr(pubkey)
-
-    def __rmul__(self, other: int):
-        return self * other
-
-    def __add__(self, other):
-        if not isinstance(other, ECPubkey):
-            raise TypeError('addition not defined for ECPubkey and {}'.format(type(other)))
-        if self.is_at_infinity(): return other
-        if other.is_at_infinity(): return self
-
-        pubkey1 = self._to_libsecp256k1_pubkey_ptr()
-        pubkey2 = other._to_libsecp256k1_pubkey_ptr()
-        pubkey_sum = create_string_buffer(64)
-
-        pubkey1 = cast(pubkey1, c_char_p)
-        pubkey2 = cast(pubkey2, c_char_p)
-        array_of_pubkey_ptrs = (c_char_p * 2)(pubkey1, pubkey2)
-        ret = _libsecp256k1.secp256k1_ec_pubkey_combine(_libsecp256k1.ctx, pubkey_sum, array_of_pubkey_ptrs, 2)
-        if not ret:
-            return POINT_AT_INFINITY
-        return ECPubkey._from_libsecp256k1_pubkey_ptr(pubkey_sum)
-
-    def __eq__(self, other) -> bool:
-        if not isinstance(other, ECPubkey):
-            return False
-        return self.point() == other.point()
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __hash__(self):
-        return hash(self.point())
-
-    def __lt__(self, other):
-        if not isinstance(other, ECPubkey):
-            raise TypeError('comparison not defined for ECPubkey and {}'.format(type(other)))
-        return (self.x() or 0) < (other.x() or 0)
-
-    def verify_message_for_address(self, sig65: bytes, message: bytes, algo=lambda x: sha256d(msg_magic(x))) -> None:
-        assert_bytes(message)
-        h = algo(message)
-        public_key, compressed = self.from_signature65(sig65, h)
-        # check public key
-        if public_key != self:
-            raise Exception("Bad signature")
-        # check message
-        self.verify_message_hash(sig65[1:], h)
-
-    # TODO return bool instead of raising
-    def verify_message_hash(self, sig_string: bytes, msg_hash: bytes) -> None:
-        assert_bytes(sig_string)
-        if len(sig_string) != 64:
-            raise Exception(f'wrong encoding used for signature? len={len(sig_string)} (should be 64)')
-        if not (isinstance(msg_hash, bytes) and len(msg_hash) == 32):
-            raise Exception("msg_hash must be bytes, and 32 bytes exactly")
-
-        sig = create_string_buffer(64)
-        ret = _libsecp256k1.secp256k1_ecdsa_signature_parse_compact(_libsecp256k1.ctx, sig, sig_string)
-        if not ret:
-            raise Exception("Bad signature")
-        ret = _libsecp256k1.secp256k1_ecdsa_signature_normalize(_libsecp256k1.ctx, sig, sig)
-
-        pubkey = self._to_libsecp256k1_pubkey_ptr()
-        if 1 != _libsecp256k1.secp256k1_ecdsa_verify(_libsecp256k1.ctx, sig, msg_hash, pubkey):
-            raise Exception("Bad signature")
-
-    def encrypt_message(self, message: bytes, magic: bytes = b'BIE1') -> bytes:
-        """
-        ECIES encryption/decryption methods; AES-128-CBC with PKCS7 is used as the cipher; hmac-sha256 is used as the mac
-        """
-        assert_bytes(message)
-
-        ephemeral = ECPrivkey.generate_random_key()
-        ecdh_key = (self * ephemeral.secret_scalar).get_public_key_bytes(compressed=True)
-        key = hashlib.sha512(ecdh_key).digest()
-        iv, key_e, key_m = key[0:16], key[16:32], key[32:]
-        ciphertext = aes_encrypt_with_iv(key_e, iv, message)
-        ephemeral_pubkey = ephemeral.get_public_key_bytes(compressed=True)
-        encrypted = magic + ephemeral_pubkey + ciphertext
-        mac = hmac_oneshot(key_m, encrypted, hashlib.sha256)
-
-        return base64.b64encode(encrypted + mac)
-
-    @classmethod
-    def order(cls):
-        return CURVE_ORDER
-
-    def is_at_infinity(self):
-        return self == POINT_AT_INFINITY
-
-    @classmethod
-    def is_pubkey_bytes(cls, b: bytes):
-        try:
-            ECPubkey(b)
-            return True
-        except:
-            return False
-
-
-GENERATOR = ECPubkey(bytes.fromhex('0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798'
-                                   '483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8'))
-CURVE_ORDER = 0xFFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFE_BAAEDCE6_AF48A03B_BFD25E8C_D0364141
-POINT_AT_INFINITY = ECPubkey(None)
-
-
-def msg_magic(message: bytes) -> bytes:
-    from .bitcoin import var_int
-    length = bfh(var_int(len(message)))
-    return b"\x18Bitcoin Signed Message:\n" + length + message
-
-
-def verify_signature(pubkey: bytes, sig: bytes, h: bytes) -> bool:
-    try:
-        ECPubkey(pubkey).verify_message_hash(sig, h)
-    except:
-        return False
-    return True
-
-def verify_message_with_address(address: str, sig65: bytes, message: bytes, *, net=None):
-    from .bitcoin import pubkey_to_address
-    assert_bytes(sig65, message)
-    if net is None: net = constants.net
-    try:
-        h = sha256d(msg_magic(message))
-        public_key, compressed = ECPubkey.from_signature65(sig65, h)
-        # check public key using the address
-        pubkey_hex = public_key.get_public_key_hex(compressed)
-        for txin_type in ['p2pkh','p2wpkh','p2wpkh-p2sh']:
-            addr = pubkey_to_address(txin_type, pubkey_hex, net=net)
-            if address == addr:
-                break
-        else:
-            raise Exception("Bad signature")
-        # check message
-        public_key.verify_message_hash(sig65[1:], h)
-        return True
-    except Exception as e:
-        _logger.info(f"Verification error: {repr(e)}")
-        return False
-
-
-def is_secret_within_curve_range(secret: Union[int, bytes]) -> bool:
-    if isinstance(secret, bytes):
-        secret = string_to_number(secret)
-    return 0 < secret < CURVE_ORDER
-
-
-class ECPrivkey(ECPubkey):
-
-    def __init__(self, privkey_bytes: bytes):
-        assert_bytes(privkey_bytes)
-        if len(privkey_bytes) != 32:
-            raise Exception('unexpected size for secret. should be 32 bytes, not {}'.format(len(privkey_bytes)))
-        secret = string_to_number(privkey_bytes)
-        if not is_secret_within_curve_range(secret):
-            raise InvalidECPointException('Invalid secret scalar (not within curve order)')
-        self.secret_scalar = secret
-
-        pubkey = GENERATOR * secret
-        super().__init__(pubkey.get_public_key_bytes(compressed=False))
-
-    @classmethod
-    def from_secret_scalar(cls, secret_scalar: int):
-        secret_bytes = int.to_bytes(secret_scalar, length=32, byteorder='big', signed=False)
-        return ECPrivkey(secret_bytes)
-
-    @classmethod
-    def from_arbitrary_size_secret(cls, privkey_bytes: bytes):
-        """This method is only for legacy reasons. Do not introduce new code that uses it.
-        Unlike the default constructor, this method does not require len(privkey_bytes) == 32,
-        and the secret does not need to be within the curve order either.
-        """
-        return ECPrivkey(cls.normalize_secret_bytes(privkey_bytes))
-
-    @classmethod
-    def normalize_secret_bytes(cls, privkey_bytes: bytes) -> bytes:
-        scalar = string_to_number(privkey_bytes) % CURVE_ORDER
-        if scalar == 0:
-            raise Exception('invalid EC private key scalar: zero')
-        privkey_32bytes = int.to_bytes(scalar, length=32, byteorder='big', signed=False)
-        return privkey_32bytes
-
-    def __repr__(self):
-        return f"<ECPrivkey {self.get_public_key_hex()}>"
-
-    @classmethod
-    def generate_random_key(cls):
-        randint = randrange(CURVE_ORDER)
-        ephemeral_exponent = int.to_bytes(randint, length=32, byteorder='big', signed=False)
-        return ECPrivkey(ephemeral_exponent)
-
-    def get_secret_bytes(self) -> bytes:
-        return int.to_bytes(self.secret_scalar, length=32, byteorder='big', signed=False)
-
-    def sign(self, msg_hash: bytes, sigencode=None) -> bytes:
-        if not (isinstance(msg_hash, bytes) and len(msg_hash) == 32):
-            raise Exception("msg_hash to be signed must be bytes, and 32 bytes exactly")
-        if sigencode is None:
-            sigencode = sig_string_from_r_and_s
-
-        privkey_bytes = self.secret_scalar.to_bytes(32, byteorder="big")
-        nonce_function = None
-        sig = create_string_buffer(64)
-        def sign_with_extra_entropy(extra_entropy):
-            ret = _libsecp256k1.secp256k1_ecdsa_sign(
-                _libsecp256k1.ctx, sig, msg_hash, privkey_bytes,
-                nonce_function, extra_entropy)
-            if not ret:
-                raise Exception('the nonce generation function failed, or the private key was invalid')
-            compact_signature = create_string_buffer(64)
-            _libsecp256k1.secp256k1_ecdsa_signature_serialize_compact(_libsecp256k1.ctx, compact_signature, sig)
-            r = int.from_bytes(compact_signature[:32], byteorder="big")
-            s = int.from_bytes(compact_signature[32:], byteorder="big")
-            return r, s
-
-        r, s = sign_with_extra_entropy(extra_entropy=None)
-        counter = 0
-        while r >= 2**255:  # grind for low R value https://github.com/bitcoin/bitcoin/pull/13666
-            counter += 1
-            extra_entropy = counter.to_bytes(32, byteorder="little")
-            r, s = sign_with_extra_entropy(extra_entropy=extra_entropy)
-
-        sig_string = sig_string_from_r_and_s(r, s)
-        self.verify_message_hash(sig_string, msg_hash)
-
-        sig = sigencode(r, s)
-        return sig
-
-    def sign_transaction(self, hashed_preimage: bytes) -> bytes:
-        return self.sign(hashed_preimage, sigencode=der_sig_from_r_and_s)
-
-    def sign_message(self, message: bytes, is_compressed: bool, algo=lambda x: sha256d(msg_magic(x))) -> bytes:
-        def bruteforce_recid(sig_string):
-            for recid in range(4):
-                sig65 = construct_sig65(sig_string, recid, is_compressed)
-                try:
-                    self.verify_message_for_address(sig65, message, algo)
-                    return sig65, recid
-                except Exception as e:
-                    continue
-            else:
-                raise Exception("error: cannot sign message. no recid fits..")
-
-        message = to_bytes(message, 'utf8')
-        msg_hash = algo(message)
-        sig_string = self.sign(msg_hash, sigencode=sig_string_from_r_and_s)
-        sig65, recid = bruteforce_recid(sig_string)
-        return sig65
-
-    def decrypt_message(self, encrypted: Union[str, bytes], magic: bytes=b'BIE1') -> bytes:
-        encrypted = base64.b64decode(encrypted)  # type: bytes
-        if len(encrypted) < 85:
-            raise Exception('invalid ciphertext: length')
-        magic_found = encrypted[:4]
-        ephemeral_pubkey_bytes = encrypted[4:37]
-        ciphertext = encrypted[37:-32]
-        mac = encrypted[-32:]
-        if magic_found != magic:
-            raise Exception('invalid ciphertext: invalid magic bytes')
-        try:
-            ephemeral_pubkey = ECPubkey(ephemeral_pubkey_bytes)
-        except InvalidECPointException as e:
-            raise Exception('invalid ciphertext: invalid ephemeral pubkey') from e
-        ecdh_key = (ephemeral_pubkey * self.secret_scalar).get_public_key_bytes(compressed=True)
-        key = hashlib.sha512(ecdh_key).digest()
-        iv, key_e, key_m = key[0:16], key[16:32], key[32:]
-        if mac != hmac_oneshot(key_m, encrypted[:-32], hashlib.sha256):
-            raise InvalidPassword()
-        return aes_decrypt_with_iv(key_e, iv, ciphertext)
-
-
-def construct_sig65(sig_string: bytes, recid: int, is_compressed: bool) -> bytes:
-    comp = 4 if is_compressed else 0
-    return bytes([27 + recid + comp]) + sig_string

electrum/ecc_fast.py

@@ -1,140 +0,0 @@
-# taken (with minor modifications) from pycoin
-# https://github.com/richardkiss/pycoin/blob/01b1787ed902df23f99a55deb00d8cd076a906fe/pycoin/ecdsa/native/secp256k1.py
-
-import os
-import sys
-import traceback
-import ctypes
-from ctypes import (
-    byref, c_byte, c_int, c_uint, c_char_p, c_size_t, c_void_p, create_string_buffer,
-    CFUNCTYPE, POINTER, cast
-)
-
-from .logging import get_logger
-
-
-_logger = get_logger(__name__)
-
-
-SECP256K1_FLAGS_TYPE_MASK = ((1 << 8) - 1)
-SECP256K1_FLAGS_TYPE_CONTEXT = (1 << 0)
-SECP256K1_FLAGS_TYPE_COMPRESSION = (1 << 1)
-# /** The higher bits contain the actual data. Do not use directly. */
-SECP256K1_FLAGS_BIT_CONTEXT_VERIFY = (1 << 8)
-SECP256K1_FLAGS_BIT_CONTEXT_SIGN = (1 << 9)
-SECP256K1_FLAGS_BIT_COMPRESSION = (1 << 8)
-
-# /** Flags to pass to secp256k1_context_create. */
-SECP256K1_CONTEXT_VERIFY = (SECP256K1_FLAGS_TYPE_CONTEXT | SECP256K1_FLAGS_BIT_CONTEXT_VERIFY)
-SECP256K1_CONTEXT_SIGN = (SECP256K1_FLAGS_TYPE_CONTEXT | SECP256K1_FLAGS_BIT_CONTEXT_SIGN)
-SECP256K1_CONTEXT_NONE = (SECP256K1_FLAGS_TYPE_CONTEXT)
-
-SECP256K1_EC_COMPRESSED = (SECP256K1_FLAGS_TYPE_COMPRESSION | SECP256K1_FLAGS_BIT_COMPRESSION)
-SECP256K1_EC_UNCOMPRESSED = (SECP256K1_FLAGS_TYPE_COMPRESSION)
-
-
-class LibModuleMissing(Exception): pass
-
-
-def load_library():
-    if sys.platform == 'darwin':
-        library_paths = (os.path.join(os.path.dirname(__file__), 'libsecp256k1.0.dylib'),
-                         'libsecp256k1.0.dylib')
-    elif sys.platform in ('windows', 'win32'):
-        library_paths = (os.path.join(os.path.dirname(__file__), 'libsecp256k1-0.dll'),
-                         'libsecp256k1-0.dll')
-    elif 'ANDROID_DATA' in os.environ:
-        library_paths = ('libsecp256k1.so',)
-    else:  # desktop Linux and similar
-        library_paths = (os.path.join(os.path.dirname(__file__), 'libsecp256k1.so.0'),
-                         'libsecp256k1.so.0')
-
-    exceptions = []
-    secp256k1 = None
-    for libpath in library_paths:
-        try:
-            secp256k1 = ctypes.cdll.LoadLibrary(libpath)
-        except BaseException as e:
-            exceptions.append(e)
-        else:
-            break
-    if not secp256k1:
-        _logger.error(f'libsecp256k1 library failed to load. exceptions: {repr(exceptions)}')
-        return None
-
-    try:
-        secp256k1.secp256k1_context_create.argtypes = [c_uint]
-        secp256k1.secp256k1_context_create.restype = c_void_p
-
-        secp256k1.secp256k1_context_randomize.argtypes = [c_void_p, c_char_p]
-        secp256k1.secp256k1_context_randomize.restype = c_int
-
-        secp256k1.secp256k1_ec_pubkey_create.argtypes = [c_void_p, c_void_p, c_char_p]
-        secp256k1.secp256k1_ec_pubkey_create.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_sign.argtypes = [c_void_p, c_char_p, c_char_p, c_char_p, c_void_p, c_void_p]
-        secp256k1.secp256k1_ecdsa_sign.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_verify.argtypes = [c_void_p, c_char_p, c_char_p, c_char_p]
-        secp256k1.secp256k1_ecdsa_verify.restype = c_int
-
-        secp256k1.secp256k1_ec_pubkey_parse.argtypes = [c_void_p, c_char_p, c_char_p, c_size_t]
-        secp256k1.secp256k1_ec_pubkey_parse.restype = c_int
-
-        secp256k1.secp256k1_ec_pubkey_serialize.argtypes = [c_void_p, c_char_p, c_void_p, c_char_p, c_uint]
-        secp256k1.secp256k1_ec_pubkey_serialize.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_signature_parse_compact.argtypes = [c_void_p, c_char_p, c_char_p]
-        secp256k1.secp256k1_ecdsa_signature_parse_compact.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_signature_normalize.argtypes = [c_void_p, c_char_p, c_char_p]
-        secp256k1.secp256k1_ecdsa_signature_normalize.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_signature_serialize_compact.argtypes = [c_void_p, c_char_p, c_char_p]
-        secp256k1.secp256k1_ecdsa_signature_serialize_compact.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_signature_parse_der.argtypes = [c_void_p, c_char_p, c_char_p, c_size_t]
-        secp256k1.secp256k1_ecdsa_signature_parse_der.restype = c_int
-
-        secp256k1.secp256k1_ecdsa_signature_serialize_der.argtypes = [c_void_p, c_char_p, c_void_p, c_char_p]
-        secp256k1.secp256k1_ecdsa_signature_serialize_der.restype = c_int
-
-        secp256k1.secp256k1_ec_pubkey_tweak_mul.argtypes = [c_void_p, c_char_p, c_char_p]
-        secp256k1.secp256k1_ec_pubkey_tweak_mul.restype = c_int
-
-        secp256k1.secp256k1_ec_pubkey_combine.argtypes = [c_void_p, c_char_p, c_void_p, c_size_t]
-        secp256k1.secp256k1_ec_pubkey_combine.restype = c_int
-
-        # --enable-module-recovery
-        try:
-            secp256k1.secp256k1_ecdsa_recover.argtypes = [c_void_p, c_char_p, c_char_p, c_char_p]
-            secp256k1.secp256k1_ecdsa_recover.restype = c_int
-
-            secp256k1.secp256k1_ecdsa_recoverable_signature_parse_compact.argtypes = [c_void_p, c_char_p, c_char_p, c_int]
-            secp256k1.secp256k1_ecdsa_recoverable_signature_parse_compact.restype = c_int
-        except (OSError, AttributeError):
-            raise LibModuleMissing('libsecp256k1 library found but it was built '
-                                   'without required module (--enable-module-recovery)')
-
-        secp256k1.ctx = secp256k1.secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY)
-        ret = secp256k1.secp256k1_context_randomize(secp256k1.ctx, os.urandom(32))
-        if not ret:
-            _logger.error('secp256k1_context_randomize failed')
-            return None
-
-        return secp256k1
-    except (OSError, AttributeError) as e:
-        _logger.error(f'libsecp256k1 library was found and loaded but there was an error when using it: {repr(e)}')
-        return None
-
-
-_libsecp256k1 = None
-try:
-    _libsecp256k1 = load_library()
-except BaseException as e:
-    _logger.error(f'failed to load libsecp256k1: {repr(e)}')
-
-
-if _libsecp256k1 is None:
-    # hard fail:
-    sys.exit(f"Error: Failed to load libsecp256k1.")

electrum/electrum

@@ -1 +0,0 @@
-../run_electrum

electrum/exchange_rate.py

@@ -1,633 +0,0 @@
-import asyncio
-from datetime import datetime
-import inspect
-import sys
-import os
-import json
-import time
-import csv
-import decimal
-from decimal import Decimal
-from typing import Sequence, Optional
-
-from aiorpcx.curio import timeout_after, TaskTimeout, TaskGroup
-
-from .bitcoin import COIN
-from .i18n import _
-from .util import (ThreadJob, make_dir, log_exceptions,
-                   make_aiohttp_session, resource_path)
-from .network import Network
-from .simple_config import SimpleConfig
-from .logging import Logger
-
-
-DEFAULT_ENABLED = False
-DEFAULT_CURRENCY = "EUR"
-DEFAULT_EXCHANGE = "CoinGecko"  # default exchange should ideally provide historical rates
-
-
-# See https://en.wikipedia.org/wiki/ISO_4217
-CCY_PRECISIONS = {'BHD': 3, 'BIF': 0, 'BYR': 0, 'CLF': 4, 'CLP': 0,
-                  'CVE': 0, 'DJF': 0, 'GNF': 0, 'IQD': 3, 'ISK': 0,
-                  'JOD': 3, 'JPY': 0, 'KMF': 0, 'KRW': 0, 'KWD': 3,
-                  'LYD': 3, 'MGA': 1, 'MRO': 1, 'OMR': 3, 'PYG': 0,
-                  'RWF': 0, 'TND': 3, 'UGX': 0, 'UYI': 0, 'VND': 0,
-                  'VUV': 0, 'XAF': 0, 'XAU': 4, 'XOF': 0, 'XPF': 0}
-
-
-class ExchangeBase(Logger):
-
-    def __init__(self, on_quotes, on_history):
-        Logger.__init__(self)
-        self.history = {}
-        self.quotes = {}
-        self.on_quotes = on_quotes
-        self.on_history = on_history
-
-    async def get_raw(self, site, get_string):
-        # APIs must have https
-        url = ''.join(['https://', site, get_string])
-        network = Network.get_instance()
-        proxy = network.proxy if network else None
-        async with make_aiohttp_session(proxy) as session:
-            async with session.get(url) as response:
-                response.raise_for_status()
-                return await response.text()
-
-    async def get_json(self, site, get_string):
-        # APIs must have https
-        url = ''.join(['https://', site, get_string])
-        network = Network.get_instance()
-        proxy = network.proxy if network else None
-        async with make_aiohttp_session(proxy) as session:
-            async with session.get(url) as response:
-                response.raise_for_status()
-                # set content_type to None to disable checking MIME type
-                return await response.json(content_type=None)
-
-    async def get_csv(self, site, get_string):
-        raw = await self.get_raw(site, get_string)
-        reader = csv.DictReader(raw.split('\n'))
-        return list(reader)
-
-    def name(self):
-        return self.__class__.__name__
-
-    async def update_safe(self, ccy):
-        try:
-            self.logger.info(f"getting fx quotes for {ccy}")
-            self.quotes = await self.get_rates(ccy)
-            self.logger.info("received fx quotes")
-        except asyncio.CancelledError:
-            # CancelledError must be passed-through for cancellation to work
-            raise
-        except BaseException as e:
-            self.logger.info(f"failed fx quotes: {repr(e)}")
-            self.quotes = {}
-        self.on_quotes()
-
-    def read_historical_rates(self, ccy, cache_dir) -> Optional[dict]:
-        filename = os.path.join(cache_dir, self.name() + '_'+ ccy)
-        if not os.path.exists(filename):
-            return None
-        timestamp = os.stat(filename).st_mtime
-        try:
-            with open(filename, 'r', encoding='utf-8') as f:
-                h = json.loads(f.read())
-        except:
-            return None
-        if not h:  # e.g. empty dict
-            return None
-        h['timestamp'] = timestamp
-        self.history[ccy] = h
-        self.on_history()
-        return h
-
-    @log_exceptions
-    async def get_historical_rates_safe(self, ccy, cache_dir):
-        try:
-            self.logger.info(f"requesting fx history for {ccy}")
-            h = await self.request_history(ccy)
-            self.logger.info(f"received fx history for {ccy}")
-        except BaseException as e:
-            self.logger.info(f"failed fx history: {repr(e)}")
-            return
-        filename = os.path.join(cache_dir, self.name() + '_' + ccy)
-        with open(filename, 'w', encoding='utf-8') as f:
-            f.write(json.dumps(h))
-        h['timestamp'] = time.time()
-        self.history[ccy] = h
-        self.on_history()
-
-    def get_historical_rates(self, ccy, cache_dir):
-        if ccy not in self.history_ccys():
-            return
-        h = self.history.get(ccy)
-        if h is None:
-            h = self.read_historical_rates(ccy, cache_dir)
-        if h is None or h['timestamp'] < time.time() - 24*3600:
-            asyncio.get_event_loop().create_task(self.get_historical_rates_safe(ccy, cache_dir))
-
-    def history_ccys(self):
-        return []
-
-    def historical_rate(self, ccy, d_t):
-        return self.history.get(ccy, {}).get(d_t.strftime('%Y-%m-%d'), 'NaN')
-
-    async def request_history(self, ccy):
-        raise NotImplementedError()  # implemented by subclasses
-
-    async def get_rates(self, ccy):
-        raise NotImplementedError()  # implemented by subclasses
-
-    async def get_currencies(self):
-        rates = await self.get_rates('')
-        return sorted([str(a) for (a, b) in rates.items() if b is not None and len(a)==3])
-
-
-class BitcoinAverage(ExchangeBase):
-    # note: historical rates used to be freely available
-    # but this is no longer the case. see #5188
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('apiv2.bitcoinaverage.com', '/indices/global/ticker/short')
-        return dict([(r.replace("BTC", ""), Decimal(json[r]['last']))
-                     for r in json if r != 'timestamp'])
-
-
-class Bitcointoyou(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('bitcointoyou.com', "/API/ticker.aspx")
-        return {'BRL': Decimal(json['ticker']['last'])}
-
-
-class BitcoinVenezuela(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.bitcoinvenezuela.com', '/')
-        rates = [(r, json['BTC'][r]) for r in json['BTC']
-                 if json['BTC'][r] is not None]  # Giving NULL for LTC
-        return dict(rates)
-
-    def history_ccys(self):
-        return ['ARS', 'EUR', 'USD', 'VEF']
-
-    async def request_history(self, ccy):
-        json = await self.get_json('api.bitcoinvenezuela.com',
-                             "/historical/index.php?coin=BTC")
-        return json[ccy +'_BTC']
-
-
-class Bitbank(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('public.bitbank.cc', '/btc_jpy/ticker')
-        return {'JPY': Decimal(json['data']['last'])}
-
-
-class BitFlyer(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('bitflyer.jp', '/api/echo/price')
-        return {'JPY': Decimal(json['mid'])}
-
-
-class BitPay(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('bitpay.com', '/api/rates')
-        return dict([(r['code'], Decimal(r['rate'])) for r in json])
-
-
-class Bitso(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.bitso.com', '/v2/ticker')
-        return {'MXN': Decimal(json['last'])}
-
-
-class BitStamp(ExchangeBase):
-
-    async def get_currencies(self):
-        return ['USD', 'EUR']
-
-    async def get_rates(self, ccy):
-        if ccy in CURRENCIES[self.name()]:
-            json = await self.get_json('www.bitstamp.net', f'/api/v2/ticker/btc{ccy.lower()}/')
-            return {ccy: Decimal(json['last'])}
-        return {}
-
-
-class Bitvalor(ExchangeBase):
-
-    async def get_rates(self,ccy):
-        json = await self.get_json('api.bitvalor.com', '/v1/ticker.json')
-        return {'BRL': Decimal(json['ticker_1h']['total']['last'])}
-
-
-class BlockchainInfo(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('blockchain.info', '/ticker')
-        return dict([(r, Decimal(json[r]['15m'])) for r in json])
-
-
-class Bylls(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('bylls.com', '/api/price?from_currency=BTC&to_currency=CAD')
-        return {'CAD': Decimal(json['public_price']['to_price'])}
-
-
-class Coinbase(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.coinbase.com',
-                             '/v2/exchange-rates?currency=BTC')
-        return {ccy: Decimal(rate) for (ccy, rate) in json["data"]["rates"].items()}
-
-
-class CoinCap(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.coincap.io', '/v2/rates/bitcoin/')
-        return {'USD': Decimal(json['data']['rateUsd'])}
-
-    def history_ccys(self):
-        return ['USD']
-
-    async def request_history(self, ccy):
-        # Currently 2000 days is the maximum in 1 API call
-        # (and history starts on 2017-03-23)
-        history = await self.get_json('api.coincap.io',
-                                      '/v2/assets/bitcoin/history?interval=d1&limit=2000')
-        return dict([(datetime.utcfromtimestamp(h['time']/1000).strftime('%Y-%m-%d'), h['priceUsd'])
-                     for h in history['data']])
-
-
-class CoinDesk(ExchangeBase):
-
-    async def get_currencies(self):
-        dicts = await self.get_json('api.coindesk.com',
-                              '/v1/bpi/supported-currencies.json')
-        return [d['currency'] for d in dicts]
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.coindesk.com',
-                             '/v1/bpi/currentprice/%s.json' % ccy)
-        result = {ccy: Decimal(json['bpi'][ccy]['rate_float'])}
-        return result
-
-    def history_starts(self):
-        return { 'USD': '2012-11-30', 'EUR': '2013-09-01' }
-
-    def history_ccys(self):
-        return self.history_starts().keys()
-
-    async def request_history(self, ccy):
-        start = self.history_starts()[ccy]
-        end = datetime.today().strftime('%Y-%m-%d')
-        # Note ?currency and ?index don't work as documented.  Sigh.
-        query = ('/v1/bpi/historical/close.json?start=%s&end=%s'
-                 % (start, end))
-        json = await self.get_json('api.coindesk.com', query)
-        return json['bpi']
-
-
-class CoinGecko(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.coingecko.com', '/api/v3/exchange_rates')
-        return dict([(ccy.upper(), Decimal(d['value']))
-                     for ccy, d in json['rates'].items()])
-
-    def history_ccys(self):
-        # CoinGecko seems to have historical data for all ccys it supports
-        return CURRENCIES[self.name()]
-
-    async def request_history(self, ccy):
-        history = await self.get_json('api.coingecko.com',
-                                      '/api/v3/coins/bitcoin/market_chart?vs_currency=%s&days=max' % ccy)
-
-        return dict([(datetime.utcfromtimestamp(h[0]/1000).strftime('%Y-%m-%d'), h[1])
-                     for h in history['prices']])
-
-
-class itBit(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        ccys = ['USD', 'EUR', 'SGD']
-        json = await self.get_json('api.itbit.com', '/v1/markets/XBT%s/ticker' % ccy)
-        result = dict.fromkeys(ccys)
-        if ccy in ccys:
-            result[ccy] = Decimal(json['lastPrice'])
-        return result
-
-
-class Kraken(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        ccys = ['EUR', 'USD', 'CAD', 'GBP', 'JPY']
-        pairs = ['XBT%s' % c for c in ccys]
-        json = await self.get_json('api.kraken.com',
-                             '/0/public/Ticker?pair=%s' % ','.join(pairs))
-        return dict((k[-3:], Decimal(float(v['c'][0])))
-                     for k, v in json['result'].items())
-
-
-class LocalBitcoins(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('localbitcoins.com',
-                             '/bitcoinaverage/ticker-all-currencies/')
-        return dict([(r, Decimal(json[r]['rates']['last'])) for r in json])
-
-
-class MercadoBitcoin(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.bitvalor.com', '/v1/ticker.json')
-        return {'BRL': Decimal(json['ticker_1h']['exchanges']['MBT']['last'])}
-
-
-class NegocieCoins(ExchangeBase):
-
-    async def get_rates(self,ccy):
-        json = await self.get_json('api.bitvalor.com', '/v1/ticker.json')
-        return {'BRL': Decimal(json['ticker_1h']['exchanges']['NEG']['last'])}
-
-class TheRockTrading(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.therocktrading.com',
-                             '/v1/funds/BTCEUR/ticker')
-        return {'EUR': Decimal(json['last'])}
-
-
-class Winkdex(ExchangeBase):
-
-    async def get_rates(self, ccy):
-        json = await self.get_json('winkdex.com', '/api/v0/price')
-        return {'USD': Decimal(json['price'] / 100.0)}
-
-    def history_ccys(self):
-        return ['USD']
-
-    async def request_history(self, ccy):
-        json = await self.get_json('winkdex.com',
-                             "/api/v0/series?start_time=1342915200")
-        history = json['series'][0]['results']
-        return dict([(h['timestamp'][:10], h['price'] / 100.0)
-                     for h in history])
-
-
-class Zaif(ExchangeBase):
-    async def get_rates(self, ccy):
-        json = await self.get_json('api.zaif.jp', '/api/1/last_price/btc_jpy')
-        return {'JPY': Decimal(json['last_price'])}
-
-
-def dictinvert(d):
-    inv = {}
-    for k, vlist in d.items():
-        for v in vlist:
-            keys = inv.setdefault(v, [])
-            keys.append(k)
-    return inv
-
-def get_exchanges_and_currencies():
-    # load currencies.json from disk
-    path = resource_path('currencies.json')
-    try:
-        with open(path, 'r', encoding='utf-8') as f:
-            return json.loads(f.read())
-    except:
-        pass
-    # or if not present, generate it now.
-    print("cannot find currencies.json. will regenerate it now.")
-    d = {}
-    is_exchange = lambda obj: (inspect.isclass(obj)
-                               and issubclass(obj, ExchangeBase)
-                               and obj != ExchangeBase)
-    exchanges = dict(inspect.getmembers(sys.modules[__name__], is_exchange))
-
-    async def get_currencies_safe(name, exchange):
-        try:
-            d[name] = await exchange.get_currencies()
-            print(name, "ok")
-        except:
-            print(name, "error")
-
-    async def query_all_exchanges_for_their_ccys_over_network():
-        async with timeout_after(10):
-            async with TaskGroup() as group:
-                for name, klass in exchanges.items():
-                    exchange = klass(None, None)
-                    await group.spawn(get_currencies_safe(name, exchange))
-    loop = asyncio.get_event_loop()
-    try:
-        loop.run_until_complete(query_all_exchanges_for_their_ccys_over_network())
-    except Exception as e:
-        pass
-    with open(path, 'w', encoding='utf-8') as f:
-        f.write(json.dumps(d, indent=4, sort_keys=True))
-    return d
-
-
-CURRENCIES = get_exchanges_and_currencies()
-
-
-def get_exchanges_by_ccy(history=True):
-    if not history:
-        return dictinvert(CURRENCIES)
-    d = {}
-    exchanges = CURRENCIES.keys()
-    for name in exchanges:
-        klass = globals()[name]
-        exchange = klass(None, None)
-        d[name] = exchange.history_ccys()
-    return dictinvert(d)
-
-
-class FxThread(ThreadJob):
-
-    def __init__(self, config: SimpleConfig, network: Network):
-        ThreadJob.__init__(self)
-        self.config = config
-        self.network = network
-        if self.network:
-            self.network.register_callback(self.set_proxy, ['proxy_set'])
-        self.ccy = self.get_currency()
-        self.history_used_spot = False
-        self.ccy_combo = None
-        self.hist_checkbox = None
-        self.cache_dir = os.path.join(config.path, 'cache')
-        self._trigger = asyncio.Event()
-        self._trigger.set()
-        self.set_exchange(self.config_exchange())
-        make_dir(self.cache_dir)
-
-    def set_proxy(self, trigger_name, *args):
-        self._trigger.set()
-
-    @staticmethod
-    def get_currencies(history: bool) -> Sequence[str]:
-        d = get_exchanges_by_ccy(history)
-        return sorted(d.keys())
-
-    @staticmethod
-    def get_exchanges_by_ccy(ccy: str, history: bool) -> Sequence[str]:
-        d = get_exchanges_by_ccy(history)
-        return d.get(ccy, [])
-
-    @staticmethod
-    def remove_thousands_separator(text):
-        return text.replace(',', '') # FIXME use THOUSAND_SEPARATOR in util
-
-    def ccy_amount_str(self, amount, commas):
-        prec = CCY_PRECISIONS.get(self.ccy, 2)
-        fmt_str = "{:%s.%df}" % ("," if commas else "", max(0, prec)) # FIXME use util.THOUSAND_SEPARATOR and util.DECIMAL_POINT
-        try:
-            rounded_amount = round(amount, prec)
-        except decimal.InvalidOperation:
-            rounded_amount = amount
-        return fmt_str.format(rounded_amount)
-
-    async def run(self):
-        while True:
-            # approx. every 2.5 minutes, refresh spot price
-            try:
-                async with timeout_after(150):
-                    await self._trigger.wait()
-                    self._trigger.clear()
-                # we were manually triggered, so get historical rates
-                if self.is_enabled() and self.show_history():
-                    self.exchange.get_historical_rates(self.ccy, self.cache_dir)
-            except TaskTimeout:
-                pass
-            if self.is_enabled():
-                await self.exchange.update_safe(self.ccy)
-
-    def is_enabled(self):
-        return bool(self.config.get('use_exchange_rate', DEFAULT_ENABLED))
-
-    def set_enabled(self, b):
-        self.config.set_key('use_exchange_rate', bool(b))
-        self.trigger_update()
-
-    def get_history_config(self, *, default=False):
-        return bool(self.config.get('history_rates', default))
-
-    def set_history_config(self, b):
-        self.config.set_key('history_rates', bool(b))
-
-    def get_history_capital_gains_config(self):
-        return bool(self.config.get('history_rates_capital_gains', False))
-
-    def set_history_capital_gains_config(self, b):
-        self.config.set_key('history_rates_capital_gains', bool(b))
-
-    def get_fiat_address_config(self):
-        return bool(self.config.get('fiat_address'))
-
-    def set_fiat_address_config(self, b):
-        self.config.set_key('fiat_address', bool(b))
-
-    def get_currency(self):
-        '''Use when dynamic fetching is needed'''
-        return self.config.get("currency", DEFAULT_CURRENCY)
-
-    def config_exchange(self):
-        return self.config.get('use_exchange', DEFAULT_EXCHANGE)
-
-    def show_history(self):
-        return self.is_enabled() and self.get_history_config() and self.ccy in self.exchange.history_ccys()
-
-    def set_currency(self, ccy):
-        self.ccy = ccy
-        self.config.set_key('currency', ccy, True)
-        self.trigger_update()
-        self.on_quotes()
-
-    def trigger_update(self):
-        if self.network:
-            self.network.asyncio_loop.call_soon_threadsafe(self._trigger.set)
-
-    def set_exchange(self, name):
-        class_ = globals().get(name) or globals().get(DEFAULT_EXCHANGE)
-        self.logger.info(f"using exchange {name}")
-        if self.config_exchange() != name:
-            self.config.set_key('use_exchange', name, True)
-        assert issubclass(class_, ExchangeBase), f"unexpected type {class_} for {name}"
-        self.exchange = class_(self.on_quotes, self.on_history)  # type: ExchangeBase
-        # A new exchange means new fx quotes, initially empty.  Force
-        # a quote refresh
-        self.trigger_update()
-        self.exchange.read_historical_rates(self.ccy, self.cache_dir)
-
-    def on_quotes(self):
-        if self.network:
-            self.network.trigger_callback('on_quotes')
-
-    def on_history(self):
-        if self.network:
-            self.network.trigger_callback('on_history')
-
-    def exchange_rate(self) -> Decimal:
-        """Returns the exchange rate as a Decimal"""
-        rate = self.exchange.quotes.get(self.ccy)
-        if rate is None:
-            return Decimal('NaN')
-        return Decimal(rate)
-
-    def format_amount(self, btc_balance):
-        rate = self.exchange_rate()
-        return '' if rate.is_nan() else "%s" % self.value_str(btc_balance, rate)
-
-    def format_amount_and_units(self, btc_balance):
-        rate = self.exchange_rate()
-        return '' if rate.is_nan() else "%s %s" % (self.value_str(btc_balance, rate), self.ccy)
-
-    def get_fiat_status_text(self, btc_balance, base_unit, decimal_point):
-        rate = self.exchange_rate()
-        return _("  (No FX rate available)") if rate.is_nan() else " 1 %s~%s %s" % (base_unit,
-            self.value_str(COIN / (10**(8 - decimal_point)), rate), self.ccy)
-
-    def fiat_value(self, satoshis, rate):
-        return Decimal('NaN') if satoshis is None else Decimal(satoshis) / COIN * Decimal(rate)
-
-    def value_str(self, satoshis, rate):
-        return self.format_fiat(self.fiat_value(satoshis, rate))
-
-    def format_fiat(self, value):
-        if value.is_nan():
-            return _("No data")
-        return "%s" % (self.ccy_amount_str(value, True))
-
-    def history_rate(self, d_t):
-        if d_t is None:
-            return Decimal('NaN')
-        rate = self.exchange.historical_rate(self.ccy, d_t)
-        # Frequently there is no rate for today, until tomorrow :)
-        # Use spot quotes in that case
-        if rate in ('NaN', None) and (datetime.today().date() - d_t.date()).days <= 2:
-            rate = self.exchange.quotes.get(self.ccy, 'NaN')
-            self.history_used_spot = True
-        if rate is None:
-            rate = 'NaN'
-        return Decimal(rate)
-
-    def historical_value_str(self, satoshis, d_t):
-        return self.format_fiat(self.historical_value(satoshis, d_t))
-
-    def historical_value(self, satoshis, d_t):
-        return self.fiat_value(satoshis, self.history_rate(d_t))
-
-    def timestamp_rate(self, timestamp):
-        from .util import timestamp_to_datetime
-        date = timestamp_to_datetime(timestamp)
-        return self.history_rate(date)
-
-
-assert globals().get(DEFAULT_EXCHANGE), f"default exchange {DEFAULT_EXCHANGE} does not exist"