BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zcl-ify

This commit is contained in:
James 2019-02-28 22:26:15 +01:00
parent be6ff50614
commit 27b1373595
159 changed files with 847 additions and 856 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -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

20
.travis.yml
View File

@ -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"

6
MANIFEST.in
View File

@ -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

28
README.rst
View File

@ -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
-------

20
contrib/sign-releases.py
View File

@ -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'

14
contrib/zcash/travis/electrum_zcash_version_env.sh
View File

@ -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

2
contrib/zcash/btc2zcash.py → contrib/zclassic/btc2zclassic.py
View File

@ -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

28
contrib/zcash/deterministic.spec → contrib/zclassic/deterministic.spec
View File

@ -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'))

60
contrib/zcash/electrum-zcash.nsi → contrib/zclassic/electrum-zclassic.nsi
View File

@ -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

36
contrib/zcash/osx.spec → contrib/zclassic/osx.spec
View File

@ -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')

2
contrib/zcash/pyi_runtimehook.py → contrib/zclassic/pyi_runtimehook.py
View File

@ -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',

0
contrib/zcash/pyi_tctl_runtimehook.py → contrib/zclassic/pyi_tctl_runtimehook.py
View File

0
contrib/zcash/requirements.txt → contrib/zclassic/requirements.txt
View File

0
contrib/zcash/travis/Dockerfile-kivy → contrib/zclassic/travis/Dockerfile-kivy
View File

0
contrib/zcash/travis/Dockerfile-linux → contrib/zclassic/travis/Dockerfile-linux
View File

0
contrib/zcash/travis/Dockerfile-wine → contrib/zclassic/travis/Dockerfile-wine
View File

0
contrib/zcash/travis/before_install-linux-apk.sh → contrib/zclassic/travis/before_install-linux-apk.sh
View File

0
contrib/zcash/travis/before_install-linux.sh → contrib/zclassic/travis/before_install-linux.sh
View File

0
contrib/zcash/travis/before_install-osx.sh → contrib/zclassic/travis/before_install-osx.sh
View File

0
contrib/zcash/travis/build_linux.sh → contrib/zclassic/travis/build_linux.sh
View File

22
contrib/zcash/travis/build_wine.sh → contrib/zclassic/travis/build_wine.sh
View File

@ -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

14
contrib/zclassic/travis/electrum_zclassic_version_env.sh Executable file
View File

@ -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

10
contrib/zcash/travis/travis-build-linux-apk.sh → contrib/zclassic/travis/travis-build-linux-apk.sh
View File

@ -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'

14
contrib/zcash/travis/travis-build-linux.sh → contrib/zclassic/travis/travis-build-linux.sh
View File

@ -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

24
contrib/zcash/travis/travis-build-osx.sh → contrib/zclassic/travis/travis-build-osx.sh
View File

@ -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

2
debian/changelog vendored
View File

@ -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

40
debian/control vendored
View File

@ -1,4 +1,4 @@
Source: electrum-zcash
Source: electrum-zclassic
Section: utils
Priority: optional
Maintainer: Maksym Yuzhakov <zebra.lucky@gmail.com>
@ -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.

4
debian/copyright vendored
View File

@ -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

1
debian/electrum-zcash.manpages vendored
View File

@ -1 +0,0 @@
debian/electrum-zcash.1

14
debian/electrum-zcash.1 → debian/electrum-zclassic.1 vendored
View File

@ -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

1
debian/electrum-zclassic.manpages vendored Normal file
View File

@ -0,0 +1 @@
debian/electrum-zclassic.1

10
debian/patches/fix-keepkey-with-trezor.diff vendored
View File

@ -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"))

18
debian/rules vendored
View File

@ -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

21
electrum-zcash.desktop
View File

@ -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

44
electrum-zcash → electrum-zclassic
View File

@ -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')

2
electrum-zcash-env → electrum-zclassic-env
View File

@ -22,6 +22,6 @@ fi
export PYTHONPATH="/usr/local/lib/python${PYTHON_VER}/site-packages:$PYTHONPATH"
./electrum-zcash "$@"
./electrum-zclassic "$@"
deactivate

4
electrum-zcash.conf.sample → electrum-zclassic.conf.sample
View File

@ -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

21
electrum-zclassic.desktop Normal file
View File

@ -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

0
electrum-zcash.icns → electrum-zclassic.icns
View File

10
gui/kivy/Readme.md
View File

@ -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

2
gui/kivy/i18n.py
View File

@ -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:

2
gui/kivy/main.kv
View File

@ -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._
###########################

68
gui/kivy/main_window.py
View File

