From 27b137359543e0727d30ada3ea7209e4602b9501 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 28 Feb 2019 22:26:15 +0100 Subject: [PATCH] zcl-ify --- .gitignore | 2 +- .travis.yml | 20 +-- MANIFEST.in | 6 +- README.rst | 28 ++-- contrib/sign-releases.py | 20 +-- .../travis/electrum_zcash_version_env.sh | 14 -- .../btc2zcash.py => zclassic/btc2zclassic.py} | 2 +- .../{zcash => zclassic}/deterministic.spec | 28 ++-- .../electrum-zclassic.nsi} | 60 ++++----- contrib/{zcash => zclassic}/osx.spec | 36 +++--- .../{zcash => zclassic}/pyi_runtimehook.py | 2 +- .../pyi_tctl_runtimehook.py | 0 contrib/{zcash => zclassic}/requirements.txt | 0 .../travis/Dockerfile-kivy | 0 .../travis/Dockerfile-linux | 0 .../travis/Dockerfile-wine | 0 .../travis/before_install-linux-apk.sh | 0 .../travis/before_install-linux.sh | 0 .../travis/before_install-osx.sh | 0 .../{zcash => zclassic}/travis/build_linux.sh | 0 .../{zcash => zclassic}/travis/build_wine.sh | 22 ++-- .../travis/electrum_zclassic_version_env.sh | 14 ++ .../travis/travis-build-linux-apk.sh | 10 +- .../travis/travis-build-linux.sh | 14 +- .../travis/travis-build-osx.sh | 24 ++-- debian/changelog | 2 +- debian/control | 40 +++--- debian/copyright | 4 +- debian/electrum-zcash.manpages | 1 - .../{electrum-zcash.1 => electrum-zclassic.1} | 14 +- debian/electrum-zclassic.manpages | 1 + debian/patches/fix-keepkey-with-trezor.diff | 10 +- debian/rules | 18 +-- electrum-zcash.desktop | 21 --- electrum-zcash => electrum-zclassic | 44 +++---- electrum-zcash-env => electrum-zclassic-env | 2 +- ...nf.sample => electrum-zclassic.conf.sample | 4 +- electrum-zclassic.desktop | 21 +++ electrum-zcash.icns => electrum-zclassic.icns | Bin gui/kivy/Readme.md | 10 +- gui/kivy/i18n.py | 2 +- gui/kivy/main.kv | 2 +- gui/kivy/main_window.py | 68 +++++----- gui/kivy/nfc_scanner/__init__.py | 4 +- gui/kivy/nfc_scanner/scanner_android.py | 10 +- gui/kivy/nfc_scanner/scanner_dummy.py | 2 +- gui/kivy/tools/bitcoin_intent.xml | 2 +- gui/kivy/tools/buildozer.spec | 4 +- gui/kivy/uix/context_menu.py | 2 +- gui/kivy/uix/dialogs/__init__.py | 2 +- gui/kivy/uix/dialogs/addresses.py | 6 +- gui/kivy/uix/dialogs/fee_dialog.py | 2 +- gui/kivy/uix/dialogs/fx_dialog.py | 2 +- gui/kivy/uix/dialogs/installwizard.py | 8 +- gui/kivy/uix/dialogs/invoices.py | 8 +- gui/kivy/uix/dialogs/nfc_transaction.py | 2 +- gui/kivy/uix/dialogs/password_dialog.py | 8 +- gui/kivy/uix/dialogs/qr_scanner.py | 2 +- gui/kivy/uix/dialogs/question.py | 2 +- gui/kivy/uix/dialogs/requests.py | 8 +- gui/kivy/uix/dialogs/settings.py | 16 +-- gui/kivy/uix/dialogs/tx_dialog.py | 6 +- gui/kivy/uix/dialogs/wallets.py | 2 +- gui/kivy/uix/menus.py | 2 +- gui/kivy/uix/screens.py | 26 ++-- gui/kivy/uix/ui_screens/about.kv | 4 +- gui/kivy/uix/ui_screens/history.kv | 2 +- gui/kivy/uix/ui_screens/network.kv | 2 +- gui/kivy/uix/ui_screens/receive.kv | 4 +- gui/kivy/uix/ui_screens/send.kv | 2 +- gui/kivy/uix/ui_screens/server.kv | 2 +- gui/kivy/uix/ui_screens/status.kv | 2 +- gui/qt/__init__.py | 26 ++-- gui/qt/address_dialog.py | 2 +- gui/qt/address_list.py | 10 +- gui/qt/amountedit.py | 8 +- gui/qt/console.py | 2 +- gui/qt/contact_list.py | 8 +- gui/qt/exception_window.py | 10 +- gui/qt/fee_slider.py | 2 +- gui/qt/history_list.py | 14 +- gui/qt/installwizard.py | 20 +-- gui/qt/invoice_list.py | 4 +- gui/qt/main_window.py | 122 +++++++++--------- gui/qt/network_dialog.py | 18 +-- gui/qt/password_dialog.py | 6 +- gui/qt/paytoedit.py | 10 +- gui/qt/qrcodewidget.py | 6 +- gui/qt/qrtextedit.py | 6 +- gui/qt/qrwindow.py | 6 +- gui/qt/request_list.py | 8 +- gui/qt/seed_dialog.py | 18 +-- gui/qt/transaction_dialog.py | 16 +-- gui/qt/util.py | 6 +- gui/qt/utxo_list.py | 2 +- gui/stdio.py | 14 +- gui/text.py | 14 +- icons.qrc | 2 +- icons/electrum-zcash.ico | Bin 295606 -> 0 bytes icons/electrum-zcash.png | Bin 7482 -> 0 bytes icons/electrum-zclassic.ico | Bin 0 -> 43524 bytes icons/electrum-zclassic.png | Bin 0 -> 26415 bytes icons/electrum.icns | Bin 0 -> 99183 bytes icons/electrum_dark_icon.png | Bin 1838 -> 1268 bytes icons/electrum_light_icon.png | Bin 1716 -> 1268 bytes icons/electrum_presplash.png | Bin 18444 -> 19127 bytes lib/base_wizard.py | 8 +- lib/bitcoin.py | 2 +- lib/commands.py | 40 +++--- lib/constants.py | 10 +- lib/contacts.py | 6 +- lib/currencies.json | 13 +- lib/daemon.py | 4 +- lib/exchange_rate.py | 16 +-- lib/paymentrequest.py | 10 +- lib/plot.py | 2 +- lib/plugins.py | 10 +- lib/servers.json | 6 +- lib/simple_config.py | 6 +- lib/tests/test_util.py | 22 ++-- lib/transaction.py | 10 +- lib/util.py | 24 ++-- lib/wallet.py | 8 +- plugins/audio_modem/__init__.py | 2 +- plugins/audio_modem/qt.py | 8 +- plugins/cosigner_pool/__init__.py | 2 +- plugins/cosigner_pool/qt.py | 16 +-- plugins/digitalbitbox/__init__.py | 2 +- plugins/digitalbitbox/cmdline.py | 2 +- plugins/digitalbitbox/digitalbitbox.py | 22 ++-- plugins/digitalbitbox/qt.py | 6 +- plugins/email_requests/__init__.py | 2 +- plugins/email_requests/qt.py | 18 +-- plugins/hw_wallet/cmdline.py | 2 +- plugins/hw_wallet/plugin.py | 4 +- plugins/hw_wallet/qt.py | 14 +- plugins/keepkey/__init__.py | 2 +- plugins/keepkey/clientbase.py | 14 +- plugins/keepkey/cmdline.py | 2 +- plugins/keepkey/plugin.py | 18 +-- plugins/keepkey/qt_generic.py | 30 ++--- plugins/labels/__init__.py | 2 +- plugins/labels/kivy.py | 2 +- plugins/labels/labels.py | 10 +- plugins/labels/qt.py | 10 +- plugins/ledger/__init__.py | 2 +- plugins/ledger/auth2fa.py | 82 ++++++------ plugins/ledger/cmdline.py | 2 +- plugins/ledger/ledger.py | 18 +-- plugins/ledger/qt.py | 18 +-- plugins/trezor/__init__.py | 2 +- plugins/trezor/clientbase.py | 14 +- plugins/trezor/cmdline.py | 2 +- plugins/trezor/qt_generic.py | 30 ++--- plugins/trezor/transport.py | 2 +- plugins/trezor/trezor.py | 16 +-- plugins/virtualkeyboard/__init__.py | 2 +- plugins/virtualkeyboard/qt.py | 4 +- setup.py | 52 ++++---- 159 files changed, 847 insertions(+), 856 deletions(-) delete mode 100755 contrib/zcash/travis/electrum_zcash_version_env.sh rename contrib/{zcash/btc2zcash.py => zclassic/btc2zclassic.py} (99%) rename contrib/{zcash => zclassic}/deterministic.spec (82%) rename contrib/{zcash/electrum-zcash.nsi => zclassic/electrum-zclassic.nsi} (85%) rename contrib/{zcash => zclassic}/osx.spec (76%) rename contrib/{zcash => zclassic}/pyi_runtimehook.py (98%) rename contrib/{zcash => zclassic}/pyi_tctl_runtimehook.py (100%) rename contrib/{zcash => zclassic}/requirements.txt (100%) rename contrib/{zcash => zclassic}/travis/Dockerfile-kivy (100%) rename contrib/{zcash => zclassic}/travis/Dockerfile-linux (100%) rename contrib/{zcash => zclassic}/travis/Dockerfile-wine (100%) rename contrib/{zcash => zclassic}/travis/before_install-linux-apk.sh (100%) rename contrib/{zcash => zclassic}/travis/before_install-linux.sh (100%) rename contrib/{zcash => zclassic}/travis/before_install-osx.sh (100%) rename contrib/{zcash => zclassic}/travis/build_linux.sh (100%) rename contrib/{zcash => zclassic}/travis/build_wine.sh (63%) create mode 100755 contrib/zclassic/travis/electrum_zclassic_version_env.sh rename contrib/{zcash => zclassic}/travis/travis-build-linux-apk.sh (62%) rename contrib/{zcash => zclassic}/travis/travis-build-linux.sh (76%) rename contrib/{zcash => zclassic}/travis/travis-build-osx.sh (51%) delete mode 100644 debian/electrum-zcash.manpages rename debian/{electrum-zcash.1 => electrum-zclassic.1} (80%) create mode 100644 debian/electrum-zclassic.manpages delete mode 100644 electrum-zcash.desktop rename electrum-zcash => electrum-zclassic (92%) rename electrum-zcash-env => electrum-zclassic-env (96%) rename electrum-zcash.conf.sample => electrum-zclassic.conf.sample (67%) create mode 100644 electrum-zclassic.desktop rename electrum-zcash.icns => electrum-zclassic.icns (100%) delete mode 100644 icons/electrum-zcash.ico delete mode 100644 icons/electrum-zcash.png create mode 100644 icons/electrum-zclassic.ico create mode 100644 icons/electrum-zclassic.png create mode 100644 icons/electrum.icns diff --git a/.gitignore b/.gitignore index 8e0d7001..334a71bb 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,5 @@ bin/ electrum_data/ gui/kivy/theming/light-0.png gui/kivy/theming/light.atlas -Electrum_Zcash.egg-info/ +Electrum_Zclassic.egg-info/ .pytest_cache diff --git a/.travis.yml b/.travis.yml index 832b78a4..f3f28baa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ matrix: os: linux python: "3.6" before_install: -- source contrib/zcash/travis/electrum_zcash_version_env.sh -- echo electrum-zcash version is $ELECTRUM_ZCASH_VERSION -- mkdir -p build && cp contrib/zcash/travis/* ./build/ +- source contrib/zclassic/travis/electrum_zclassic_version_env.sh +- echo electrum-zclassic version is $ELECTRUM_ZCL_VERSION +- mkdir -p build && cp contrib/zclassic/travis/* ./build/ - if [[ -n $TRAVIS_TAG ]] && [[ $TRAVIS_OS_NAME == 'osx' ]]; then ./build/before_install-osx.sh; fi @@ -56,20 +56,20 @@ deploy: api_key: secure: G+TcxPJSQQ2bTNhkTX4aofnsiNFrzbuFTGty/+jIKDb/IQ69etXS9Ulu8KGD71VjEdXugFWdus+2a8fFSCSg79+AvrSxKa1ztXQ2q6tmovRkUcnF5Bkbc+ORLm3+FMZhonvMg+MLnHS3hnvJL/CZU0Pn2dkfODn7/t+MsGs99MN0G44qimq+FCu+YHaKVcGgiTs1I6nextIH+lnPw5qE6VxTQKdFp4PTHqY1qZJWamReVvtyMnfGpa+QwcKf43dXzZrHMLfFprfzEi1DExrhRi0a8RZlFWmAtkwH9zzJXzqOEmivniLfeALJzWkBJG4I2Fu7QSQhvPllhnt5uGdV3pgmHZUxL1DZckrqVG5b6P/Cnmbu0hWXbkPpZ7sXQ4X7wGhAVgH2sRPF1SfE9XvqDsmKvpspdKGmI+9yKoaWekbt8igfJ8jRBK4yRJAt+F/waeXkj7HJhSPIYg9wNvYCnCmoih4brRcTE4nyJBo/ySY3DVocflS3QGoClOrBpwXGgzwaUzBamRhJeCUe9ockPJyUs9DkuBIdsPfhq0nZfZFMhNBtpzm1hPGE92NojUi+DcI12WqweUqDWZzY/02MmfHLeN6mGgjTWvgOwnq1fvc6s7sVy7nANtA6UseWF2KUBYfuMKAxTU4WadpZ102znz4XiL4B7TILKJMU+Ht+a+c= file: - - build/electrum-zcash/dist/electrum-zcash-$ELECTRUM_ZCASH_VERSION-macosx.dmg + - build/electrum-zclassic/dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-macosx.dmg on: - repo: zebra-lucky/electrum-zcash + repo: zebra-lucky/electrum-zclassic tags: true condition: "$TRAVIS_OS_NAME = osx" - provider: releases api_key: secure: G+TcxPJSQQ2bTNhkTX4aofnsiNFrzbuFTGty/+jIKDb/IQ69etXS9Ulu8KGD71VjEdXugFWdus+2a8fFSCSg79+AvrSxKa1ztXQ2q6tmovRkUcnF5Bkbc+ORLm3+FMZhonvMg+MLnHS3hnvJL/CZU0Pn2dkfODn7/t+MsGs99MN0G44qimq+FCu+YHaKVcGgiTs1I6nextIH+lnPw5qE6VxTQKdFp4PTHqY1qZJWamReVvtyMnfGpa+QwcKf43dXzZrHMLfFprfzEi1DExrhRi0a8RZlFWmAtkwH9zzJXzqOEmivniLfeALJzWkBJG4I2Fu7QSQhvPllhnt5uGdV3pgmHZUxL1DZckrqVG5b6P/Cnmbu0hWXbkPpZ7sXQ4X7wGhAVgH2sRPF1SfE9XvqDsmKvpspdKGmI+9yKoaWekbt8igfJ8jRBK4yRJAt+F/waeXkj7HJhSPIYg9wNvYCnCmoih4brRcTE4nyJBo/ySY3DVocflS3QGoClOrBpwXGgzwaUzBamRhJeCUe9ockPJyUs9DkuBIdsPfhq0nZfZFMhNBtpzm1hPGE92NojUi+DcI12WqweUqDWZzY/02MmfHLeN6mGgjTWvgOwnq1fvc6s7sVy7nANtA6UseWF2KUBYfuMKAxTU4WadpZ102znz4XiL4B7TILKJMU+Ht+a+c= file: - - build/electrum-zcash/dist/Electrum-Zcash-$ELECTRUM_ZCASH_VERSION.tar.gz - - build/electrum-zcash/dist/electrum-zcash-$ELECTRUM_ZCASH_VERSION-setup-win32.exe - - build/electrum-zcash/dist/electrum-zcash-$ELECTRUM_ZCASH_VERSION-setup-win64.exe - - build/electrum-zcash/bin/Electrum_Zcash-$ELECTRUM_ZCASH_APK_VERSION-release-unsigned.apk + - build/electrum-zclassic/dist/Electrum-Zclassic-$ELECTRUM_ZCL_VERSION.tar.gz + - build/electrum-zclassic/dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-setup-win32.exe + - build/electrum-zclassic/dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-setup-win64.exe + - build/electrum-zclassic/bin/Electrum_Zclassic-$ELECTRUM_ZCL_APK_VERSION-release-unsigned.apk on: - repo: zebra-lucky/electrum-zcash + repo: zebra-lucky/electrum-zclassic tags: true condition: "$TRAVIS_OS_NAME = linux" diff --git a/MANIFEST.in b/MANIFEST.in index 0588184b..84698f05 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,9 +1,9 @@ include LICENCE RELEASE-NOTES AUTHORS include README.rst -include electrum-zcash.conf.sample -include electrum-zcash.desktop +include electrum-zclassic.conf.sample +include electrum-zclassic.desktop include *.py -include electrum-zcash +include electrum-zclassic include contrib/requirements/requirements.txt include contrib/requirements/requirements-hw.txt recursive-include lib *.py diff --git a/README.rst b/README.rst index f4f96183..86ee018d 100644 --- a/README.rst +++ b/README.rst @@ -1,4 +1,4 @@ -Electrum-Zcash - Lightweight Zcash client +Electrum-Zclassic - Lightweight Zclassic client ===================================== :: @@ -6,11 +6,11 @@ Electrum-Zcash - Lightweight Zcash client Licence: MIT Licence Author: Thomas Voegtlin Language: Python - Homepage: https://github.com/zebra-lucky/electrum-zcash + Homepage: https://github.com/zebra-lucky/electrum-zclassic -.. image:: https://travis-ci.org/zebra-lucky/electrum-zcash.svg?branch=master - :target: https://travis-ci.org/zebra-lucky/electrum-zcash +.. image:: https://travis-ci.org/zebra-lucky/electrum-zclassic.svg?branch=master + :target: https://travis-ci.org/zebra-lucky/electrum-zclassic :alt: Build Status @@ -20,30 +20,30 @@ Electrum-Zcash - Lightweight Zcash client Getting started =============== -Electrum-Zcash is a pure python application. If you want to use the +Electrum-Zclassic is a pure python application. If you want to use the Qt interface, install the Qt dependencies:: sudo apt-get install python3-pyqt5 If you downloaded the official package (tar.gz), you can run -Electrum-Zcash from its root directory, without installing it on your +Electrum-Zclassic from its root directory, without installing it on your system; all the python dependencies are included in the 'packages' -directory. To run Electrum-Zcash from its root directory, just do:: +directory. To run Electrum-Zclassic from its root directory, just do:: - ./electrum-zcash + ./electrum-zclassic -You can also install Electrum-Zcash on your system, by running this command:: +You can also install Electrum-Zclassic on your system, by running this command:: sudo apt-get install python3-setuptools pip3 install .[full] This will download and install the Python dependencies used by -Electrum-Zcash, instead of using the 'packages' directory. +Electrum-Zclassic, 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-Zcash. Read the next section, "Development +before you can run Electrum-Zclassic. Read the next section, "Development Version". @@ -53,8 +53,8 @@ Development version Check out the code from GitHub:: - git clone git://github.com/zebra-lucky/electrum-zcash.git - cd electrum-zcash + git clone git://github.com/zebra-lucky/electrum-zclassic.git + cd electrum-zclassic Run install (this should install dependencies):: @@ -86,7 +86,7 @@ To create binaries, create the 'packages' directory:: ./contrib/make_packages -This directory contains the python dependencies used by Electrum-Zcash. +This directory contains the python dependencies used by Electrum-Zclassic. Android ------- diff --git a/contrib/sign-releases.py b/contrib/sign-releases.py index 4978795a..8a35310d 100755 --- a/contrib/sign-releases.py +++ b/contrib/sign-releases.py @@ -27,9 +27,9 @@ Manual signing: jarsigner -verbose \ -tsa http://sha256timestamp.ws.symantec.com/sha256/timestamp \ -sigalg SHA1withRSA -digestalg SHA1 \ - -sigfile zcash-electrum \ + -sigfile zclassic-electrum \ -keystore ~/.jks/keystore \ - Electrum_Zcash-3.0.6.1-release-unsigned.apk \ + Electrum_Zclassic-3.0.6.1-release-unsigned.apk \ electrum.z.cash Zipalign from Android SDK build tools is also required (set path to bin in @@ -48,8 +48,8 @@ settings file or with key -z). To install: Manual zip aligning: android-sdk-linux/build-tools/27.0.3/zipalign -v 4 \ - Electrum_Zcash-3.0.6.1-release-unsigned.apk \ - Electrum_Zcash-3.0.6.1-release.apk + Electrum_Zclassic-3.0.6.1-release-unsigned.apk \ + Electrum_Zclassic-3.0.6.1-release.apk @@ -143,9 +143,9 @@ PEP440_PUBVER_PATTERN = re.compile('^((\d+)!)?' '([a-zA-Z]+\d+)?' '((\.[a-zA-Z]+\d+)*)$') REL_NOTES_PATTERN = re.compile('^#.+?(^[^#].+?)^#.+?', re.M | re.S) -SDIST_NAME_PATTERN = re.compile('^Electrum-Zcash-(.*).tar.gz$') -SDIST_DIR_TEMPLATE = 'Electrum-Zcash-{version}' -PPA_SOURCE_NAME = 'electrum-zcash' +SDIST_NAME_PATTERN = re.compile('^Electrum-Zclassic-(.*).tar.gz$') +SDIST_DIR_TEMPLATE = 'Electrum-Zclassic-{version}' +PPA_SOURCE_NAME = 'electrum-zclassic' PPA_ORIG_NAME_TEMPLATE = '%s_{version}.orig.tar.gz' % PPA_SOURCE_NAME CHANGELOG_TEMPLATE = """%s ({ppa_version}) {series}; urgency=medium {changes} -- {uid} {time}""" % PPA_SOURCE_NAME @@ -164,12 +164,12 @@ JARSIGNER_ARGS = [ 'jarsigner', '-verbose', '-tsa', 'http://sha256timestamp.ws.symantec.com/sha256/timestamp', '-sigalg', 'SHA1withRSA', '-digestalg', 'SHA1', - '-sigfile', 'zcash-electrum', + '-sigfile', 'zclassic-electrum', '-storepass:env', JKS_STOREPASS, '-keypass:env', JKS_KEYPASS, ] -UNSIGNED_APK_PATTERN = re.compile('^Electrum_Zcash-(.*)-release-unsigned.apk$') -SIGNED_APK_TEMPLATE = 'Electrum_Zcash-{version}-release.apk' +UNSIGNED_APK_PATTERN = re.compile('^Electrum_Zclassic-(.*)-release-unsigned.apk$') +SIGNED_APK_TEMPLATE = 'Electrum_Zclassic-{version}-release.apk' os.environ['QUILT_PATCHES'] = 'debian/patches' diff --git a/contrib/zcash/travis/electrum_zcash_version_env.sh b/contrib/zcash/travis/electrum_zcash_version_env.sh deleted file mode 100755 index 79cc4f57..00000000 --- a/contrib/zcash/travis/electrum_zcash_version_env.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -VERSION_STRING=(`grep ELECTRUM_VERSION lib/version.py`) -ELECTRUM_ZCASH_VERSION=${VERSION_STRING[2]} -ELECTRUM_ZCASH_VERSION=${ELECTRUM_ZCASH_VERSION#\'} -ELECTRUM_ZCASH_VERSION=${ELECTRUM_ZCASH_VERSION%\'} -DOTS=`echo $ELECTRUM_ZCASH_VERSION | grep -o "\." | wc -l` -if [[ $DOTS -lt 3 ]]; then - ELECTRUM_ZCASH_APK_VERSION=$ELECTRUM_ZCASH_VERSION.0 -else - ELECTRUM_ZCASH_APK_VERSION=$ELECTRUM_ZCASH_VERSION -fi -export ELECTRUM_ZCASH_VERSION -export ELECTRUM_ZCASH_APK_VERSION diff --git a/contrib/zcash/btc2zcash.py b/contrib/zclassic/btc2zclassic.py similarity index 99% rename from contrib/zcash/btc2zcash.py rename to contrib/zclassic/btc2zclassic.py index c23f3f22..0090cb2b 100755 --- a/contrib/zcash/btc2zcash.py +++ b/contrib/zclassic/btc2zclassic.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -"""Search and replaces BTC addresses and private keys in WIF to Zcash variant""" +"""Search and replaces BTC addresses and private keys in WIF to Zclassic variant""" import click import imp diff --git a/contrib/zcash/deterministic.spec b/contrib/zclassic/deterministic.spec similarity index 82% rename from contrib/zcash/deterministic.spec rename to contrib/zclassic/deterministic.spec index b25f0bb5..4116f230 100644 --- a/contrib/zcash/deterministic.spec +++ b/contrib/zclassic/deterministic.spec @@ -38,12 +38,12 @@ hiddenimports += [ ] datas = [ - ('lib/servers.json', 'electrum_zcash'), - ('lib/servers_testnet.json', 'electrum_zcash'), - ('lib/servers_regtest.json', 'electrum_zcash'), - ('lib/currencies.json', 'electrum_zcash'), - ('lib/locale', 'electrum_zcash/locale'), - ('lib/wordlist', 'electrum_zcash/wordlist'), + ('lib/servers.json', 'electrum_zclassic'), + ('lib/servers_testnet.json', 'electrum_zclassic'), + ('lib/servers_regtest.json', 'electrum_zclassic'), + ('lib/currencies.json', 'electrum_zclassic'), + ('lib/locale', 'electrum_zclassic/locale'), + ('lib/wordlist', 'electrum_zclassic/wordlist'), ('C:\\zbarw', '.'), ] datas += collect_data_files('trezorlib') @@ -88,7 +88,7 @@ excludes += [ 'PyQt5.QtWinExtras', ] -a = Analysis(['electrum-zcash'], +a = Analysis(['electrum-zclassic'], pathex=['plugins'], hiddenimports=hiddenimports, datas=datas, @@ -102,14 +102,14 @@ for d in a.datas: a.datas.remove(d) break -# Add TOC to electrum_zcash, electrum_zcash_gui, electrum_zcash_plugins +# Add TOC to electrum_zclassic, electrum_zclassic_gui, electrum_zclassic_plugins for p in sorted(a.pure): if p[0].startswith('lib') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash%s' % p[0][3:] , p[1], p[2])] + a.pure += [('electrum_zclassic%s' % p[0][3:] , p[1], p[2])] if p[0].startswith('gui') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash_gui%s' % p[0][3:] , p[1], p[2])] + a.pure += [('electrum_zclassic_gui%s' % p[0][3:] , p[1], p[2])] if p[0].startswith('plugins') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash_plugins%s' % p[0][7:] , p[1], p[2])] + a.pure += [('electrum_zclassic_plugins%s' % p[0][7:] , p[1], p[2])] pyz = PYZ(a.pure) @@ -120,7 +120,7 @@ exe = EXE(pyz, strip=False, upx=False, console=False, - icon='icons/electrum-zcash.ico', + icon='icons/electrum-zclassic.ico', name=os.path.join('build\\pyi.win32\\electrum', cmdline_name)) # exe with console output @@ -131,7 +131,7 @@ conexe = EXE(pyz, strip=False, upx=False, console=True, - icon='icons/electrum-zcash.ico', + icon='icons/electrum-zclassic.ico', name=os.path.join('build\\pyi.win32\\electrum', 'console-%s' % cmdline_name)) @@ -157,4 +157,4 @@ coll = COLLECT(exe, conexe, tctl_exe, a.datas, strip=False, upx=False, - name=os.path.join('dist', 'electrum-zcash')) + name=os.path.join('dist', 'electrum-zclassic')) diff --git a/contrib/zcash/electrum-zcash.nsi b/contrib/zclassic/electrum-zclassic.nsi similarity index 85% rename from contrib/zcash/electrum-zcash.nsi rename to contrib/zclassic/electrum-zclassic.nsi index 7e742048..ed9ca1c3 100644 --- a/contrib/zcash/electrum-zcash.nsi +++ b/contrib/zclassic/electrum-zclassic.nsi @@ -3,12 +3,12 @@ !include "TextFunc.nsh" ;Needed for the $GetSize function. I know, doesn't sound logical, it isn't. !include "MUI2.nsh" !include "x64.nsh" - + ;-------------------------------- ;Variables - !define PRODUCT_NAME "Electrum-Zcash" - !define PRODUCT_WEB_SITE "https://github.com/zebra-lucky/electrum-zcash" + !define PRODUCT_NAME "Electrum-Zclassic" + !define PRODUCT_WEB_SITE "https://github.com/zebra-lucky/electrum-zclassic" !define PRODUCT_PUBLISHER "Electrum Technologies GmbH" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define BUILD_ARCH "${WINEARCH}" @@ -18,7 +18,7 @@ ;Name and file Name "${PRODUCT_NAME}" - OutFile "dist/electrum-zcash-${PRODUCT_VERSION}-setup-${BUILD_ARCH}.exe" + OutFile "dist/electrum-zclassic-${PRODUCT_VERSION}-setup-${BUILD_ARCH}.exe" ;Default installation folder InstallDir "$PROGRAMFILES\${PRODUCT_NAME}" @@ -31,31 +31,31 @@ ;Specifies whether or not the installer will perform a CRC on itself before allowing an install CRCCheck on - + ;Sets whether or not the details of the install are shown. Can be 'hide' (the default) to hide the details by default, allowing the user to view them, or 'show' to show them by default, or 'nevershow', to prevent the user from ever seeing them. ShowInstDetails show - + ;Sets whether or not the details of the uninstall are shown. Can be 'hide' (the default) to hide the details by default, allowing the user to view them, or 'show' to show them by default, or 'nevershow', to prevent the user from ever seeing them. ShowUninstDetails show - + ;Sets the colors to use for the install info screen (the default is 00FF00 000000. Use the form RRGGBB (in hexadecimal, as in HTML, only minus the leading '#', since # can be used for comments). Note that if "/windows" is specified as the only parameter, the default windows colors will be used. InstallColors /windows - + ;This command sets the compression algorithm used to compress files/data in the installer. (http://nsis.sourceforge.net/Reference/SetCompressor) SetCompressor /SOLID lzma - + ;Sets the dictionary size in megabytes (MB) used by the LZMA compressor (default is 8 MB). SetCompressorDictSize 64 - + ;Sets the text that is shown (by default it is 'Nullsoft Install System vX.XX') in the bottom of the install window. Setting this to an empty string ("") uses the default; to set the string to blank, use " " (a space). - BrandingText "${PRODUCT_NAME} Installer v${PRODUCT_VERSION}" - + BrandingText "${PRODUCT_NAME} Installer v${PRODUCT_VERSION}" + ;Sets what the titlebars of the installer will display. By default, it is 'Name Setup', where Name is specified with the Name command. You can, however, override it with 'MyApp Installer' or whatever. If you specify an empty string (""), the default will be used (you can however specify " " to achieve a blank string) Caption "${PRODUCT_NAME}" ;Adds the Product Version on top of the Version Tab in the Properties of the file. VIProductVersion 1.0.0.0 - + ;VIAddVersionKey - Adds a field in the Version Tab of the File Properties. This can either be a field provided by the system or a user defined field. VIAddVersionKey ProductName "${PRODUCT_NAME} Installer" VIAddVersionKey Comments "The installer for ${PRODUCT_NAME}" @@ -65,7 +65,7 @@ VIAddVersionKey FileVersion ${PRODUCT_VERSION} VIAddVersionKey ProductVersion ${PRODUCT_VERSION} VIAddVersionKey InternalName "${PRODUCT_NAME} Installer" - VIAddVersionKey LegalTrademarks "${PRODUCT_NAME} is a trademark of ${PRODUCT_PUBLISHER}" + VIAddVersionKey LegalTrademarks "${PRODUCT_NAME} is a trademark of ${PRODUCT_PUBLISHER}" VIAddVersionKey OriginalFilename "${PRODUCT_NAME}.exe" ;-------------------------------- @@ -73,9 +73,9 @@ !define MUI_ABORTWARNING !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?" - - !define MUI_ICON "icons\electrum-zcash.ico" - + + !define MUI_ICON "icons\electrum-zclassic.ico" + ;-------------------------------- ;Pages @@ -122,8 +122,8 @@ Section Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*" ;Files to pack into the installer - File /r "dist\electrum-zcash\*.*" - File "icons\electrum-zcash.ico" + File /r "dist\electrum-zclassic\*.*" + File "icons\electrum-zclassic.ico" ;Store installation folder WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR @@ -134,21 +134,21 @@ Section ;Create desktop shortcut DetailPrint "Creating desktop shortcut..." - CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe" "" + CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe" "" ;Create start-menu items DetailPrint "Creating start-menu items..." CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe" 0 - CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe" 0 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe" 0 - ;Links zcash: URI's to Electrum - WriteRegStr HKCU "Software\Classes\zcash" "" "URL:zcash Protocol" - WriteRegStr HKCU "Software\Classes\zcash" "URL Protocol" "" - WriteRegStr HKCU "Software\Classes\zcash" "DefaultIcon" "$\"$INSTDIR\electrum-zcash.ico, 0$\"" - WriteRegStr HKCU "Software\Classes\zcash\shell\open\command" "" "$\"$INSTDIR\electrum-zcash-${PRODUCT_VERSION}.exe$\" $\"%1$\"" + ;Links zclassic: URI's to Electrum + WriteRegStr HKCU "Software\Classes\zclassic" "" "URL:zclassic Protocol" + WriteRegStr HKCU "Software\Classes\zclassic" "URL Protocol" "" + WriteRegStr HKCU "Software\Classes\zclassic" "DefaultIcon" "$\"$INSTDIR\electrum-zclassic.ico, 0$\"" + WriteRegStr HKCU "Software\Classes\zclassic\shell\open\command" "" "$\"$INSTDIR\electrum-zclassic-${PRODUCT_VERSION}.exe$\" $\"%1$\"" ;Adds an uninstaller possibility to Windows Uninstall or change a program section WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" @@ -156,7 +156,7 @@ Section WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrum-zcash.ico" + WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\electrum-zclassic.ico" ;Fixes Windows broken size estimates ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 @@ -178,8 +178,8 @@ Section "Uninstall" Delete "$DESKTOP\${PRODUCT_NAME}.lnk" Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*" RMDir "$SMPROGRAMS\${PRODUCT_NAME}" - - DeleteRegKey HKCU "Software\Classes\zcash" + + DeleteRegKey HKCU "Software\Classes\zclassic" DeleteRegKey HKCU "Software\${PRODUCT_NAME}" DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}" SectionEnd diff --git a/contrib/zcash/osx.spec b/contrib/zclassic/osx.spec similarity index 76% rename from contrib/zcash/osx.spec rename to contrib/zclassic/osx.spec index 9d43e2f9..766a4fbb 100644 --- a/contrib/zcash/osx.spec +++ b/contrib/zclassic/osx.spec @@ -42,12 +42,12 @@ hiddenimports += [ ] datas = [ - ('lib/servers.json', 'electrum_zcash'), - ('lib/servers_testnet.json', 'electrum_zcash'), - ('lib/servers_regtest.json', 'electrum_zcash'), - ('lib/currencies.json', 'electrum_zcash'), - ('lib/locale', 'electrum_zcash/locale'), - ('lib/wordlist', 'electrum_zcash/wordlist'), + ('lib/servers.json', 'electrum_zclassic'), + ('lib/servers_testnet.json', 'electrum_zclassic'), + ('lib/servers_regtest.json', 'electrum_zclassic'), + ('lib/currencies.json', 'electrum_zclassic'), + ('lib/locale', 'electrum_zclassic/locale'), + ('lib/wordlist', 'electrum_zclassic/wordlist'), ] datas += collect_data_files('trezorlib') datas += collect_data_files('btchip') @@ -91,7 +91,7 @@ excludes += [ 'PyQt5.QtWinExtras', ] -a = Analysis(['electrum-zcash'], +a = Analysis(['electrum-zclassic'], pathex=['plugins'], hiddenimports=hiddenimports, datas=datas, @@ -105,14 +105,14 @@ for d in a.datas: a.datas.remove(d) break -# Add TOC to electrum_zcash, electrum_zcash_gui, electrum_zcash_plugins +# Add TOC to electrum_zclassic, electrum_zclassic_gui, electrum_zclassic_plugins for p in sorted(a.pure): if p[0].startswith('lib') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash%s' % p[0][3:] , p[1], p[2])] + a.pure += [('electrum_zclassic%s' % p[0][3:] , p[1], p[2])] if p[0].startswith('gui') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash_gui%s' % p[0][3:] , p[1], p[2])] + a.pure += [('electrum_zclassic_gui%s' % p[0][3:] , p[1], p[2])] if p[0].startswith('plugins') and p[2] == 'PYMODULE': - a.pure += [('electrum_zcash_plugins%s' % p[0][7:] , p[1], p[2])] + a.pure += [('electrum_zclassic_plugins%s' % p[0][7:] , p[1], p[2])] pyz = PYZ(a.pure) @@ -123,8 +123,8 @@ exe = EXE(pyz, strip=False, upx=False, console=False, - icon='icons/electrum-zcash.ico', - name=os.path.join('build/electrum-zcash/electrum-zcash', cmdline_name)) + icon='icons/electrum-zclassic.ico', + name=os.path.join('build/electrum-zclassic/electrum-zclassic', cmdline_name)) # trezorctl separate bin tctl_a = Analysis([os.path.join(PY36BINDIR, 'trezorctl')], @@ -141,17 +141,17 @@ tctl_exe = EXE(tctl_pyz, strip=False, upx=False, console=True, - name=os.path.join('build/electrum-zcash/electrum-zcash', 'trezorctl.bin')) + name=os.path.join('build/electrum-zclassic/electrum-zclassic', 'trezorctl.bin')) coll = COLLECT(exe, tctl_exe, a.binaries, a.datas, strip=False, upx=False, - name=os.path.join('dist', 'electrum-zcash')) + name=os.path.join('dist', 'electrum-zclassic')) app = BUNDLE(coll, - name=os.path.join('dist', 'Electrum-Zcash.app'), - appname="Electrum-Zcash", - icon='electrum-zcash.icns', + name=os.path.join('dist', 'Electrum-Zclassic.app'), + appname="Electrum-Zclassic", + icon='electrum-zclassic.icns', version = 'ELECTRUM_VERSION') diff --git a/contrib/zcash/pyi_runtimehook.py b/contrib/zclassic/pyi_runtimehook.py similarity index 98% rename from contrib/zcash/pyi_runtimehook.py rename to contrib/zclassic/pyi_runtimehook.py index 23ee14ad..f5e98ec4 100644 --- a/contrib/zcash/pyi_runtimehook.py +++ b/contrib/zclassic/pyi_runtimehook.py @@ -23,7 +23,7 @@ def _new_load_module(name, file, pathname, description): imp.load_module = _new_load_module -PLUGINS_PREFIX = 'electrum_zcash_plugins' +PLUGINS_PREFIX = 'electrum_zclassic_plugins' KEYSTORE_PLUGINS = [ 'hw_wallet', diff --git a/contrib/zcash/pyi_tctl_runtimehook.py b/contrib/zclassic/pyi_tctl_runtimehook.py similarity index 100% rename from contrib/zcash/pyi_tctl_runtimehook.py rename to contrib/zclassic/pyi_tctl_runtimehook.py diff --git a/contrib/zcash/requirements.txt b/contrib/zclassic/requirements.txt similarity index 100% rename from contrib/zcash/requirements.txt rename to contrib/zclassic/requirements.txt diff --git a/contrib/zcash/travis/Dockerfile-kivy b/contrib/zclassic/travis/Dockerfile-kivy similarity index 100% rename from contrib/zcash/travis/Dockerfile-kivy rename to contrib/zclassic/travis/Dockerfile-kivy diff --git a/contrib/zcash/travis/Dockerfile-linux b/contrib/zclassic/travis/Dockerfile-linux similarity index 100% rename from contrib/zcash/travis/Dockerfile-linux rename to contrib/zclassic/travis/Dockerfile-linux diff --git a/contrib/zcash/travis/Dockerfile-wine b/contrib/zclassic/travis/Dockerfile-wine similarity index 100% rename from contrib/zcash/travis/Dockerfile-wine rename to contrib/zclassic/travis/Dockerfile-wine diff --git a/contrib/zcash/travis/before_install-linux-apk.sh b/contrib/zclassic/travis/before_install-linux-apk.sh similarity index 100% rename from contrib/zcash/travis/before_install-linux-apk.sh rename to contrib/zclassic/travis/before_install-linux-apk.sh diff --git a/contrib/zcash/travis/before_install-linux.sh b/contrib/zclassic/travis/before_install-linux.sh similarity index 100% rename from contrib/zcash/travis/before_install-linux.sh rename to contrib/zclassic/travis/before_install-linux.sh diff --git a/contrib/zcash/travis/before_install-osx.sh b/contrib/zclassic/travis/before_install-osx.sh similarity index 100% rename from contrib/zcash/travis/before_install-osx.sh rename to contrib/zclassic/travis/before_install-osx.sh diff --git a/contrib/zcash/travis/build_linux.sh b/contrib/zclassic/travis/build_linux.sh similarity index 100% rename from contrib/zcash/travis/build_linux.sh rename to contrib/zclassic/travis/build_linux.sh diff --git a/contrib/zcash/travis/build_wine.sh b/contrib/zclassic/travis/build_wine.sh similarity index 63% rename from contrib/zcash/travis/build_wine.sh rename to contrib/zclassic/travis/build_wine.sh index cd0e5763..7f9c495f 100755 --- a/contrib/zcash/travis/build_wine.sh +++ b/contrib/zclassic/travis/build_wine.sh @@ -1,17 +1,17 @@ #!/bin/bash -source ./contrib/zcash/travis/electrum_zcash_version_env.sh; -echo wine build version is $ELECTRUM_ZCASH_VERSION +source ./contrib/zclassic/travis/electrum_zclassic_version_env.sh; +echo wine build version is $ELECTRUM_ZCL_VERSION mv /opt/zbarw $WINEPREFIX/drive_c/ -cd $WINEPREFIX/drive_c/electrum-zcash +cd $WINEPREFIX/drive_c/electrum-zclassic rm -rf build -rm -rf dist/electrum-zcash +rm -rf dist/electrum-zclassic -cp contrib/zcash/deterministic.spec . -cp contrib/zcash/pyi_runtimehook.py . -cp contrib/zcash/pyi_tctl_runtimehook.py . +cp contrib/zclassic/deterministic.spec . +cp contrib/zclassic/pyi_runtimehook.py . +cp contrib/zclassic/pyi_tctl_runtimehook.py . wine pip install --upgrade pip export PYINSTALLER_TAG=dev180610 @@ -20,7 +20,7 @@ wine pip install $PYINSTALLER_TAG.tar.gz rm $PYINSTALLER_TAG.tar.gz wine pip install eth-hash==0.1.2 -wine pip install -r contrib/zcash/requirements.txt +wine pip install -r contrib/zclassic/requirements.txt wine pip install x11_hash wine pip install cython @@ -34,7 +34,7 @@ mkdir $WINEPREFIX/drive_c/Qt ln -s $PYHOME/Lib/site-packages/PyQt5/ $WINEPREFIX/drive_c/Qt/5.5.1 wine pyinstaller -y \ - --name electrum-zcash-$ELECTRUM_ZCASH_VERSION.exe \ + --name electrum-zclassic-$ELECTRUM_ZCL_VERSION.exe \ deterministic.spec if [[ $WINEARCH == win32 ]]; then @@ -44,6 +44,6 @@ else fi wine "$NSIS_EXE" /NOCD -V3 \ - /DPRODUCT_VERSION=$ELECTRUM_ZCASH_VERSION \ + /DPRODUCT_VERSION=$ELECTRUM_ZCL_VERSION \ /DWINEARCH=$WINEARCH \ - contrib/zcash/electrum-zcash.nsi + contrib/zclassic/electrum-zclassic.nsi diff --git a/contrib/zclassic/travis/electrum_zclassic_version_env.sh b/contrib/zclassic/travis/electrum_zclassic_version_env.sh new file mode 100755 index 00000000..387c70d6 --- /dev/null +++ b/contrib/zclassic/travis/electrum_zclassic_version_env.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +VERSION_STRING=(`grep ELECTRUM_VERSION lib/version.py`) +ELECTRUM_ZCL_VERSION=${VERSION_STRING[2]} +ELECTRUM_ZCL_VERSION=${ELECTRUM_ZCL_VERSION#\'} +ELECTRUM_ZCL_VERSION=${ELECTRUM_ZCL_VERSION%\'} +DOTS=`echo $ELECTRUM_ZCL_VERSION | grep -o "\." | wc -l` +if [[ $DOTS -lt 3 ]]; then + ELECTRUM_ZCL_APK_VERSION=$ELECTRUM_ZCL_VERSION.0 +else + ELECTRUM_ZCL_APK_VERSION=$ELECTRUM_ZCL_VERSION +fi +export ELECTRUM_ZCL_VERSION +export ELECTRUM_ZCL_APK_VERSION diff --git a/contrib/zcash/travis/travis-build-linux-apk.sh b/contrib/zclassic/travis/travis-build-linux-apk.sh similarity index 62% rename from contrib/zcash/travis/travis-build-linux-apk.sh rename to contrib/zclassic/travis/travis-build-linux-apk.sh index 33daa83b..3d18c876 100755 --- a/contrib/zcash/travis/travis-build-linux-apk.sh +++ b/contrib/zclassic/travis/travis-build-linux-apk.sh @@ -6,23 +6,23 @@ if [[ -z $TRAVIS_TAG ]]; then exit 1 fi -BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zcash +BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic cd build -git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zcash +git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zclassic docker run --rm \ -v $(pwd):/opt \ - -w /opt/electrum-zcash \ + -w /opt/electrum-zclassic \ -t zebralucky/electrum-dash-winebuild:Linux /opt/build_linux.sh sudo find . -name '*.po' -delete sudo find . -name '*.pot' -delete -sudo chown -R 1000 electrum-zcash +sudo chown -R 1000 electrum-zclassic docker run --rm \ - -v $(pwd)/electrum-zcash:/home/buildozer/build \ + -v $(pwd)/electrum-zclassic:/home/buildozer/build \ -t zebralucky/electrum-dash-winebuild:Kivy bash -c \ 'rm -rf packages && ./contrib/make_packages && ./contrib/make_apk' diff --git a/contrib/zcash/travis/travis-build-linux.sh b/contrib/zclassic/travis/travis-build-linux.sh similarity index 76% rename from contrib/zcash/travis/travis-build-linux.sh rename to contrib/zclassic/travis/travis-build-linux.sh index 32bb0c68..f03600be 100755 --- a/contrib/zcash/travis/travis-build-linux.sh +++ b/contrib/zclassic/travis/travis-build-linux.sh @@ -6,15 +6,15 @@ if [[ -z $TRAVIS_TAG ]]; then exit 1 fi -BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zcash +BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic cd build -git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zcash +git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zclassic docker run --rm \ -v $(pwd):/opt \ - -w /opt/electrum-zcash \ + -w /opt/electrum-zclassic \ -t zebralucky/electrum-dash-winebuild:Linux /opt/build_linux.sh sudo find . -name '*.po' -delete @@ -34,8 +34,8 @@ docker run --rm \ -e WINEPREFIX=$WINEPREFIX \ -e PYHOME=$PYHOME \ -v $(pwd):/opt \ - -v $(pwd)/electrum-zcash/:$WINEPREFIX/drive_c/electrum-zcash \ - -w /opt/electrum-zcash \ + -v $(pwd)/electrum-zclassic/:$WINEPREFIX/drive_c/electrum-zclassic \ + -w /opt/electrum-zclassic \ -t zebralucky/electrum-dash-winebuild:Wine /opt/build_wine.sh export WINEARCH=win64 @@ -50,6 +50,6 @@ docker run --rm \ -e WINEPREFIX=$WINEPREFIX \ -e PYHOME=$PYHOME \ -v $(pwd):/opt \ - -v $(pwd)/electrum-zcash/:$WINEPREFIX/drive_c/electrum-zcash \ - -w /opt/electrum-zcash \ + -v $(pwd)/electrum-zclassic/:$WINEPREFIX/drive_c/electrum-zclassic \ + -w /opt/electrum-zclassic \ -t zebralucky/electrum-dash-winebuild:Wine /opt/build_wine.sh diff --git a/contrib/zcash/travis/travis-build-osx.sh b/contrib/zclassic/travis/travis-build-osx.sh similarity index 51% rename from contrib/zcash/travis/travis-build-osx.sh rename to contrib/zclassic/travis/travis-build-osx.sh index 00e3242a..92198c5e 100755 --- a/contrib/zcash/travis/travis-build-osx.sh +++ b/contrib/zclassic/travis/travis-build-osx.sh @@ -6,18 +6,18 @@ if [[ -z $TRAVIS_TAG ]]; then exit 1 fi -BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zcash +BUILD_REPO_URL=https://github.com/zebra-lucky/electrum-zclassic cd build -git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zcash +git clone --branch $TRAVIS_TAG $BUILD_REPO_URL electrum-zclassic -cd electrum-zcash +cd electrum-zclassic export PY36BINDIR=/Library/Frameworks/Python.framework/Versions/3.6/bin/ export PATH=$PATH:$PY36BINDIR -source ./contrib/zcash/travis/electrum_zcash_version_env.sh; -echo wine build version is $ELECTRUM_ZCASH_VERSION +source ./contrib/zclassic/travis/electrum_zclassic_version_env.sh; +echo wine build version is $ELECTRUM_ZCL_VERSION sudo pip3 install --upgrade pip sudo pip3 install -r contrib/deterministic-build/requirements.txt @@ -35,15 +35,15 @@ export PATH="/usr/local/opt/gettext/bin:$PATH" find . -name '*.po' -delete find . -name '*.pot' -delete -cp contrib/zcash/osx.spec . -cp contrib/zcash/pyi_runtimehook.py . -cp contrib/zcash/pyi_tctl_runtimehook.py . +cp contrib/zclassic/osx.spec . +cp contrib/zclassic/pyi_runtimehook.py . +cp contrib/zclassic/pyi_tctl_runtimehook.py . pyinstaller \ -y \ - --name electrum-zcash-$ELECTRUM_ZCASH_VERSION.bin \ + --name electrum-zclassic-$ELECTRUM_ZCL_VERSION.bin \ osx.spec -sudo hdiutil create -fs HFS+ -volname "Electrum-Zcash" \ - -srcfolder dist/Electrum-Zcash.app \ - dist/electrum-zcash-$ELECTRUM_ZCASH_VERSION-macosx.dmg +sudo hdiutil create -fs HFS+ -volname "Electrum-Zclassic" \ + -srcfolder dist/Electrum-Zclassic.app \ + dist/electrum-zclassic-$ELECTRUM_ZCL_VERSION-macosx.dmg diff --git a/debian/changelog b/debian/changelog index 78b8fce6..d9b3c86f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -electrum-zcash (3.1.3~rc2-0ppa1~ubuntu18.04.1) bionic; urgency=medium +electrum-zclassic (3.1.3~rc2-0ppa1~ubuntu18.04.1) bionic; urgency=medium * Port to ppa diff --git a/debian/control b/debian/control index f993f002..18d34780 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: electrum-zcash +Source: electrum-zclassic Section: utils Priority: optional Maintainer: Maksym Yuzhakov @@ -19,10 +19,10 @@ Build-Depends: python3-socks (>= 1.6.5), python3-pyblake2 (>=0.9.3), Standards-Version: 4.1.3 -Homepage: https://github.com/zebra-lucky/electrum-zcash +Homepage: https://github.com/zebra-lucky/electrum-zclassic X-Python3-Version: >= 3.4 -Package: python3-electrum-zcash +Package: python3-electrum-zclassic Architecture: all Section: python Depends: @@ -33,29 +33,29 @@ Depends: python3-btchip (>= 0.1.26), ${misc:Depends}, ${python3:Depends}, -Description: Easy to use Zcash client - Python module - This package provides a lightweight Zcash client which protects - you from losing your Zcash coins in a backup mistake or computer - failure. Also, Electrum-Zcash does not require waiting time because it does - not download the Zcash blockchain. +Description: Easy to use Zclassic client - Python module + This package provides a lightweight Zclassic client which protects + you from losing your Zclassic coins in a backup mistake or computer + failure. Also, Electrum-Zclassic does not require waiting time because it does + not download the Zclassic blockchain. . - This package provides the "electrum_zcash" Python 3 module which can be used - to access a Zcash wallet from Python programs. + This package provides the "electrum_zclassic" Python 3 module which can be used + to access a Zclassic wallet from Python programs. -Package: electrum-zcash +Package: electrum-zclassic Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - python3-electrum-zcash (= ${binary:Version}), + python3-electrum-zclassic (= ${binary:Version}), Recommends: python3-pyqt5 -Description: Easy to use Zcash client - This package provides a lightweight Zcash client which protects - you from losing your Zcash coins in a backup mistake or computer - failure. Also, Electrum-Zcash does not require waiting time because it does - not download the Zcash blockchain. +Description: Easy to use Zclassic client + This package provides a lightweight Zclassic client which protects + you from losing your Zclassic coins in a backup mistake or computer + failure. Also, Electrum-Zclassic does not require waiting time because it does + not download the Zclassic blockchain. . - Features of Electrum-Zcash: + Features of Electrum-Zclassic: . * Instant on: Your client does not download the blockchain. It uses a network of specialized servers that index the blockchain. @@ -70,7 +70,7 @@ Description: Easy to use Zcash client will synchronize automatically. * Cold Storage: Sign transactions from a computer that is always offline. Broadcast them using a machine that does not have your keys. - * Reachable: You can export your private keys into other Zcash + * Reachable: You can export your private keys into other Zclassic clients. - * Established: Electrum-Zcash is open source and was first released in + * Established: Electrum-Zclassic is open source and was first released in November 2011. diff --git a/debian/copyright b/debian/copyright index f8152d0c..d4abdf5e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: electrum-zcash -Source: https://github.com/zebra-lucky/electrum-zcash/ +Upstream-Name: electrum-zclassic +Source: https://github.com/zebra-lucky/electrum-zclassic/ Files: * Copyright: Electrum Team diff --git a/debian/electrum-zcash.manpages b/debian/electrum-zcash.manpages deleted file mode 100644 index d74282cd..00000000 --- a/debian/electrum-zcash.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/electrum-zcash.1 diff --git a/debian/electrum-zcash.1 b/debian/electrum-zclassic.1 similarity index 80% rename from debian/electrum-zcash.1 rename to debian/electrum-zclassic.1 index c1f448a2..c02c1623 100644 --- a/debian/electrum-zcash.1 +++ b/debian/electrum-zclassic.1 @@ -1,17 +1,17 @@ -.TH electrum-zcash 1 "23 June 2013" "electrum-zcash" +.TH electrum-zclassic 1 "23 June 2013" "electrum-zclassic" .SH NAME -electrum-zcash \- Lightweight Zcash client +electrum-zclassic \- Lightweight Zclassic client .SH SYNOPSIS -.B electrum-zcash [options] command [options] +.B electrum-zclassic [options] command [options] .SH DESCRIPTION .PP -Electrum-Zcash is a lightweight Zcash client. +Electrum-Zclassic is a lightweight Zclassic client. .br -Electrum-Zcash protects from losing zcash coins in a backup mistake or computer +Electrum-Zclassic protects from losing zclassic coins in a backup mistake or computer failure. It allows recovery of wallet from a passphrase which you can learn by heart or write it down on a paper. .br -Since electrum-zcash does not download the entire blockchain there +Since electrum-zclassic does not download the entire blockchain there is no waiting time when the client is started. .TP @@ -66,7 +66,7 @@ default language used in GUI \fB\-u, \-\-usb\fR Turn on support for hardware wallets (EXPERIMENTAL). .SH AUTHORS -Electrum-Zcash client was initially written by ThomasV +Electrum-Zclassic client was initially written by ThomasV <\fIthomasv@gitorious\fR> .br This manual page was written by Vasudev Kamath diff --git a/debian/electrum-zclassic.manpages b/debian/electrum-zclassic.manpages new file mode 100644 index 00000000..79d1df8e --- /dev/null +++ b/debian/electrum-zclassic.manpages @@ -0,0 +1 @@ +debian/electrum-zclassic.1 diff --git a/debian/patches/fix-keepkey-with-trezor.diff b/debian/patches/fix-keepkey-with-trezor.diff index 711a1675..586348cd 100644 --- a/debian/patches/fix-keepkey-with-trezor.diff +++ b/debian/patches/fix-keepkey-with-trezor.diff @@ -1,13 +1,13 @@ -Index: electrum-zcash/electrum-zcash +Index: electrum-zclassic/electrum-zclassic =================================================================== ---- electrum-zcash.orig/electrum-zcash 2018-06-12 22:15:35.699293303 +0300 -+++ electrum-zcash/electrum-zcash 2018-06-12 22:20:02.122480853 +0300 +--- electrum-zclassic.orig/electrum-zclassic 2018-06-12 22:15:35.699293303 +0300 ++++ electrum-zclassic/electrum-zclassic 2018-06-12 22:20:02.122480853 +0300 @@ -26,6 +26,8 @@ import os import sys - + +os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION']='python' + 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-zcash.desktop")) + is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "electrum-zclassic.desktop")) diff --git a/debian/rules b/debian/rules index 49e185e9..1d9d5b47 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export PYBUILD_NAME=electrum-zcash +export PYBUILD_NAME=electrum-zclassic %: dh $@ --with python3 --buildsystem=pybuild @@ -14,11 +14,11 @@ override_dh_auto_build:: override_dh_auto_install:: dh_auto_install - mkdir -p debian/electrum-zcash/usr/bin \ - debian/electrum-zcash/usr/share - mv debian/python3-electrum-zcash/usr/bin \ - debian/electrum-zcash/usr - mv debian/python3-electrum-zcash/usr/share/applications \ - debian/electrum-zcash/usr/share - mv debian/python3-electrum-zcash/usr/share/pixmaps \ - debian/electrum-zcash/usr/share + mkdir -p debian/electrum-zclassic/usr/bin \ + debian/electrum-zclassic/usr/share + mv debian/python3-electrum-zclassic/usr/bin \ + debian/electrum-zclassic/usr + mv debian/python3-electrum-zclassic/usr/share/applications \ + debian/electrum-zclassic/usr/share + mv debian/python3-electrum-zclassic/usr/share/pixmaps \ + debian/electrum-zclassic/usr/share diff --git a/electrum-zcash.desktop b/electrum-zcash.desktop deleted file mode 100644 index b13847de..00000000 --- a/electrum-zcash.desktop +++ /dev/null @@ -1,21 +0,0 @@ -# If you want Electrum-Zcash to appear in a Linux app launcher ("start menu"), install this by doing: -# sudo desktop-file-install electrum-zcash.desktop - -[Desktop Entry] -Comment=Lightweight Zcash Client -Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum-zcash %u" -GenericName[en_US]=Zcash Wallet -GenericName=Zcash Wallet -Icon=electrum-zcash.png -Name[en_US]=Electrum-Zcash Bitcoin Wallet -Name=Electrum-Zcash Bitcoin Wallet -Categories=Finance;Network; -StartupNotify=false -Terminal=false -Type=Application -MimeType=x-scheme-handler/zcash; -Actions=Testnet; - -[Desktop Action Testnet] -Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum-zcash --testnet %u" -Name=Testnet mode diff --git a/electrum-zcash b/electrum-zclassic similarity index 92% rename from electrum-zcash rename to electrum-zclassic index 9010ff8d..e30cfe48 100755 --- a/electrum-zcash +++ b/electrum-zclassic @@ -28,7 +28,7 @@ import sys 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-zcash.desktop")) +is_local = not is_bundle and os.path.exists(os.path.join(script_dir, "electrum-zclassic.desktop")) is_android = 'ANDROID_DATA' in os.environ # move this back to gui/kivy/__init.py once plugins are moved @@ -67,24 +67,24 @@ if not is_android: # load local module as electrum if is_local or is_android: import imp - imp.load_module('electrum_zcash', *imp.find_module('lib')) - imp.load_module('electrum_zcash_gui', *imp.find_module('gui')) - imp.load_module('electrum_zcash_plugins', *imp.find_module('plugins')) + imp.load_module('electrum_zclassic', *imp.find_module('lib')) + imp.load_module('electrum_zclassic_gui', *imp.find_module('gui')) + imp.load_module('electrum_zclassic_plugins', *imp.find_module('plugins')) -from electrum_zcash import bitcoin, util -from electrum_zcash import constants -from electrum_zcash import SimpleConfig, Network -from electrum_zcash.wallet import Wallet, Imported_Wallet -from electrum_zcash.storage import WalletStorage, get_derivation_used_for_hw_device_encryption -from electrum_zcash.util import print_msg, print_stderr, json_encode, json_decode, UserCancelled -from electrum_zcash.util import set_verbosity, InvalidPassword -from electrum_zcash.commands import get_parser, known_commands, Commands, config_variables -from electrum_zcash import daemon -from electrum_zcash import keystore -from electrum_zcash.mnemonic import Mnemonic -import electrum_zcash_plugins +from electrum_zclassic import bitcoin, util +from electrum_zclassic import constants +from electrum_zclassic import SimpleConfig, Network +from electrum_zclassic.wallet import Wallet, Imported_Wallet +from electrum_zclassic.storage import WalletStorage, get_derivation_used_for_hw_device_encryption +from electrum_zclassic.util import print_msg, print_stderr, json_encode, json_decode, UserCancelled +from electrum_zclassic.util import set_verbosity, InvalidPassword +from electrum_zclassic.commands import get_parser, known_commands, Commands, config_variables +from electrum_zclassic import daemon +from electrum_zclassic import keystore +from electrum_zclassic.mnemonic import Mnemonic +import electrum_zclassic_plugins # get password routine def prompt_password(prompt, confirm=True): @@ -178,7 +178,7 @@ def init_daemon(config_options): storage = WalletStorage(config.get_wallet_path()) if not storage.file_exists(): print_msg("Error: Wallet file not found.") - print_msg("Type 'electrum-zcash create' to create a new wallet, or provide a path to a wallet with the -w option") + print_msg("Type 'electrum-zclassic 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(): @@ -216,7 +216,7 @@ def init_cmdline(config_options, server): if cmd.requires_wallet and not storage.file_exists(): print_msg("Error: Wallet file not found.") - print_msg("Type 'electrum-zcash create' to create a new wallet, or provide a path to a wallet with the -w option") + print_msg("Type 'electrum-zclassic create' to create a new wallet, or provide a path to a wallet with the -w option") sys.exit(0) # important warning @@ -329,7 +329,7 @@ def run_offline_command(config, config_options, plugins): return result def init_plugins(config, gui_name): - from electrum_zcash.plugins import Plugins + from electrum_zclassic.plugins import Plugins return Plugins(config, is_local or is_android, gui_name) @@ -390,7 +390,7 @@ if __name__ == '__main__': # check uri uri = config_options.get('url') if uri: - if not uri.startswith('zcash:'): + if not uri.startswith('zclassic:'): print_stderr('unknown command:', uri) sys.exit(1) config_options['url'] = uri @@ -437,7 +437,7 @@ if __name__ == '__main__': d = daemon.Daemon(config, fd, False) d.start() if config.get('websocket_server'): - from electrum_zcash import websockets + from electrum_zclassic import websockets websockets.WebSocketServer(config, d.network).start() if config.get('requests_dir'): path = os.path.join(config.get('requests_dir'), 'index.html') @@ -465,7 +465,7 @@ if __name__ == '__main__': else: cmd = known_commands[cmdname] if cmd.requires_network: - print_msg("Daemon not running; try 'electrum-zcash daemon start'") + print_msg("Daemon not running; try 'electrum-zclassic daemon start'") sys.exit(1) else: plugins = init_plugins(config, 'cmdline') diff --git a/electrum-zcash-env b/electrum-zclassic-env similarity index 96% rename from electrum-zcash-env rename to electrum-zclassic-env index 849e2d92..f0d9c343 100755 --- a/electrum-zcash-env +++ b/electrum-zclassic-env @@ -22,6 +22,6 @@ fi export PYTHONPATH="/usr/local/lib/python${PYTHON_VER}/site-packages:$PYTHONPATH" -./electrum-zcash "$@" +./electrum-zclassic "$@" deactivate diff --git a/electrum-zcash.conf.sample b/electrum-zclassic.conf.sample similarity index 67% rename from electrum-zcash.conf.sample rename to electrum-zclassic.conf.sample index 59147ece..c3c71cef 100644 --- a/electrum-zcash.conf.sample +++ b/electrum-zclassic.conf.sample @@ -1,7 +1,7 @@ -# Configuration file for the Electrum-Zcash client +# Configuration file for the Electrum-Zclassic client # Settings defined here are shared across wallets # -# copy this file to /etc/electrum-zcash.conf if you want read-only settings +# copy this file to /etc/electrum-zclassic.conf if you want read-only settings [client] server = electrum.novit.ro:50001:t diff --git a/electrum-zclassic.desktop b/electrum-zclassic.desktop new file mode 100644 index 00000000..c1a934f6 --- /dev/null +++ b/electrum-zclassic.desktop @@ -0,0 +1,21 @@ +# If you want Electrum-Zclassic to appear in a Linux app launcher ("start menu"), install this by doing: +# sudo desktop-file-install electrum-zclassic.desktop + +[Desktop Entry] +Comment=Lightweight Zclassic Client +Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum-zclassic %u" +GenericName[en_US]=Zclassic Wallet +GenericName=Zclassic Wallet +Icon=electrum-zclassic.png +Name[en_US]=Electrum-Zclassic Bitcoin Wallet +Name=Electrum-Zclassic Bitcoin Wallet +Categories=Finance;Network; +StartupNotify=false +Terminal=false +Type=Application +MimeType=x-scheme-handler/zclassic; +Actions=Testnet; + +[Desktop Action Testnet] +Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum-zclassic --testnet %u" +Name=Testnet mode diff --git a/electrum-zcash.icns b/electrum-zclassic.icns similarity index 100% rename from electrum-zcash.icns rename to electrum-zclassic.icns diff --git a/gui/kivy/Readme.md b/gui/kivy/Readme.md index 72a8fcb8..af3dcb04 100644 --- a/gui/kivy/Readme.md +++ b/gui/kivy/Readme.md @@ -1,10 +1,10 @@ # Kivy GUI -The Kivy GUI is used with Electrum-Zcash on Android devices. To generate an APK file, follow these instructions. +The Kivy GUI is used with Electrum-Zclassic on Android devices. To generate an APK file, follow these instructions. ## 1. Install python-for-android (p4a) -p4a is used to package Electrum-Zcash, Python, SDL and a bootstrap Java app into an APK file. -We patched p4a to add some functionality we need for Electrum-Zcash. Until those changes are +p4a is used to package Electrum-Zclassic, Python, SDL and a bootstrap Java app into an APK file. +We patched p4a to add some functionality we need for Electrum-Zclassic. Until those changes are merged into p4a, you need to merge them locally (into the master branch): 1.1 [kivy/python-for-android#1217](https://github.com/kivy/python-for-android/pull/1217) @@ -60,9 +60,9 @@ Extract into `/opt/crystax-ndk-10.3.2` ## 5. Create the UI Atlas -In the `gui/kivy` directory of Electrum-Zcash, run `make theming`. +In the `gui/kivy` directory of Electrum-Zclassic, run `make theming`. -## 6. Download Electrum-Zcash dependencies +## 6. Download Electrum-Zclassic dependencies Run `contrib/make_packages`. ## 7. Build the APK diff --git a/gui/kivy/i18n.py b/gui/kivy/i18n.py index a1ea53ed..007f62b6 100644 --- a/gui/kivy/i18n.py +++ b/gui/kivy/i18n.py @@ -36,7 +36,7 @@ class _(str): @staticmethod def switch_lang(lang): # get the right locales directory, and instanciate a gettext - from electrum_zcash.i18n import LOCALE_DIR + from electrum_zclassic.i18n import LOCALE_DIR locales = gettext.translation('electrum', LOCALE_DIR, languages=[lang], fallback=True) _.lang = locales.gettext for label in _.observers: diff --git a/gui/kivy/main.kv b/gui/kivy/main.kv index 6df7be0e..1bc092cd 100644 --- a/gui/kivy/main.kv +++ b/gui/kivy/main.kv @@ -1,7 +1,7 @@ #:import Clock kivy.clock.Clock #:import Window kivy.core.window.Window #:import Factory kivy.factory.Factory -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ ########################### diff --git a/gui/kivy/main_window.py b/gui/kivy/main_window.py index c4214fb0..d5874146 100644 --- a/gui/kivy/main_window.py +++ b/gui/kivy/main_window.py @@ -7,15 +7,15 @@ import traceback from decimal import Decimal import threading -import electrum_zcash -from electrum_zcash.bitcoin import TYPE_ADDRESS -from electrum_zcash import WalletStorage, Wallet -from electrum_zcash_gui.kivy.i18n import _ -from electrum_zcash.paymentrequest import InvoiceStore -from electrum_zcash.util import profiler, InvalidPassword -from electrum_zcash.plugins import run_hook -from electrum_zcash.util import format_satoshis, format_satoshis_plain -from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED +import electrum_zclassic +from electrum_zclassic.bitcoin import TYPE_ADDRESS +from electrum_zclassic import WalletStorage, Wallet +from electrum_zclassic_gui.kivy.i18n import _ +from electrum_zclassic.paymentrequest import InvoiceStore +from electrum_zclassic.util import profiler, InvalidPassword +from electrum_zclassic.plugins import run_hook +from electrum_zclassic.util import format_satoshis, format_satoshis_plain +from electrum_zclassic.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED from kivy.app import App from kivy.core.window import Window @@ -30,10 +30,10 @@ from kivy.metrics import inch from kivy.lang import Builder ## lazy imports for factory so that widgets can be used in kv -#Factory.register('InstallWizard', module='electrum_zcash_gui.kivy.uix.dialogs.installwizard') -#Factory.register('InfoBubble', module='electrum_zcash_gui.kivy.uix.dialogs') -#Factory.register('OutputList', module='electrum_zcash_gui.kivy.uix.dialogs') -#Factory.register('OutputItem', module='electrum_zcash_gui.kivy.uix.dialogs') +#Factory.register('InstallWizard', module='electrum_zclassic_gui.kivy.uix.dialogs.installwizard') +#Factory.register('InfoBubble', module='electrum_zclassic_gui.kivy.uix.dialogs') +#Factory.register('OutputList', module='electrum_zclassic_gui.kivy.uix.dialogs') +#Factory.register('OutputItem', module='electrum_zclassic_gui.kivy.uix.dialogs') from .uix.dialogs.installwizard import InstallWizard from .uix.dialogs import InfoBubble @@ -48,14 +48,14 @@ util = False # register widget cache for keeping memory down timeout to forever to cache # the data -Cache.register('electrum_zcash_widgets', timeout=0) +Cache.register('electrum_zclassic_widgets', timeout=0) from kivy.uix.screenmanager import Screen from kivy.uix.tabbedpanel import TabbedPanel from kivy.uix.label import Label from kivy.core.clipboard import Clipboard -Factory.register('TabbedCarousel', module='electrum_zcash_gui.kivy.uix.screens') +Factory.register('TabbedCarousel', module='electrum_zclassic_gui.kivy.uix.screens') # Register fonts without this you won't be able to use bold/italic... # inside markup. @@ -67,7 +67,7 @@ Label.register('Roboto', 'gui/kivy/data/fonts/Roboto-Bold.ttf') -from electrum_zcash.util import base_units +from electrum_zclassic.util import base_units class ElectrumWindow(App): @@ -99,7 +99,7 @@ class ElectrumWindow(App): from .uix.dialogs.choice_dialog import ChoiceDialog protocol = 's' def cb2(host): - from electrum_zcash import constants + from electrum_zclassic import constants pp = servers.get(host, constants.net.DEFAULT_PORTS) port = pp.get(protocol, '') popup.ids.host.text = host @@ -132,7 +132,7 @@ class ElectrumWindow(App): self.send_screen.set_URI(uri) def on_new_intent(self, intent): - if intent.getScheme() != 'zcash': + if intent.getScheme() != 'zclassic': return uri = intent.getDataString() self.set_URI(uri) @@ -154,7 +154,7 @@ class ElectrumWindow(App): self._trigger_update_history() def _get_bu(self): - return self.electrum_config.get('base_unit', 'ZEC') + return self.electrum_config.get('base_unit', 'ZCL') def _set_bu(self, value): assert value in base_units.keys() @@ -244,7 +244,7 @@ class ElectrumWindow(App): App.__init__(self)#, **kwargs) - title = _('Electrum-Zcash App') + title = _('Electrum-Zclassic App') self.electrum_config = config = kwargs.get('config', None) self.language = config.get('language', 'en') self.network = network = kwargs.get('network', None) @@ -298,17 +298,17 @@ class ElectrumWindow(App): self.send_screen.do_clear() def on_qr(self, data): - from electrum_zcash.bitcoin import base_decode, is_address + from electrum_zclassic.bitcoin import base_decode, is_address data = data.strip() if is_address(data): self.set_URI(data) return - if data.startswith('zcash:'): + if data.startswith('zclassic:'): self.set_URI(data) return # try to decode transaction - from electrum_zcash.transaction import Transaction - from electrum_zcash.util import bh2u + from electrum_zclassic.transaction import Transaction + from electrum_zclassic.util import bh2u try: text = bh2u(base_decode(data, None, base=43)) tx = Transaction(text) @@ -345,7 +345,7 @@ class ElectrumWindow(App): self.receive_screen.screen.address = addr def show_pr_details(self, req, status, is_invoice): - from electrum_zcash.util import format_time + from electrum_zclassic.util import format_time requestor = req.get('requestor') exp = req.get('exp') memo = req.get('memo') @@ -367,7 +367,7 @@ class ElectrumWindow(App): popup.open() def show_addr_details(self, req, status): - from electrum_zcash.util import format_time + from electrum_zclassic.util import format_time fund = req.get('fund') isaddr = 'y' popup = Builder.load_file('gui/kivy/uix/ui_screens/invoice.kv') @@ -450,7 +450,7 @@ class ElectrumWindow(App): self.fiat_unit = self.fx.ccy if self.fx.is_enabled() else '' # default tab self.switch_to('history') - # bind intent for zcash: URI scheme + # bind intent for zclassic: URI scheme if platform == 'android': from android import activity from jnius import autoclass @@ -497,7 +497,7 @@ class ElectrumWindow(App): else: self.load_wallet(wallet) else: - Logger.debug('Electrum-Zcash: Wallet not found. Launching install wizard') + Logger.debug('Electrum-Zclassic: Wallet not found. Launching install wizard') storage = WalletStorage(path) wizard = Factory.InstallWizard(self.electrum_config, storage) wizard.bind(on_wizard_complete=self.on_wizard_complete) @@ -573,13 +573,13 @@ class ElectrumWindow(App): #setup lazy imports for mainscreen Factory.register('AnimatedPopup', - module='electrum_zcash_gui.kivy.uix.dialogs') + module='electrum_zclassic_gui.kivy.uix.dialogs') Factory.register('QRCodeWidget', - module='electrum_zcash_gui.kivy.uix.qrcodewidget') + module='electrum_zclassic_gui.kivy.uix.qrcodewidget') # preload widgets. Remove this if you want to load the widgets on demand - #Cache.append('electrum_zcash_widgets', 'AnimatedPopup', Factory.AnimatedPopup()) - #Cache.append('electrum_zcash_widgets', 'QRCodeWidget', Factory.QRCodeWidget()) + #Cache.append('electrum_zclassic_widgets', 'AnimatedPopup', Factory.AnimatedPopup()) + #Cache.append('electrum_zclassic_widgets', 'QRCodeWidget', Factory.QRCodeWidget()) # load and focus the ui self.root.manager = self.root.ids['manager'] @@ -591,7 +591,7 @@ class ElectrumWindow(App): self.receive_screen = None self.requests_screen = None self.address_screen = None - self.icon = "icons/electrum-zcash.png" + self.icon = "icons/electrum-zclassic.png" self.tabs = self.root.ids['tabs'] def update_interfaces(self, dt): @@ -684,7 +684,7 @@ class ElectrumWindow(App): from plyer import notification icon = (os.path.dirname(os.path.realpath(__file__)) + '/../../' + self.icon) - notification.notify('Electrum-Zcash', message, + notification.notify('Electrum-Zclassic', message, app_icon=icon, app_name='Electrum') except ImportError: Logger.Error('Notification: needs plyer; `sudo pip install plyer`') diff --git a/gui/kivy/nfc_scanner/__init__.py b/gui/kivy/nfc_scanner/__init__.py index a2c6e0d6..4d8abf3f 100644 --- a/gui/kivy/nfc_scanner/__init__.py +++ b/gui/kivy/nfc_scanner/__init__.py @@ -8,7 +8,7 @@ class NFCBase(Widget): ''' payload = ObjectProperty(None) - '''This is the data gotten from the tag. + '''This is the data gotten from the tag. ''' def nfc_init(self): @@ -41,4 +41,4 @@ class NFCBase(Widget): NFCScanner = core_select_lib('nfc_manager', ( # keep the dummy implementation as the last one to make it the fallback provider.NFCScanner = core_select_lib('nfc_scanner', ( ('android', 'scanner_android', 'ScannerAndroid'), - ('dummy', 'scanner_dummy', 'ScannerDummy')), True, 'electrum_zcash_gui.kivy') + ('dummy', 'scanner_dummy', 'ScannerDummy')), True, 'electrum_zclassic_gui.kivy') diff --git a/gui/kivy/nfc_scanner/scanner_android.py b/gui/kivy/nfc_scanner/scanner_android.py index 0d7e467d..5ede5fe5 100644 --- a/gui/kivy/nfc_scanner/scanner_android.py +++ b/gui/kivy/nfc_scanner/scanner_android.py @@ -10,7 +10,7 @@ if platform != 'android': raise ImportError import threading -from electrum_zcash_gui.kivy.nfc_scanner import NFCBase +from electrum_zclassic_gui.kivy.nfc_scanner import NFCBase from jnius import autoclass, cast from android.runnable import run_on_ui_thread from android import activity @@ -46,7 +46,7 @@ class ScannerAndroid(NFCBase): global app app = App.get_running_app() - # Make sure we are listening to new intent + # Make sure we are listening to new intent activity.bind(on_new_intent=self.on_new_intent) # Configure nfc @@ -55,7 +55,7 @@ class ScannerAndroid(NFCBase): # Check if adapter exists if not self.nfc_adapter: return False - + # specify that we want our activity to remain on top when a new intent # is fired self.nfc_pending_intent = PendingIntent.getActivity(context, 0, @@ -131,7 +131,7 @@ class ScannerAndroid(NFCBase): ''' This function is called when the application receives a new intent, for the ones the application has registered previously, either in the manifest or in the foreground dispatch setup in the - nfc_init function above. + nfc_init function above. ''' action_list = (NfcAdapter.ACTION_NDEF_DISCOVERED,) @@ -214,7 +214,7 @@ class ScannerAndroid(NFCBase): ndef_record = NdefRecord( NdefRecord.TNF_MIME_MEDIA, 'cash.z.electrum.kivy', '', data) - + # Create message ndef_message = NdefMessage([ndef_record]) diff --git a/gui/kivy/nfc_scanner/scanner_dummy.py b/gui/kivy/nfc_scanner/scanner_dummy.py index 27b6a4a4..a4104f26 100644 --- a/gui/kivy/nfc_scanner/scanner_dummy.py +++ b/gui/kivy/nfc_scanner/scanner_dummy.py @@ -1,6 +1,6 @@ ''' Dummy NFC Provider to be used on desktops in case no other provider is found ''' -from electrum_zcash_gui.kivy.nfc_scanner import NFCBase +from electrum_zclassic_gui.kivy.nfc_scanner import NFCBase from kivy.clock import Clock from kivy.logger import Logger diff --git a/gui/kivy/tools/bitcoin_intent.xml b/gui/kivy/tools/bitcoin_intent.xml index 066f2aeb..2470fb36 100644 --- a/gui/kivy/tools/bitcoin_intent.xml +++ b/gui/kivy/tools/bitcoin_intent.xml @@ -3,5 +3,5 @@ - + diff --git a/gui/kivy/tools/buildozer.spec b/gui/kivy/tools/buildozer.spec index 7d61e427..863bcee9 100644 --- a/gui/kivy/tools/buildozer.spec +++ b/gui/kivy/tools/buildozer.spec @@ -1,10 +1,10 @@ [app] # (str) Title of your application -title = Electrum-Zcash +title = Electrum-Zclassic # (str) Package name -package.name = Electrum-Zcash +package.name = Electrum-Zclassic # (str) Package domain (needed for android/ios packaging) package.domain = cash.z.electrum diff --git a/gui/kivy/uix/context_menu.py b/gui/kivy/uix/context_menu.py index 9dd0c166..ceaee942 100644 --- a/gui/kivy/uix/context_menu.py +++ b/gui/kivy/uix/context_menu.py @@ -8,7 +8,7 @@ from kivy.lang import Builder from kivy.factory import Factory from kivy.clock import Clock -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ Builder.load_string(''' diff --git a/gui/kivy/uix/dialogs/__init__.py b/gui/kivy/uix/dialogs/__init__.py index 31e9d5b9..3079bc77 100644 --- a/gui/kivy/uix/dialogs/__init__.py +++ b/gui/kivy/uix/dialogs/__init__.py @@ -4,7 +4,7 @@ from kivy.factory import Factory from kivy.properties import NumericProperty, StringProperty, BooleanProperty from kivy.core.window import Window -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ diff --git a/gui/kivy/uix/dialogs/addresses.py b/gui/kivy/uix/dialogs/addresses.py index 5c50408f..5e8f1ea5 100644 --- a/gui/kivy/uix/dialogs/addresses.py +++ b/gui/kivy/uix/dialogs/addresses.py @@ -93,8 +93,8 @@ Builder.load_string(''' ''') -from electrum_zcash_gui.kivy.i18n import _ -from electrum_zcash_gui.kivy.uix.context_menu import ContextMenu +from electrum_zclassic_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.uix.context_menu import ContextMenu class EmptyLabel(Factory.Label): @@ -171,7 +171,7 @@ class AddressesDialog(Factory.Popup): def ext_search(self, card, search): return card.memo.find(search) >= 0 or card.amount.find(search) >= 0 - + def show_menu(self, obj): self.hide_menu() self.context_menu = ContextMenu(obj, self.menu_actions) diff --git a/gui/kivy/uix/dialogs/fee_dialog.py b/gui/kivy/uix/dialogs/fee_dialog.py index eb55dc58..166f9647 100644 --- a/gui/kivy/uix/dialogs/fee_dialog.py +++ b/gui/kivy/uix/dialogs/fee_dialog.py @@ -3,7 +3,7 @@ from kivy.factory import Factory from kivy.properties import ObjectProperty from kivy.lang import Builder -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ Builder.load_string(''' diff --git a/gui/kivy/uix/dialogs/fx_dialog.py b/gui/kivy/uix/dialogs/fx_dialog.py index d582c54d..374dc46d 100644 --- a/gui/kivy/uix/dialogs/fx_dialog.py +++ b/gui/kivy/uix/dialogs/fx_dialog.py @@ -66,7 +66,7 @@ from kivy.uix.checkbox import CheckBox from kivy.uix.widget import Widget from kivy.clock import Clock -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ from functools import partial class FxDialog(Factory.Popup): diff --git a/gui/kivy/uix/dialogs/installwizard.py b/gui/kivy/uix/dialogs/installwizard.py index 527195a0..8eea57e8 100644 --- a/gui/kivy/uix/dialogs/installwizard.py +++ b/gui/kivy/uix/dialogs/installwizard.py @@ -14,7 +14,7 @@ from kivy.core.window import Window from kivy.clock import Clock from kivy.utils import platform -from electrum_zcash.base_wizard import BaseWizard +from electrum_zclassic.base_wizard import BaseWizard from . import EventsDialog @@ -28,7 +28,7 @@ test_xpub = "xpub661MyMwAqRbcEbvVtRRSjqxVnaWVUMewVzMiURAKyYratih4TtBpMypzzefmv8z Builder.load_string(''' #:import Window kivy.core.window.Window -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ @@ -559,8 +559,8 @@ class RestoreSeedDialog(WizardDialog): def __init__(self, wizard, **kwargs): super(RestoreSeedDialog, self).__init__(wizard, **kwargs) self._test = kwargs['test'] - from electrum_zcash.mnemonic import Mnemonic - from electrum_zcash.old_mnemonic import words as old_wordlist + from electrum_zclassic.mnemonic import Mnemonic + from electrum_zclassic.old_mnemonic import words as old_wordlist self.words = set(Mnemonic('en').wordlist).union(set(old_wordlist)) self.ids.text_input_seed.text = test_seed if is_test else '' self.message = _('Please type your seed phrase using the virtual keyboard.') diff --git a/gui/kivy/uix/dialogs/invoices.py b/gui/kivy/uix/dialogs/invoices.py index 515f7acc..6f531f99 100644 --- a/gui/kivy/uix/dialogs/invoices.py +++ b/gui/kivy/uix/dialogs/invoices.py @@ -76,10 +76,10 @@ Builder.load_string(''' ''') from kivy.properties import BooleanProperty -from electrum_zcash_gui.kivy.i18n import _ -from electrum_zcash.util import format_time -from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED -from electrum_zcash_gui.kivy.uix.context_menu import ContextMenu +from electrum_zclassic_gui.kivy.i18n import _ +from electrum_zclassic.util import format_time +from electrum_zclassic.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED +from electrum_zclassic_gui.kivy.uix.context_menu import ContextMenu invoice_text = { PR_UNPAID:_('Pending'), diff --git a/gui/kivy/uix/dialogs/nfc_transaction.py b/gui/kivy/uix/dialogs/nfc_transaction.py index b0acb1fc..84c784ed 100644 --- a/gui/kivy/uix/dialogs/nfc_transaction.py +++ b/gui/kivy/uix/dialogs/nfc_transaction.py @@ -8,7 +8,7 @@ class NFCTransactionDialog(AnimatedPopup): # Delayed Init global NFCSCanner if NFCSCanner is None: - from electrum_zcash_gui.kivy.nfc_scanner import NFCScanner + from electrum_zclassic_gui.kivy.nfc_scanner import NFCScanner self.scanner = NFCSCanner super(NFCTransactionDialog, self).__init__(**kwargs) diff --git a/gui/kivy/uix/dialogs/password_dialog.py b/gui/kivy/uix/dialogs/password_dialog.py index 430d0389..ad06d9f9 100644 --- a/gui/kivy/uix/dialogs/password_dialog.py +++ b/gui/kivy/uix/dialogs/password_dialog.py @@ -5,14 +5,14 @@ from kivy.lang import Builder from decimal import Decimal from kivy.clock import Clock -from electrum_zcash.util import InvalidPassword -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic.util import InvalidPassword +from electrum_zclassic_gui.kivy.i18n import _ Builder.load_string(''' id: popup - title: 'Electrum-Zcash' + title: 'Electrum-Zclassic' message: '' BoxLayout: size_hint: 1, 1 @@ -82,7 +82,7 @@ class PasswordDialog(Factory.Popup): self.is_change = is_change self.pw = None self.new_password = None - self.title = 'Electrum-Zcash' + (' - ' + self.wallet.basename() if self.wallet else '') + self.title = 'Electrum-Zclassic' + (' - ' + self.wallet.basename() if self.wallet else '') def check_password(self, password): if self.is_change > 1: diff --git a/gui/kivy/uix/dialogs/qr_scanner.py b/gui/kivy/uix/dialogs/qr_scanner.py index a588a885..5e31d00a 100644 --- a/gui/kivy/uix/dialogs/qr_scanner.py +++ b/gui/kivy/uix/dialogs/qr_scanner.py @@ -2,7 +2,7 @@ from kivy.app import App from kivy.factory import Factory from kivy.lang import Builder -Factory.register('QRScanner', module='electrum_zcash_gui.kivy.qr_scanner') +Factory.register('QRScanner', module='electrum_zclassic_gui.kivy.qr_scanner') class QrScannerDialog(Factory.AnimatedPopup): diff --git a/gui/kivy/uix/dialogs/question.py b/gui/kivy/uix/dialogs/question.py index ee66fe0c..4637e186 100644 --- a/gui/kivy/uix/dialogs/question.py +++ b/gui/kivy/uix/dialogs/question.py @@ -6,7 +6,7 @@ from kivy.uix.checkbox import CheckBox from kivy.uix.label import Label from kivy.uix.widget import Widget -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ Builder.load_string(''' diff --git a/gui/kivy/uix/dialogs/requests.py b/gui/kivy/uix/dialogs/requests.py index 1da1491f..eacf63f1 100644 --- a/gui/kivy/uix/dialogs/requests.py +++ b/gui/kivy/uix/dialogs/requests.py @@ -74,10 +74,10 @@ Builder.load_string(''' ''') from kivy.properties import BooleanProperty -from electrum_zcash_gui.kivy.i18n import _ -from electrum_zcash.util import format_time -from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED -from electrum_zcash_gui.kivy.uix.context_menu import ContextMenu +from electrum_zclassic_gui.kivy.i18n import _ +from electrum_zclassic.util import format_time +from electrum_zclassic.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED +from electrum_zclassic_gui.kivy.uix.context_menu import ContextMenu pr_icon = { PR_UNPAID: 'atlas://gui/kivy/theming/light/important', diff --git a/gui/kivy/uix/dialogs/settings.py b/gui/kivy/uix/dialogs/settings.py index 9aebd633..d44337ec 100644 --- a/gui/kivy/uix/dialogs/settings.py +++ b/gui/kivy/uix/dialogs/settings.py @@ -3,21 +3,21 @@ from kivy.factory import Factory from kivy.properties import ObjectProperty from kivy.lang import Builder -from electrum_zcash.util import base_units -from electrum_zcash.i18n import languages -from electrum_zcash_gui.kivy.i18n import _ -from electrum_zcash.plugins import run_hook -from electrum_zcash import coinchooser +from electrum_zclassic.util import base_units +from electrum_zclassic.i18n import languages +from electrum_zclassic_gui.kivy.i18n import _ +from electrum_zclassic.plugins import run_hook +from electrum_zclassic import coinchooser from .choice_dialog import ChoiceDialog Builder.load_string(''' #:import partial functools.partial -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ id: settings - title: _('Electrum-Zcash Settings') + title: _('Electrum-Zclassic Settings') disable_pin: False use_encryption: False BoxLayout: @@ -44,7 +44,7 @@ Builder.load_string(''' SettingsItem: bu: app.base_unit title: _('Denomination') + ': ' + self.bu - description: _("Base unit for Zcash amounts.") + description: _("Base unit for Zclassic amounts.") action: partial(root.unit_dialog, self) CardSeparator SettingsItem: diff --git a/gui/kivy/uix/dialogs/tx_dialog.py b/gui/kivy/uix/dialogs/tx_dialog.py index 62a15e63..fc8de383 100644 --- a/gui/kivy/uix/dialogs/tx_dialog.py +++ b/gui/kivy/uix/dialogs/tx_dialog.py @@ -5,9 +5,9 @@ from kivy.lang import Builder from kivy.clock import Clock from kivy.uix.label import Label -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ from datetime import datetime -from electrum_zcash.util import InvalidPassword +from electrum_zclassic.util import InvalidPassword Builder.load_string(''' @@ -148,7 +148,7 @@ class TxDialog(Factory.Popup): self.app.broadcast(self.tx) def show_qr(self): - from electrum_zcash.bitcoin import base_encode, bfh + from electrum_zclassic.bitcoin import base_encode, bfh text = bfh(str(self.tx)) text = base_encode(text, base=43) self.app.qr_dialog(_("Raw Transaction"), text) diff --git a/gui/kivy/uix/dialogs/wallets.py b/gui/kivy/uix/dialogs/wallets.py index 9ac16675..79392325 100644 --- a/gui/kivy/uix/dialogs/wallets.py +++ b/gui/kivy/uix/dialogs/wallets.py @@ -5,7 +5,7 @@ from kivy.factory import Factory from kivy.properties import ObjectProperty from kivy.lang import Builder -from electrum_zcash.util import base_units +from electrum_zclassic.util import base_units from ...i18n import _ from .label_dialog import LabelDialog diff --git a/gui/kivy/uix/menus.py b/gui/kivy/uix/menus.py index 65aa6037..c21eba95 100644 --- a/gui/kivy/uix/menus.py +++ b/gui/kivy/uix/menus.py @@ -7,7 +7,7 @@ from kivy.uix.bubble import Bubble, BubbleButton from kivy.properties import ListProperty from kivy.uix.widget import Widget -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ class ContextMenuItem(Widget): '''abstract class diff --git a/gui/kivy/uix/screens.py b/gui/kivy/uix/screens.py index 87f981f5..57499b05 100644 --- a/gui/kivy/uix/screens.py +++ b/gui/kivy/uix/screens.py @@ -17,15 +17,15 @@ from kivy.lang import Builder from kivy.factory import Factory from kivy.utils import platform -from electrum_zcash.util import profiler, parse_URI, format_time, InvalidPassword, NotEnoughFunds, Fiat -from electrum_zcash import bitcoin -from electrum_zcash.util import timestamp_to_datetime -from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED +from electrum_zclassic.util import profiler, parse_URI, format_time, InvalidPassword, NotEnoughFunds, Fiat +from electrum_zclassic import bitcoin +from electrum_zclassic.util import timestamp_to_datetime +from electrum_zclassic.paymentrequest import PR_UNPAID, PR_PAID, PR_UNKNOWN, PR_EXPIRED from .context_menu import ContextMenu -from electrum_zcash_gui.kivy.i18n import _ +from electrum_zclassic_gui.kivy.i18n import _ class CScreen(Factory.Screen): @@ -170,11 +170,11 @@ class SendScreen(CScreen): payment_request = None def set_URI(self, text): - import electrum_zcash + import electrum_zclassic try: - uri = electrum_zcash.util.parse_URI(text, self.app.on_pr) + uri = electrum_zclassic.util.parse_URI(text, self.app.on_pr) except: - self.app.show_info(_("Not a Zcash URI")) + self.app.show_info(_("Not a Zclassic URI")) return amount = uri.get('amount') self.screen.address = uri.get('address', '') @@ -212,7 +212,7 @@ class SendScreen(CScreen): # it should be already saved return # save address as invoice - from electrum_zcash.paymentrequest import make_unsigned_request, PaymentRequest + from electrum_zclassic.paymentrequest import make_unsigned_request, PaymentRequest req = {'address':self.screen.address, 'memo':self.screen.message} amount = self.app.get_amount(self.screen.amount) if self.screen.amount else 0 req['amount'] = amount @@ -243,10 +243,10 @@ class SendScreen(CScreen): else: address = str(self.screen.address) if not address: - self.app.show_error(_('Recipient not specified.') + ' ' + _('Please scan a Zcash address or a payment request')) + self.app.show_error(_('Recipient not specified.') + ' ' + _('Please scan a Zclassic address or a payment request')) return if not bitcoin.is_address(address): - self.app.show_error(_('Invalid Zcash Address') + ':\n' + address) + self.app.show_error(_('Invalid Zclassic Address') + ':\n' + address) return try: amount = self.app.get_amount(self.screen.amount) @@ -340,7 +340,7 @@ class ReceiveScreen(CScreen): Clock.schedule_once(lambda dt: self.update_qr()) def get_URI(self): - from electrum_zcash.util import create_URI + from electrum_zclassic.util import create_URI amount = self.screen.amount if amount: a, u = self.screen.amount.split() @@ -356,7 +356,7 @@ class ReceiveScreen(CScreen): def do_share(self): uri = self.get_URI() - self.app.do_share(uri, _("Share Zcash Request")) + self.app.do_share(uri, _("Share Zclassic Request")) def do_copy(self): uri = self.get_URI() diff --git a/gui/kivy/uix/ui_screens/about.kv b/gui/kivy/uix/ui_screens/about.kv index 55ac6efc..5644a936 100644 --- a/gui/kivy/uix/ui_screens/about.kv +++ b/gui/kivy/uix/ui_screens/about.kv @@ -1,7 +1,7 @@ -#:import VERSION electrum_zcash.version.ELECTRUM_VERSION +#:import VERSION electrum_zclassic.version.ELECTRUM_VERSION Popup: - title: _("About Electrum-Zcash") + title: _("About Electrum-Zclassic") BoxLayout: orientation: 'vertical' spacing: '10dp' diff --git a/gui/kivy/uix/ui_screens/history.kv b/gui/kivy/uix/ui_screens/history.kv index 2be32eb2..d096d1b3 100644 --- a/gui/kivy/uix/ui_screens/history.kv +++ b/gui/kivy/uix/ui_screens/history.kv @@ -1,4 +1,4 @@ -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ #:import Factory kivy.factory.Factory #:set font_light 'gui/kivy/data/fonts/Roboto-Condensed.ttf' #:set btc_symbol chr(171) diff --git a/gui/kivy/uix/ui_screens/network.kv b/gui/kivy/uix/ui_screens/network.kv index fd5c01ad..b5c5b63c 100644 --- a/gui/kivy/uix/ui_screens/network.kv +++ b/gui/kivy/uix/ui_screens/network.kv @@ -13,7 +13,7 @@ Popup: SettingsItem: value: _("{} connections.").format(app.num_nodes) if app.num_nodes else _("Not connected") title: _("Status") + ': ' + self.value - description: _("Connections with Electrum-Zcash servers") + description: _("Connections with Electrum-Zclassic servers") action: lambda x: None CardSeparator diff --git a/gui/kivy/uix/ui_screens/receive.kv b/gui/kivy/uix/ui_screens/receive.kv index 51a4ee59..4f290b22 100644 --- a/gui/kivy/uix/ui_screens/receive.kv +++ b/gui/kivy/uix/ui_screens/receive.kv @@ -1,4 +1,4 @@ -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ #:import Decimal decimal.Decimal #:set btc_symbol chr(171) #:set mbtc_symbol chr(187) @@ -68,7 +68,7 @@ ReceiveScreen: pos_hint: {'center_y': .5} BlueButton: id: address_label - text: s.address if s.address else _('Zcash Address') + text: s.address if s.address else _('Zclassic Address') shorten: True on_release: Clock.schedule_once(lambda dt: app.addresses_dialog(s)) CardSeparator: diff --git a/gui/kivy/uix/ui_screens/send.kv b/gui/kivy/uix/ui_screens/send.kv index 58334344..11fbae11 100644 --- a/gui/kivy/uix/ui_screens/send.kv +++ b/gui/kivy/uix/ui_screens/send.kv @@ -1,4 +1,4 @@ -#:import _ electrum_zcash_gui.kivy.i18n._ +#:import _ electrum_zclassic_gui.kivy.i18n._ #:import Decimal decimal.Decimal #:set btc_symbol chr(171) #:set mbtc_symbol chr(187) diff --git a/gui/kivy/uix/ui_screens/server.kv b/gui/kivy/uix/ui_screens/server.kv index 886134ad..80fe95ad 100644 --- a/gui/kivy/uix/ui_screens/server.kv +++ b/gui/kivy/uix/ui_screens/server.kv @@ -6,7 +6,7 @@ Popup: padding: '10dp' spacing: '10dp' TopLabel: - text: _("Electrum-Zcash requests your transaction history from a single server. The returned history is checked against blockchain headers sent by other nodes, using Simple Payment Verification (SPV).") + text: _("Electrum-Zclassic requests your transaction history from a single server. The returned history is checked against blockchain headers sent by other nodes, using Simple Payment Verification (SPV).") font_size: '6pt' Widget: size_hint: 1, 0.8 diff --git a/gui/kivy/uix/ui_screens/status.kv b/gui/kivy/uix/ui_screens/status.kv index 7c9aa33c..1ac0a1bc 100644 --- a/gui/kivy/uix/ui_screens/status.kv +++ b/gui/kivy/uix/ui_screens/status.kv @@ -1,5 +1,5 @@ Popup: - title: "Electrum-Zcash" + title: "Electrum-Zclassic" confirmed: 0 unconfirmed: 0 unmatured: 0 diff --git a/gui/qt/__init__.py b/gui/qt/__init__.py index fe28e60f..12f9e4ee 100644 --- a/gui/qt/__init__.py +++ b/gui/qt/__init__.py @@ -38,15 +38,15 @@ from PyQt5.QtWidgets import * from PyQt5.QtCore import * import PyQt5.QtCore as QtCore -from electrum_zcash.i18n import _, set_language -from electrum_zcash.plugins import run_hook -from electrum_zcash import WalletStorage -# from electrum_zcash.synchronizer import Synchronizer -# from electrum_zcash.verifier import SPV -# from electrum_zcash.util import DebugMem -from electrum_zcash.util import (UserCancelled, print_error, +from electrum_zclassic.i18n import _, set_language +from electrum_zclassic.plugins import run_hook +from electrum_zclassic import WalletStorage +# from electrum_zclassic.synchronizer import Synchronizer +# from electrum_zclassic.verifier import SPV +# from electrum_zclassic.util import DebugMem +from electrum_zclassic.util import (UserCancelled, print_error, WalletFileException, BitcoinException) -# from electrum_zcash.wallet import Abstract_Wallet +# from electrum_zclassic.wallet import Abstract_Wallet from .installwizard import InstallWizard, GoBack @@ -56,7 +56,7 @@ try: except Exception as e: print(e) print("Error: Could not find icons file.") - print("Please run 'pyrcc5 icons.qrc -o gui/qt/icons_rc.py', and reinstall Electrum-Zcash") + print("Please run 'pyrcc5 icons.qrc -o gui/qt/icons_rc.py', and reinstall Electrum-Zclassic") sys.exit(1) from .util import * # * needed for plugins @@ -97,7 +97,7 @@ class ElectrumGui: if hasattr(QtCore.Qt, "AA_ShareOpenGLContexts"): QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_ShareOpenGLContexts) if hasattr(QGuiApplication, 'setDesktopFileName'): - QGuiApplication.setDesktopFileName('electrum-zcash.desktop') + QGuiApplication.setDesktopFileName('electrum-zclassic.desktop') self.config = config self.daemon = daemon self.plugins = plugins @@ -111,7 +111,7 @@ class ElectrumGui: # init tray self.dark_icon = self.config.get("dark_icon", False) self.tray = QSystemTrayIcon(self.tray_icon(), None) - self.tray.setToolTip('Electrum-Zcash') + self.tray.setToolTip('Electrum-Zclassic') self.tray.activated.connect(self.tray_activated) self.build_tray_menu() self.tray.show() @@ -133,7 +133,7 @@ class ElectrumGui: submenu.addAction(_("Close"), window.close) m.addAction(_("Dark/Light"), self.toggle_tray_icon) m.addSeparator() - m.addAction(_("Exit Electrum-Zcash"), self.close) + m.addAction(_("Exit Electrum-Zclassic"), self.close) def tray_icon(self): if self.dark_icon: @@ -165,7 +165,7 @@ class ElectrumGui: def show_network_dialog(self, parent): if not self.daemon.network: - parent.show_warning(_('You are using Electrum-Zcash in offline mode; restart Electrum-Zcash if you want to get connected'), title=_('Offline')) + parent.show_warning(_('You are using Electrum-Zclassic in offline mode; restart Electrum-Zclassic if you want to get connected'), title=_('Offline')) return if self.nd: self.nd.on_update() diff --git a/gui/qt/address_dialog.py b/gui/qt/address_dialog.py index 7559fc94..c24bf702 100644 --- a/gui/qt/address_dialog.py +++ b/gui/qt/address_dialog.py @@ -23,7 +23,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -from electrum_zcash.i18n import _ +from electrum_zclassic.i18n import _ from PyQt5.QtCore import * from PyQt5.QtGui import * diff --git a/gui/qt/address_list.py b/gui/qt/address_list.py index 3b761dab..be82465a 100644 --- a/gui/qt/address_list.py +++ b/gui/qt/address_list.py @@ -24,10 +24,10 @@ # SOFTWARE. import webbrowser -from electrum_zcash.i18n import _ -from electrum_zcash.util import block_explorer_URL -from electrum_zcash.plugins import run_hook -from electrum_zcash.bitcoin import is_address +from electrum_zclassic.i18n import _ +from electrum_zclassic.util import block_explorer_URL +from electrum_zclassic.plugins import run_hook +from electrum_zclassic.bitcoin import is_address from .util import * @@ -138,7 +138,7 @@ class AddressList(MyTreeWidget): self.setCurrentItem(address_item) def create_menu(self, position): - from electrum_zcash.wallet import Multisig_Wallet + from electrum_zclassic.wallet import Multisig_Wallet is_multisig = isinstance(self.wallet, Multisig_Wallet) can_delete = self.wallet.can_delete_address() selected = self.selectedItems() diff --git a/gui/qt/amountedit.py b/gui/qt/amountedit.py index efb87f90..19adc315 100644 --- a/gui/qt/amountedit.py +++ b/gui/qt/amountedit.py @@ -5,7 +5,7 @@ from PyQt5.QtGui import * from PyQt5.QtWidgets import (QLineEdit, QStyle, QStyleOptionFrame) from decimal import Decimal -from electrum_zcash.util import format_satoshis_plain +from electrum_zclassic.util import format_satoshis_plain class MyLineEdit(QLineEdit): @@ -82,11 +82,11 @@ class BTCAmountEdit(AmountEdit): def _base_unit(self): p = self.decimal_point() if p == 8: - return 'ZEC' + return 'ZCL' if p == 5: - return 'mZEC' + return 'mZCL' if p == 2: - return 'uZEC' + return 'uZCL' raise Exception('Unknown base unit') def get_amount(self): diff --git a/gui/qt/console.py b/gui/qt/console.py index 07e8bd25..cc5dadf8 100644 --- a/gui/qt/console.py +++ b/gui/qt/console.py @@ -6,7 +6,7 @@ import traceback, platform from PyQt5 import QtCore from PyQt5 import QtGui from PyQt5 import QtWidgets -from electrum_zcash import util +from electrum_zclassic import util if platform.system() == 'Windows': diff --git a/gui/qt/contact_list.py b/gui/qt/contact_list.py index b4f4510b..309805ec 100644 --- a/gui/qt/contact_list.py +++ b/gui/qt/contact_list.py @@ -24,10 +24,10 @@ # SOFTWARE. import webbrowser -from electrum_zcash.i18n import _ -from electrum_zcash.bitcoin import is_address -from electrum_zcash.util import block_explorer_URL -from electrum_zcash.plugins import run_hook +from electrum_zclassic.i18n import _ +from electrum_zclassic.bitcoin import is_address +from electrum_zclassic.util import block_explorer_URL +from electrum_zclassic.plugins import run_hook from PyQt5.QtGui import * from PyQt5.QtCore import * from PyQt5.QtWidgets import ( diff --git a/gui/qt/exception_window.py b/gui/qt/exception_window.py index 0525df8f..f85300e9 100644 --- a/gui/qt/exception_window.py +++ b/gui/qt/exception_window.py @@ -35,8 +35,8 @@ import PyQt5.QtCore as QtCore from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import * -from electrum_zcash.i18n import _ -from electrum_zcash import ELECTRUM_VERSION, bitcoin, constants +from electrum_zclassic.i18n import _ +from electrum_zclassic import ELECTRUM_VERSION, bitcoin, constants from .util import MessageBoxMixin @@ -47,7 +47,7 @@ issue_template = """

Traceback

Additional information