@ -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`')

4
gui/kivy/nfc_scanner/__init__.py
View File

@ -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')

10
gui/kivy/nfc_scanner/scanner_android.py
View File

@ -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])

2
gui/kivy/nfc_scanner/scanner_dummy.py
View File

@ -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

2
gui/kivy/tools/bitcoin_intent.xml
View File

@ -3,5 +3,5 @@
<action android:name="android.nfc.action.NDEF_DISCOVERED"/>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="zcash" />
<data android:scheme="zclassic" />
</intent-filter>

4
gui/kivy/tools/buildozer.spec
View File

@ -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

2
gui/kivy/uix/context_menu.py
View File

@ -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('''
<MenuItem@Button>

2
gui/kivy/uix/dialogs/__init__.py
View File

@ -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 _

6
gui/kivy/uix/dialogs/addresses.py
View File

@ -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)

2
gui/kivy/uix/dialogs/fee_dialog.py
View File

@ -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('''
<FeeDialog@Popup>

2
gui/kivy/uix/dialogs/fx_dialog.py
View File

@ -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):

8
gui/kivy/uix/dialogs/installwizard.py
View File

@ -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._
<WizardTextInput@TextInput>
@ -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.')

8
gui/kivy/uix/dialogs/invoices.py
View File

@ -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'),

2
gui/kivy/uix/dialogs/nfc_transaction.py
View File

@ -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)

8
gui/kivy/uix/dialogs/password_dialog.py
View File

@ -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('''
<PasswordDialog@Popup>
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:

2
gui/kivy/uix/dialogs/qr_scanner.py
View File

@ -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):

2
gui/kivy/uix/dialogs/question.py
View File

@ -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('''
<Question@Popup>

8
gui/kivy/uix/dialogs/requests.py
View File

@ -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',

16
gui/kivy/uix/dialogs/settings.py
View File

@ -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._
<SettingsDialog@Popup>
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:

6
gui/kivy/uix/dialogs/tx_dialog.py
View File

@ -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)

2
gui/kivy/uix/dialogs/wallets.py
View File

@ -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

2
gui/kivy/uix/menus.py
View File

@ -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

26
gui/kivy/uix/screens.py
View File

@ -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()

4
gui/kivy/uix/ui_screens/about.kv
View File

@ -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'

2
gui/kivy/uix/ui_screens/history.kv
View File

@ -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)

2
gui/kivy/uix/ui_screens/network.kv
View File

@ -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

4
gui/kivy/uix/ui_screens/receive.kv
View File

@ -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:

2
gui/kivy/uix/ui_screens/send.kv
View File

@ -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)

2
gui/kivy/uix/ui_screens/server.kv
View File

@ -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

2
gui/kivy/uix/ui_screens/status.kv
View File

@ -1,5 +1,5 @@
Popup:
title: "Electrum-Zcash"
title: "Electrum-Zclassic"
confirmed: 0
unconfirmed: 0
unmatured: 0

26
gui/qt/__init__.py
View File

@ -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()

2
gui/qt/address_dialog.py
View File

@ -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 *

10
gui/qt/address_list.py
View File

@ -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()

8
gui/qt/amountedit.py
View File

@ -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):

2
gui/qt/console.py
View File

@ -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':

8
gui/qt/contact_list.py
View File

@ -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 (

10
gui/qt/exception_window.py
View File

@ -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 = """<h2>Traceback</h2>
<h2>Additional information</h2>
<ul>
<li>Electrum-Zcash version: {app_version}</li>
<li>Electrum-Zclassic version: {app_version}</li>
<li>Operating system: {os}</li>
<li>Wallet type: {wallet_type}</li>
<li>Locale: {locale}</li>
@ -63,14 +63,14 @@ class Exception_Window(QWidget, MessageBoxMixin):
self.exc_args = (exctype, value, tb)
self.main_window = main_window
QWidget.__init__(self)
self.setWindowTitle('Electrum-Zcash - ' + _('An Error Occurred'))
self.setWindowTitle('Electrum-Zclassic - ' + _('An Error Occurred'))
self.setMinimumSize(600, 300)
main_box = QVBoxLayout()
heading = QLabel('<h2>' + _('Sorry!') + '</h2>')
main_box.addWidget(heading)
main_box.addWidget(QLabel(_('Something went wrong while executing Electrum-Zcash.')))
main_box.addWidget(QLabel(_('Something went wrong while executing Electrum-Zclassic.')))
main_box.addWidget(QLabel(
_('To help us diagnose and fix the problem, you can send us a bug report that contains useful debug '

2
gui/qt/fee_slider.py
View File

@ -1,4 +1,4 @@
from electrum_zcash.i18n import _
from electrum_zclassic.i18n import _
from PyQt5.QtGui import *
from PyQt5.QtCore import *
from PyQt5.QtWidgets import QSlider, QToolTip

14
gui/qt/history_list.py
View File

@ -26,13 +26,13 @@
import webbrowser
import datetime
from electrum_zcash.wallet import AddTransactionException, TX_HEIGHT_LOCAL
from electrum_zclassic.wallet import AddTransactionException, TX_HEIGHT_LOCAL
from .util import *
from electrum_zcash.i18n import _
from electrum_zcash.util import block_explorer_URL, profiler
from electrum_zclassic.i18n import _
from electrum_zclassic.util import block_explorer_URL, profiler
try:
from electrum_zcash.plot import plot_history, NothingToPlotException
from electrum_zclassic.plot import plot_history, NothingToPlotException
except:
plot_history = None
@ -376,7 +376,7 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
d = WindowModalDialog(self, _('Export History'))
d.setMinimumSize(400, 200)
vbox = QVBoxLayout(d)
defaultname = os.path.expanduser('~/electrum-zcash-history.csv')
defaultname = os.path.expanduser('~/electrum-zclassic-history.csv')
select_msg = _('Select file to export your wallet transactions to')
hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg)
vbox.addLayout(hbox)
@ -393,7 +393,7 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
try:
self.do_export_history(self.wallet, filename, csv_button.isChecked())
except (IOError, os.error) as reason:
export_error_label = _("Electrum-Zcash was unable to produce a transaction export.")
export_error_label = _("Electrum-Zclassic was unable to produce a transaction export.")
self.parent.show_critical(export_error_label + "\n" + str(reason), title=_("Unable to export history"))
return
self.parent.show_message(_("Your wallet history has been successfully exported."))
@ -414,5 +414,5 @@ class HistoryList(MyTreeWidget, AcceptFileDragDrop):
for line in lines:
transaction.writerow(line)
else:
from electrum_zcash.util import json_encode
from electrum_zclassic.util import json_encode
f.write(json_encode(history))

20
gui/qt/installwizard.py
View File

@ -8,10 +8,10 @@ from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from electrum_zcash import Wallet, WalletStorage
from electrum_zcash.util import UserCancelled, InvalidPassword
from electrum_zcash.base_wizard import BaseWizard, HWD_SETUP_DECRYPT_WALLET
from electrum_zcash.i18n import _
from electrum_zclassic import Wallet, WalletStorage
from electrum_zclassic.util import UserCancelled, InvalidPassword
from electrum_zclassic.base_wizard import BaseWizard, HWD_SETUP_DECRYPT_WALLET
from electrum_zclassic.i18n import _
from .seed_dialog import SeedLayout, KeysLayout
from .network_dialog import NetworkChoiceLayout
@ -97,7 +97,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
def __init__(self, config, app, plugins, storage):
BaseWizard.__init__(self, config, storage)
QDialog.__init__(self, None)
self.setWindowTitle('Electrum-Zcash - ' + _('Install Wizard'))
self.setWindowTitle('Electrum-Zclassic - ' + _('Install Wizard'))
self.app = app
self.config = config
# Set for base base class
@ -142,7 +142,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
hbox.setStretchFactor(scroll, 1)
outer_vbox.addLayout(hbox)
outer_vbox.addLayout(Buttons(self.back_button, self.next_button))
self.set_icon(':icons/electrum-zcash.png')
self.set_icon(':icons/electrum-zclassic.png')
self.show()
self.raise_()
self.refresh_gui() # Need for QT on MacOSX. Lame.
@ -169,7 +169,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
hbox2.addWidget(self.pw_e)
hbox2.addStretch()
vbox.addLayout(hbox2)
self.set_layout(vbox, title=_('Electrum-Zcash wallet'))
self.set_layout(vbox, title=_('Electrum-Zclassic wallet'))
wallet_folder = os.path.dirname(self.storage.path)
@ -276,7 +276,7 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
path = self.storage.path
if self.storage.requires_split():
self.hide()
msg = _("The wallet '{}' contains multiple accounts, which are no longer supported since Electrum-Zcash 2.7.\n\n"
msg = _("The wallet '{}' contains multiple accounts, which are no longer supported since Electrum-Zclassic 2.7.\n\n"
"Do you want to split your wallet into multiple files?").format(path)
if not self.question(msg):
return
@ -540,10 +540,10 @@ class InstallWizard(QDialog, MessageBoxMixin, BaseWizard):
return None
def init_network(self, network):
message = _("Electrum-Zcash communicates with remote servers to get "
message = _("Electrum-Zclassic communicates with remote servers to get "
"information about your transactions and addresses. The "
"servers all fulfill the same purpose only differing in "
"hardware. In most cases you simply want to let Electrum-Zcash "
"hardware. In most cases you simply want to let Electrum-Zclassic "
"pick one at random. However if you prefer feel free to "
"select a server manually.")
choices = [_("Auto connect"), _("Select server manually")]

4
gui/qt/invoice_list.py
View File

@ -23,8 +23,8 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from electrum_zcash.i18n import _
from electrum_zcash.util import format_time
from electrum_zclassic.i18n import _
from electrum_zclassic.util import format_time
from .util import *

122
gui/qt/main_window.py
View File

@ -39,19 +39,19 @@ import PyQt5.QtCore as QtCore
from .exception_window import Exception_Hook
from PyQt5.QtWidgets import *
from electrum_zcash import keystore, simple_config
from electrum_zcash.bitcoin import COIN, is_address, TYPE_ADDRESS
from electrum_zcash import constants
from electrum_zcash.plugins import run_hook
from electrum_zcash.i18n import _
from electrum_zcash.util import (format_time, format_satoshis, PrintError,
from electrum_zclassic import keystore, simple_config
from electrum_zclassic.bitcoin import COIN, is_address, TYPE_ADDRESS
from electrum_zclassic import constants
from electrum_zclassic.plugins import run_hook
from electrum_zclassic.i18n import _
from electrum_zclassic.util import (format_time, format_satoshis, PrintError,
format_satoshis_plain, NotEnoughFunds,
UserCancelled, NoDynamicFeeEstimates, profiler,
export_meta, import_meta, bh2u, bfh, InvalidPassword)
from electrum_zcash import Transaction
from electrum_zcash import util, bitcoin, commands, coinchooser
from electrum_zcash import paymentrequest
from electrum_zcash.wallet import Multisig_Wallet, AddTransactionException
from electrum_zclassic import Transaction
from electrum_zclassic import util, bitcoin, commands, coinchooser
from electrum_zclassic import paymentrequest
from electrum_zclassic.wallet import Multisig_Wallet, AddTransactionException
from .amountedit import AmountEdit, BTCAmountEdit, MyLineEdit, FeerateEdit
from .qrcodewidget import QRCodeWidget, QRDialog
@ -80,7 +80,7 @@ class StatusBarButton(QPushButton):
self.func()
from electrum_zcash.paymentrequest import PR_PAID
from electrum_zclassic.paymentrequest import PR_PAID
class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
@ -160,7 +160,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
if self.config.get("is_maximized"):
self.showMaximized()
self.setWindowIcon(QIcon(":icons/electrum-zcash.png"))
self.setWindowIcon(QIcon(":icons/electrum-zclassic.png"))
self.init_menubar()
wrtabs = weakref.proxy(tabs)
@ -375,7 +375,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.setGeometry(100, 100, 840, 400)
def watching_only_changed(self):
name = "Electrum-Zcash Testnet" if constants.net.TESTNET else "Electrum-Zcash"
name = "Electrum-Zclassic Testnet" if constants.net.TESTNET else "Electrum-Zclassic"
title = '%s %s - %s' % (name, self.wallet.electrum_version,
self.wallet.basename())
extra = [self.wallet.storage.get('wallet_type', '?')]
@ -393,8 +393,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
if self.wallet.is_watching_only():
msg = ' '.join([
_("This wallet is watching-only."),
_("This means you will not be able to spend Zcash coins with it."),
_("Make sure you own the seed phrase or the private keys, before you request Zcash coins to be sent to this wallet.")
_("This means you will not be able to spend Zclassic coins with it."),
_("Make sure you own the seed phrase or the private keys, before you request Zclassic coins to be sent to this wallet.")
])
self.show_warning(msg, title=_('Information'))
@ -422,7 +422,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
shutil.copy2(path, new_path)
self.show_message(_("A copy of your wallet file was created in")+" '%s'" % str(new_path), title=_("Wallet backup created"))
except BaseException as reason:
self.show_critical(_("Electrum-Zcash was unable to copy your wallet file to the specified location.") + "\n" + str(reason), title=_("Unable to create backup"))
self.show_critical(_("Electrum-Zclassic was unable to copy your wallet file to the specified location.") + "\n" + str(reason), title=_("Unable to create backup"))
def update_recently_visited(self, filename):
recent = self.config.get('recently_open', [])
@ -521,7 +521,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
tools_menu = menubar.addMenu(_("&Tools"))
# Settings / Preferences are all reserved keywords in macOS using this as work around
tools_menu.addAction(_("Electrum-Zcash preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
tools_menu.addAction(_("Electrum-Zclassic preferences") if sys.platform == 'darwin' else _("Preferences"), self.settings_dialog)
tools_menu.addAction(_("&Network"), lambda: self.gui_object.show_network_dialog(self))
tools_menu.addAction(_("&Plugins"), self.plugins_dialog)
tools_menu.addSeparator()
@ -541,9 +541,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
help_menu = menubar.addMenu(_("&Help"))
help_menu.addAction(_("&About"), self.show_about)
#help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://github.com/zebra-lucky/electrum-zcash"))
#help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://github.com/zebra-lucky/electrum-zclassic"))
help_menu.addSeparator()
#help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("http://github.com/zebra-lucky/electrum-zcash")).setShortcut(QKeySequence.HelpContents)
#help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("http://github.com/zebra-lucky/electrum-zclassic")).setShortcut(QKeySequence.HelpContents)
#self._auto_crash_reports = QAction(_("&Automated Crash Reports"), self, checkable=True)
#self._auto_crash_reports.setChecked(self.config.get("show_crash_reporter", default=False))
#self._auto_crash_reports.triggered.connect(self.auto_crash_reports)
@ -562,24 +562,24 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
d = self.network.get_donation_address()
if d:
host = self.network.get_parameters()[0]
self.pay_to_URI('zcash:%s?message=donation for %s'%(d, host))
self.pay_to_URI('zclassic:%s?message=donation for %s'%(d, host))
else:
self.show_error(_('No donation address for this server'))
def show_about(self):
QMessageBox.about(self, "Electrum-Zcash",
QMessageBox.about(self, "Electrum-Zclassic",
_("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" +
_("Electrum-Zcash focus is speed, with low resource usage and simplifying Bitcoin. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Bitcoin system." + "\n\n" +
_("Electrum-Zclassic focus is speed, with low resource usage and simplifying Bitcoin. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Bitcoin system." + "\n\n" +
_("Uses icons from the Icons8 icon pack (icons8.com).")))
def show_report_bug(self):
msg = ' '.join([
_("Please report any bugs as issues on github:<br/>"),
"<a href=\"https://github.com/zebra-lucky/electrum-zcash/issues\">https://github.com/zebra-lucky/electrum-zcash/issues</a><br/><br/>",
_("Before reporting a bug, upgrade to the most recent version of Electrum-Zcash (latest release or git HEAD), and include the version number in your report."),
"<a href=\"https://github.com/zebra-lucky/electrum-zclassic/issues\">https://github.com/zebra-lucky/electrum-zclassic/issues</a><br/><br/>",
_("Before reporting a bug, upgrade to the most recent version of Electrum-Zclassic (latest release or git HEAD), and include the version number in your report."),
_("Try to explain not only what the bug is, but how it occurs.")
])
self.show_message(msg, title="Electrum-Zcash - " + _("Reporting Bugs"))
self.show_message(msg, title="Electrum-Zclassic - " + _("Reporting Bugs"))
def notify_transactions(self):
if not self.network or not self.network.is_connected():
@ -609,9 +609,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
if self.tray:
try:
# this requires Qt 5.9
self.tray.showMessage("Electrum-Zcash", message, QIcon(":icons/electrum_dark_icon"), 20000)
self.tray.showMessage("Electrum-Zclassic", message, QIcon(":icons/electrum_dark_icon"), 20000)
except TypeError:
self.tray.showMessage("Electrum-Zcash", message, QSystemTrayIcon.Information, 20000)
self.tray.showMessage("Electrum-Zclassic", message, QSystemTrayIcon.Information, 20000)
@ -666,11 +666,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
def base_unit(self):
assert self.decimal_point in [2, 5, 8]
if self.decimal_point == 2:
return 'uZEC'
return 'uZCL'
if self.decimal_point == 5:
return 'mZEC'
return 'mZCL'
if self.decimal_point == 8:
return 'ZEC'
return 'ZCL'
raise Exception('Unknown base unit')
def connect_fields(self, window, btc_e, fiat_e, fee_e):
@ -798,7 +798,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.receive_address_e = ButtonsLineEdit()
self.receive_address_e.addCopyButton(self.app)
self.receive_address_e.setReadOnly(True)
msg = _('Zcash address where the payment should be received. Note that each payment request uses a different Zcash address.')
msg = _('Zclassic address where the payment should be received. Note that each payment request uses a different Zclassic address.')
self.receive_address_label = HelpLabel(_('Receiving address'), msg)
self.receive_address_e.textChanged.connect(self.update_receive_qr)
self.receive_address_e.setFocusPolicy(Qt.ClickFocus)
@ -828,8 +828,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
msg = ' '.join([
_('Expiration date of your request.'),
_('This information is seen by the recipient if you send them a signed payment request.'),
_('Expired requests have to be deleted manually from your list, in order to free the corresponding Zcash addresses.'),
_('The Zcash address never expires and will always be part of this electrum-zcash wallet.'),
_('Expired requests have to be deleted manually from your list, in order to free the corresponding Zclassic addresses.'),
_('The Zclassic address never expires and will always be part of this electrum-zclassic wallet.'),
])
grid.addWidget(HelpLabel(_('Request expires'), msg), 3, 0)
grid.addWidget(self.expires_combo, 3, 1)
@ -1055,7 +1055,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.amount_e = BTCAmountEdit(self.get_decimal_point)
self.payto_e = PayToEdit(self)
msg = _('Recipient of the funds.') + '\n\n'\
+ _('You may enter a Zcash address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Zcash address)')
+ _('You may enter a Zclassic address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Zclassic address)')
payto_label = HelpLabel(_('Pay to'), msg)
grid.addWidget(payto_label, 1, 0)
grid.addWidget(self.payto_e, 1, 1, 1, -1)
@ -1102,7 +1102,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
hbox.addStretch(1)
grid.addLayout(hbox, 4, 4)
msg = _('Zcash transactions are in general not free. A transaction fee is paid by the sender of the funds.') + '\n\n'\
msg = _('Zclassic transactions are in general not free. A transaction fee is paid by the sender of the funds.') + '\n\n'\
+ _('The amount of fee can be decided freely by the sender. However, transactions with low fees take more time to be processed.') + '\n\n'\
+ _('A suggested fee is automatically added to this field. You may override it. The suggested fee increases with the size of the transaction.')
self.fee_e_label = HelpLabel(_('Fee'), msg)
@ -1163,7 +1163,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
def feerounding_onclick():
text = (self.feerounding_text + '\n\n' +
_('To somewhat protect your privacy, Electrum-Zcash tries to create change with similar precision to other outputs.') + ' ' +
_('To somewhat protect your privacy, Electrum-Zclassic tries to create change with similar precision to other outputs.') + ' ' +
_('At most 100 satoshis might be lost due to this rounding.') + ' ' +
_("You can disable this setting in '{}'.").format(_('Preferences')) + '\n' +
_('Also, dust is not kept as change, but added to the fee.'))
@ -1486,10 +1486,10 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
for _type, addr, amount in outputs:
if addr is None:
self.show_error(_('Zcash Address is None'))
self.show_error(_('Zclassic Address is None'))
return
if _type == TYPE_ADDRESS and not bitcoin.is_address(addr):
self.show_error(_('Invalid Zcash Address'))
self.show_error(_('Invalid Zclassic Address'))
return
if amount is None:
self.show_error(_('Invalid Amount'))
@ -1705,7 +1705,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
try:
out = util.parse_URI(URI, self.on_pr)
except BaseException as e:
self.show_error(_('Invalid zcash URI:') + '\n' + str(e))
self.show_error(_('Invalid zclassic URI:') + '\n' + str(e))
return
self.show_send_tab()
r = out.get('r')
@ -1964,7 +1964,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.send_button.setVisible(not self.wallet.is_watching_only())
def change_password_dialog(self):
from electrum_zcash.storage import STO_EV_XPUB_PW
from electrum_zclassic.storage import STO_EV_XPUB_PW
if self.wallet.get_available_storage_encryption_version() == STO_EV_XPUB_PW:
from .password_dialog import ChangePasswordDialogForHW
d = ChangePasswordDialogForHW(self, self.wallet)
@ -2154,7 +2154,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
address = address.text().strip()
message = message.toPlainText().strip()
if not bitcoin.is_address(address):
self.show_message(_('Invalid Zcash address.'))
self.show_message(_('Invalid Zclassic address.'))
return
if self.wallet.is_watching_only():
self.show_message(_('This is a watching-only wallet.'))
@ -2182,7 +2182,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
address = address.text().strip()
message = message.toPlainText().strip().encode('utf-8')
if not bitcoin.is_address(address):
self.show_message(_('Invalid Zcash address.'))
self.show_message(_('Invalid Zclassic address.'))
return
try:
# This can throw on invalid base64
@ -2305,16 +2305,16 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return d.run()
def tx_from_text(self, txt):
from electrum_zcash.transaction import tx_from_str
from electrum_zclassic.transaction import tx_from_str
try:
tx = tx_from_str(txt)
return Transaction(tx)
except BaseException as e:
self.show_critical(_("Electrum-Zcash was unable to parse your transaction") + ":\n" + str(e))
self.show_critical(_("Electrum-Zclassic was unable to parse your transaction") + ":\n" + str(e))
return
def read_tx_from_qrcode(self):
from electrum_zcash import qrscanner
from electrum_zclassic import qrscanner
try:
data = qrscanner.scan_barcode(self.config.get_video_device())
except BaseException as e:
@ -2322,8 +2322,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return
if not data:
return
# if the user scanned a zcash URI
if str(data).startswith("zcash:"):
# if the user scanned a zclassic URI
if str(data).startswith("zclassic:"):
self.pay_to_URI(data)
return
# else if the user scanned an offline signed tx
@ -2345,7 +2345,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
with open(fileName, "r") as f:
file_content = f.read()
except (ValueError, IOError, os.error) as reason:
self.show_critical(_("Electrum-Zcash was unable to open your transaction file") + "\n" + str(reason), title=_("Unable to read file or no transaction found"))
self.show_critical(_("Electrum-Zclassic was unable to open your transaction file") + "\n" + str(reason), title=_("Unable to read file or no transaction found"))
return
return self.tx_from_text(file_content)
@ -2363,7 +2363,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.show_transaction(tx)
def do_process_from_txid(self):
from electrum_zcash import transaction
from electrum_zclassic import transaction
txid, ok = QInputDialog.getText(self, _('Lookup transaction'), _('Transaction ID') + ':')
if ok and txid:
txid = str(txid).strip()
@ -2398,7 +2398,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
e.setReadOnly(True)
vbox.addWidget(e)
defaultname = 'electrum-zcash-private-keys.csv'
defaultname = 'electrum-zclassic-private-keys.csv'
select_msg = _('Select file to export your private keys to')
hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg)
vbox.addLayout(hbox)
@ -2456,7 +2456,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.do_export_privkeys(filename, private_keys, csv_button.isChecked())
except (IOError, os.error) as reason:
txt = "\n".join([
_("Electrum-Zcash was unable to produce a private key-export."),
_("Electrum-Zclassic was unable to produce a private key-export."),
str(reason)
])
self.show_critical(txt, title=_("Unable to create csv"))
@ -2538,7 +2538,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
address_e.textChanged.connect(on_address)
if not d.exec_():
return
from electrum_zcash.wallet import sweep_preparations
from electrum_zclassic.wallet import sweep_preparations
try:
self.do_clear()
coins, keypairs = sweep_preparations(get_pk(), self.network)
@ -2611,7 +2611,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
lang_help = _('Select which language is used in the GUI (after restart).')
lang_label = HelpLabel(_('Language') + ':', lang_help)
lang_combo = QComboBox()
from electrum_zcash.i18n import languages
from electrum_zclassic.i18n import languages
lang_combo.addItems(list(languages.values()))
try:
index = languages.keys().index(self.config.get("language",''))
@ -2720,9 +2720,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
SSL_id_e.setReadOnly(True)
id_widgets.append((SSL_id_label, SSL_id_e))
units = ['ZEC', 'mZEC', 'uZEC']
units = ['ZCL', 'mZCL', 'uZCL']
msg = (_('Base unit of your wallet.')
+ '\n1 ZEC = 1000 mZEC. 1 mZEC = 1000 uZEC.\n'
+ '\n1 ZCL = 1000 mZCL. 1 mZCL = 1000 uZCL.\n'
+ _('This setting affects the Send tab, and all balance related fields.'))
unit_label = HelpLabel(_('Base unit') + ':', msg)
unit_combo = QComboBox()
@ -2734,11 +2734,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return
edits = self.amount_e, self.fee_e, self.receive_amount_e
amounts = [edit.get_amount() for edit in edits]
if unit_result == 'ZEC':
if unit_result == 'ZCL':
self.decimal_point = 8
elif unit_result == 'mZEC':
elif unit_result == 'mZCL':
self.decimal_point = 5
elif unit_result == 'uZEC':
elif unit_result == 'uZCL':
self.decimal_point = 2
else:
raise Exception('Unknown base unit')
@ -2765,7 +2765,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
block_ex_combo.currentIndexChanged.connect(on_be)
gui_widgets.append((block_ex_label, block_ex_combo))
from electrum_zcash import qrscanner
from electrum_zclassic import qrscanner
system_cameras = qrscanner._find_system_cameras()
qr_combo = QComboBox()
qr_combo.addItem("Default","default")
@ -2986,7 +2986,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
run_hook('close_settings_dialog')
if self.need_restart:
self.show_warning(_('Please restart Electrum-Zcash to activate the new GUI settings'), title=_('Success'))
self.show_warning(_('Please restart Electrum-Zclassic to activate the new GUI settings'), title=_('Success'))
def closeEvent(self, event):
@ -3013,7 +3013,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
self.gui_object.close_window(self)
def plugins_dialog(self):
self.pluginsdialog = d = WindowModalDialog(self, _('Electrum-Zcash Plugins'))
self.pluginsdialog = d = WindowModalDialog(self, _('Electrum-Zclassic Plugins'))
plugins = self.gui_object.plugins

18
gui/qt/network_dialog.py
View File

@ -30,10 +30,10 @@ from PyQt5.QtCore import *
from PyQt5.QtWidgets import *
import PyQt5.QtCore as QtCore
from electrum_zcash.i18n import _
from electrum_zcash import constants
from electrum_zcash.util import print_error
from electrum_zcash.network import serialize_server, deserialize_server
from electrum_zclassic.i18n import _
from electrum_zclassic import constants
from electrum_zclassic.util import print_error
from electrum_zclassic.network import serialize_server, deserialize_server
from .util import *
@ -214,8 +214,8 @@ class NetworkChoiceLayout(object):
self.autoconnect_cb.clicked.connect(self.update)
msg = ' '.join([
_("If auto-connect is enabled, Electrum-Zcash will always use a server that is on the longest blockchain."),
_("If it is disabled, you have to choose a server you want to use. Electrum-Zcash will warn you if your server is lagging.")
_("If auto-connect is enabled, Electrum-Zclassic will always use a server that is on the longest blockchain."),
_("If it is disabled, you have to choose a server you want to use. Electrum-Zclassic will warn you if your server is lagging.")
])
grid.addWidget(self.autoconnect_cb, 0, 0, 1, 3)
grid.addWidget(HelpButton(msg), 0, 4)
@ -270,7 +270,7 @@ class NetworkChoiceLayout(object):
grid.addWidget(self.tor_cb, 1, 0, 1, 3)
grid.addWidget(self.proxy_cb, 2, 0, 1, 3)
grid.addWidget(HelpButton(_('Proxy settings apply to all connections: with Electrum-Zcash servers, but also with third-party services.')), 2, 4)
grid.addWidget(HelpButton(_('Proxy settings apply to all connections: with Electrum-Zclassic servers, but also with third-party services.')), 2, 4)
grid.addWidget(self.proxy_mode, 4, 1)
grid.addWidget(self.proxy_host, 4, 2)
grid.addWidget(self.proxy_port, 4, 3)
@ -281,7 +281,7 @@ class NetworkChoiceLayout(object):
# Blockchain Tab
grid = QGridLayout(blockchain_tab)
msg = ' '.join([
_("Electrum-Zcash connects to several nodes in order to download block headers and find out the longest blockchain."),
_("Electrum-Zclassic connects to several nodes in order to download block headers and find out the longest blockchain."),
_("This blockchain is used to verify the transactions sent by your transaction server.")
])
self.status_label = QLabel('')
@ -290,7 +290,7 @@ class NetworkChoiceLayout(object):
grid.addWidget(HelpButton(msg), 0, 4)
self.server_label = QLabel('')
msg = _("Electrum-Zcash sends your wallet addresses to a single server, in order to receive your transaction history.")
msg = _("Electrum-Zclassic sends your wallet addresses to a single server, in order to receive your transaction history.")
grid.addWidget(QLabel(_('Server') + ':'), 1, 0)
grid.addWidget(self.server_label, 1, 1, 1, 3)
grid.addWidget(HelpButton(msg), 1, 4)

6
gui/qt/password_dialog.py
View File

@ -26,12 +26,12 @@
from PyQt5.QtCore import Qt
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from electrum_zcash.i18n import _
from electrum_zclassic.i18n import _
from .util import *
import re
import math
from electrum_zcash.plugins import run_hook
from electrum_zclassic.plugins import run_hook
def check_password_strength(password):
@ -248,7 +248,7 @@ class ChangePasswordDialogForSW(ChangePasswordDialogBase):
msg += ' ' + _('Use this dialog to add a password to your wallet.')
else:
if not is_encrypted:
msg = _('Your Zcash coins are password protected. However, your wallet file is not encrypted.')
msg = _('Your Zclassic coins are password protected. However, your wallet file is not encrypted.')
else:
msg = _('Your wallet is password protected and encrypted.')
msg += ' ' + _('Use this dialog to change your password.')

10
gui/qt/paytoedit.py
View File

@ -28,8 +28,8 @@ from PyQt5.QtWidgets import QLineEdit
import re
from decimal import Decimal
from electrum_zcash import bitcoin
from electrum_zcash.util import bfh
from electrum_zclassic import bitcoin
from electrum_zclassic.util import bfh
from .qrtextedit import ScanQRTextEdit
from .completion_text_edit import CompletionTextEdit
@ -90,7 +90,7 @@ class PayToEdit(CompletionTextEdit, ScanQRTextEdit):
return bitcoin.TYPE_SCRIPT, script
def parse_script(self, x):
from electrum_zcash.transaction import opcodes, push_script
from electrum_zclassic.transaction import opcodes, push_script
script = ''
for word in x.split():
if word[0:3] == 'OP_':
@ -127,7 +127,7 @@ class PayToEdit(CompletionTextEdit, ScanQRTextEdit):
self.payto_address = None
if len(lines) == 1:
data = lines[0]
if data.startswith("zcash:"):
if data.startswith("zclassic:"):
self.scan_f(data)
return
try:
@ -202,7 +202,7 @@ class PayToEdit(CompletionTextEdit, ScanQRTextEdit):
def qr_input(self):
data = super(PayToEdit,self).qr_input()
if data.startswith("zcash:"):
if data.startswith("zclassic:"):
self.scan_f(data)
# TODO: update fee

6
gui/qt/qrcodewidget.py
View File

@ -8,8 +8,8 @@ from PyQt5.QtWidgets import (
import os
import qrcode
import electrum_zcash
from electrum_zcash.i18n import _
import electrum_zclassic
from electrum_zclassic.i18n import _
from .util import WindowModalDialog
@ -102,7 +102,7 @@ class QRDialog(WindowModalDialog):
hbox = QHBoxLayout()
hbox.addStretch(1)
config = electrum_zcash.get_config()
config = electrum_zclassic.get_config()
if config:
filename = os.path.join(config.path, "qrcode.png")

6
gui/qt/qrtextedit.py
View File

@ -1,6 +1,6 @@
from electrum_zcash.i18n import _
from electrum_zcash.plugins import run_hook
from electrum_zclassic.i18n import _
from electrum_zclassic.plugins import run_hook
from PyQt5.QtGui import *
from PyQt5.QtCore import *
from PyQt5.QtWidgets import QFileDialog
@ -55,7 +55,7 @@ class ScanQRTextEdit(ButtonsTextEdit, MessageBoxMixin):
self.setText(data)
def qr_input(self):
from electrum_zcash import qrscanner, get_config
from electrum_zclassic import qrscanner, get_config
try:
data = qrscanner.scan_barcode(get_config().get_video_device())
except BaseException as e:

6
gui/qt/qrwindow.py
View File

@ -29,8 +29,8 @@ from PyQt5.QtCore import Qt
from PyQt5.QtGui import *
from PyQt5.QtWidgets import QHBoxLayout, QVBoxLayout, QLabel, QWidget
from electrum_zcash_gui.qt.qrcodewidget import QRCodeWidget
from electrum_zcash.i18n import _
from electrum_zclassic_gui.qt.qrcodewidget import QRCodeWidget
from electrum_zclassic.i18n import _
if platform.system() == 'Windows':
MONOSPACE_FONT = 'Lucida Console'
@ -46,7 +46,7 @@ class QR_Window(QWidget):
def __init__(self, win):
QWidget.__init__(self)
self.win = win
self.setWindowTitle('Electrum-Zcash - '+_('Payment Request'))
self.setWindowTitle('Electrum-Zclassic - '+_('Payment Request'))
self.setMinimumSize(800, 250)
self.address = ''
self.label = ''

8
gui/qt/request_list.py
View File

@ -23,10 +23,10 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from electrum_zcash.i18n import _
from electrum_zcash.util import format_time, age
from electrum_zcash.plugins import run_hook
from electrum_zcash.paymentrequest import PR_UNKNOWN
from electrum_zclassic.i18n import _
from electrum_zclassic.util import format_time, age
from electrum_zclassic.plugins import run_hook
from electrum_zclassic.paymentrequest import PR_UNKNOWN
from PyQt5.QtGui import *
from PyQt5.QtCore import *
from PyQt5.QtWidgets import QTreeWidgetItem, QMenu

18
gui/qt/seed_dialog.py
View File

@ -23,9 +23,9 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from electrum_zcash.i18n import _
from electrum_zcash.mnemonic import Mnemonic
import electrum_zcash.old_mnemonic
from electrum_zclassic.i18n import _
from electrum_zclassic.mnemonic import Mnemonic
import electrum_zclassic.old_mnemonic
from .util import *
from .qrtextedit import ShowQRTextEdit, ScanQRTextEdit
@ -68,10 +68,10 @@ class SeedLayout(QVBoxLayout):
if b:
msg = ' '.join([
'<b>' + _('Warning') + ':</b> ',
_('BIP39 seeds can be imported in Electrum-Zcash, so that users can access funds locked in other wallets.'),
_('BIP39 seeds can be imported in Electrum-Zclassic, so that users can access funds locked in other wallets.'),
_('However, we do not generate BIP39 seeds, because they do not meet our safety standard.'),
_('BIP39 seeds do not include a version number, which compromises compatibility with future software.'),
_('We do not guarantee that BIP39 imports will always be supported in Electrum-Zcash.'),
_('We do not guarantee that BIP39 imports will always be supported in Electrum-Zclassic.'),
])
else:
msg = ''
@ -136,7 +136,7 @@ class SeedLayout(QVBoxLayout):
def initialize_completer(self):
english_list = Mnemonic('en').wordlist
old_list = electrum_zcash.old_mnemonic.words
old_list = electrum_zclassic.old_mnemonic.words
self.wordlist = english_list + list(set(old_list) - set(english_list)) #concat both lists
self.wordlist.sort()
self.completer = QCompleter(self.wordlist)
@ -147,14 +147,14 @@ class SeedLayout(QVBoxLayout):
return ' '.join(text.split())
def on_edit(self):
from electrum_zcash.bitcoin import seed_type
from electrum_zclassic.bitcoin import seed_type
s = self.get_seed()
b = self.is_seed(s)
if not self.is_bip39:
t = seed_type(s)
label = _('Seed Type') + ': ' + t if t else ''
else:
from electrum_zcash.keystore import bip39_is_checksum_valid
from electrum_zclassic.keystore import bip39_is_checksum_valid
is_checksum, is_wordlist = bip39_is_checksum_valid(s)
status = ('checksum: ' + ('ok' if is_checksum else 'failed')) if is_wordlist else 'unknown wordlist'
label = 'BIP39' + ' (%s)'%status
@ -189,7 +189,7 @@ class KeysLayout(QVBoxLayout):
class SeedDialog(WindowModalDialog):
def __init__(self, parent, seed, passphrase):
WindowModalDialog.__init__(self, parent, ('Electrum-Zcash - ' + _('Seed')))
WindowModalDialog.__init__(self, parent, ('Electrum-Zclassic - ' + _('Seed')))
self.setMinimumWidth(400)
vbox = QVBoxLayout(self)
title = _("Your wallet generation seed is:")

16
gui/qt/transaction_dialog.py
View File

@ -31,14 +31,14 @@ from PyQt5.QtCore import *
from PyQt5.QtGui import *
from PyQt5.QtWidgets import *
from electrum_zcash.bitcoin import base_encode
from electrum_zcash.i18n import _
from electrum_zcash.plugins import run_hook
from electrum_zcash import simple_config
from electrum_zclassic.bitcoin import base_encode
from electrum_zclassic.i18n import _
from electrum_zclassic.plugins import run_hook
from electrum_zclassic import simple_config
from electrum_zcash.util import bfh
from electrum_zcash.wallet import AddTransactionException
from electrum_zcash.transaction import SerializationError
from electrum_zclassic.util import bfh
from electrum_zclassic.wallet import AddTransactionException
from electrum_zclassic.transaction import SerializationError
from .util import *
@ -50,7 +50,7 @@ def show_transaction(tx, parent, desc=None, prompt_if_unsaved=False):
d = TxDialog(tx, parent, desc, prompt_if_unsaved)
except SerializationError as e:
traceback.print_exc(file=sys.stderr)
parent.show_critical(_("Electrum-Zcash was unable to deserialize the transaction:") + "\n" + str(e))
parent.show_critical(_("Electrum-Zclassic was unable to deserialize the transaction:") + "\n" + str(e))
else:
dialogs.append(d)
d.show()

6
gui/qt/util.py
View File

@ -10,9 +10,9 @@ from PyQt5.QtGui import *
from PyQt5.QtCore import *
from PyQt5.QtWidgets import *
from electrum_zcash.i18n import _
from electrum_zcash.util import FileImportFailed, FileExportFailed
from electrum_zcash.paymentrequest import PR_UNPAID, PR_PAID, PR_EXPIRED
from electrum_zclassic.i18n import _
from electrum_zclassic.util import FileImportFailed, FileExportFailed
from electrum_zclassic.paymentrequest import PR_UNPAID, PR_PAID, PR_EXPIRED
if platform.system() == 'Windows':

2
gui/qt/utxo_list.py
View File

@ -23,7 +23,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
from .util import *
from electrum_zcash.i18n import _
from electrum_zclassic.i18n import _
class UTXOList(MyTreeWidget):

14
gui/stdio.py
View File

@ -1,9 +1,9 @@
from decimal import Decimal
_ = lambda x:x
#from i18n import _
from electrum_zcash import WalletStorage, Wallet
from electrum_zcash.util import format_satoshis, set_verbosity
from electrum_zcash.bitcoin import is_address, COIN, TYPE_ADDRESS
from electrum_zclassic import WalletStorage, Wallet
from electrum_zclassic.util import format_satoshis, set_verbosity
from electrum_zclassic.bitcoin import is_address, COIN, TYPE_ADDRESS
import getpass, datetime
# minimal fdisk like gui for console usage
@ -16,7 +16,7 @@ class ElectrumGui:
self.network = daemon.network
storage = WalletStorage(config.get_wallet_path())
if not storage.file_exists:
print("Wallet not found. try 'electrum-zcash create'")
print("Wallet not found. try 'electrum-zclassic create'")
exit()
if storage.is_encrypted():
password = getpass.getpass('Password:', stream=None)
@ -163,7 +163,7 @@ class ElectrumGui:
def do_send(self):
if not is_address(self.str_recipient):
print(_('Invalid Zcash address'))
print(_('Invalid Zclassic address'))
return
try:
amount = int(Decimal(self.str_amount) * COIN)
@ -208,12 +208,12 @@ class ElectrumGui:
print(_('Error'))
def network_dialog(self):
print("use 'electrum-zcash setconfig server/proxy' to change your network settings")
print("use 'electrum-zclassic setconfig server/proxy' to change your network settings")
return True
def settings_dialog(self):
print("use 'electrum-zcash setconfig' to change your settings")
print("use 'electrum-zclassic setconfig' to change your settings")
return True
def password_dialog(self):

14
gui/text.py
View File

@ -3,10 +3,10 @@ import curses, datetime, locale
from decimal import Decimal
import getpass
import electrum_zcash
from electrum_zcash.util import format_satoshis, set_verbosity
from electrum_zcash.bitcoin import is_address, COIN, TYPE_ADDRESS
from electrum_zcash import Wallet, WalletStorage
import electrum_zclassic
from electrum_zclassic.util import format_satoshis, set_verbosity
from electrum_zclassic.bitcoin import is_address, COIN, TYPE_ADDRESS
from electrum_zclassic import Wallet, WalletStorage
_ = lambda x:x
@ -20,7 +20,7 @@ class ElectrumGui:
self.network = daemon.network
storage = WalletStorage(config.get_wallet_path())
if not storage.file_exists():
print("Wallet not found. try 'electrum-zcash create'")
print("Wallet not found. try 'electrum-zclassic create'")
exit()
if storage.is_encrypted():
password = getpass.getpass('Password:', stream=None)
@ -320,7 +320,7 @@ class ElectrumGui:
def do_send(self):
if not is_address(self.str_recipient):
self.show_message(_('Invalid Zcash address'))
self.show_message(_('Invalid Zclassic address'))
return
try:
amount = int(Decimal(self.str_amount) * COIN)
@ -392,7 +392,7 @@ class ElectrumGui:
self.show_message("Error:" + server + "\nIn doubt, type \"auto-connect\"")
return False
if out.get('server') or out.get('proxy'):
proxy = electrum_zcash.network.deserialize_proxy(out.get('proxy')) if out.get('proxy') else proxy_config
proxy = electrum_zclassic.network.deserialize_proxy(out.get('proxy')) if out.get('proxy') else proxy_config
self.network.set_parameters(host, port, protocol, proxy, auto_connect)
def settings_dialog(self):

2
icons.qrc
View File

@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/" >
<file>icons/electrum-zcash.png</file>
<file>icons/electrum-zclassic.png</file>
<file>icons/clock1.png</file>
<file>icons/clock2.png</file>
<file>icons/clock3.png</file>

BIN
icons/electrum-zcash.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 289 KiB

BIN
icons/electrum-zcash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

Some files were not shown because too many files have changed in this diff Show More