Initial rebase is done

MANIFEST.in

@@ -1,6 +1,6 @@
 include LICENCE RELEASE-NOTES AUTHORS
 include README.rst
-include electrum.desktop
+include electrum-xzc.desktop
 include *.py
 include run_electrum
 include contrib/requirements/requirements.txt

contrib/build-linux/appimage/build.sh

@@ -143,8 +143,8 @@ cp "/usr/lib/libzbar.so.0" "$APPDIR/usr/lib/libzbar.so.0"
 
 
 info "desktop integration."
-cp "$PROJECT_ROOT/electrum.desktop" "$APPDIR/electrum.desktop"
-cp "$PROJECT_ROOT/electrum/gui/icons/electrum.png" "$APPDIR/electrum.png"
+cp "$PROJECT_ROOT/electrum-xzc.desktop" "$APPDIR/electrum-xzc.desktop"
+cp "$PROJECT_ROOT/electrum_xzc/gui/icons/electrum-xzc.png" "$APPDIR/electrum-xzc.png"
 
 
 # add launcher

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-NAME_ROOT=electrum
+NAME_ROOT=electrum-xzc
 
 # These settings probably don't need any change
 export WINEPREFIX=/opt/wine64
@@ -19,24 +19,24 @@ here="$(dirname "$(readlink -e "$0")")"
 
 . "$CONTRIB"/build_tools_util.sh
 
-pushd $WINEPREFIX/drive_c/electrum
+pushd $WINEPREFIX/drive_c/electrum-xzc
 
 VERSION=`git describe --tags --dirty --always`
 info "Last commit: $VERSION"
 
 # Load electrum-locale for this release
-git submodule update --init
-
-pushd ./contrib/deterministic-build/electrum-locale
-if ! which msgfmt > /dev/null 2>&1; then
- fail "Please install gettext"
-fi
-for i in ./locale/*; do
- dir=$WINEPREFIX/drive_c/electrum/electrum/$i/LC_MESSAGES
- mkdir -p $dir
- msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
-done
-popd
+#git submodule update --init
+#
+#pushd ./contrib/deterministic-build/electrum-locale
+#if ! which msgfmt > /dev/null 2>&1; then
+# fail "Please install gettext"
+#fi
+#for i in ./locale/*; do
+# dir=$WINEPREFIX/drive_c/electrum/electrum/$i/LC_MESSAGES
+# mkdir -p $dir
+# msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
+#done
+#popd
 
 find -exec touch -d '2000-11-11T11:11:11+00:00' {} +
 popd
@@ -47,7 +47,7 @@ $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-bui
 
 $PYTHON -m pip install --no-warn-script-location -r "$CONTRIB"/deterministic-build/requirements-hw.txt
 
-pushd $WINEPREFIX/drive_c/electrum
+pushd $WINEPREFIX/drive_c/electrum-xzc
 # see https://github.com/pypa/pip/issues/2195 -- pip makes a copy of the entire directory
 info "Pip installing Electrum. This might take a long time if the project folder is large."
 $PYTHON -m pip install --no-warn-script-location .
@@ -70,7 +70,7 @@ info "building NSIS installer"
 wine "$WINEPREFIX/drive_c/Program Files (x86)/NSIS/makensis.exe" /DPRODUCT_VERSION=$VERSION electrum.nsi
 
 cd dist
-mv electrum-setup.exe $NAME_ROOT-$VERSION-setup.exe
+mv electrum-xzc-setup.exe $NAME_ROOT-$VERSION-setup.exe
 cd ..
 
 info "Padding binaries to 8-byte boundaries, and fixing COFF image checksum in PE header"

contrib/build-wine/deterministic.spec

@@ -12,7 +12,7 @@ else:
 
 PYHOME = 'c:/python3'
 
-home = 'C:\\electrum\\'
+home = 'C:\\electrum-xzc\\'
 
 # see https://github.com/pyinstaller/pyinstaller/issues/2005
 hiddenimports = []
@@ -38,12 +38,12 @@ binaries += [b for b in collect_dynamic_libs('PyQt5') if 'qwindowsvista' in b[0]
 binaries += [('C:/tmp/libsecp256k1.dll', '.')]
 
 datas = [
- (home+'electrum/*.json', 'electrum'),
- (home+'electrum/wordlist/english.txt', 'electrum/wordlist'),
- (home+'electrum/locale', 'electrum/locale'),
- (home+'electrum/plugins', 'electrum/plugins'),
+ (home+'electrum_xzc/*.json', 'electrum_xzc'),
+ (home+'electrum_xzc/wordlist/english.txt', 'electrum_xzc/wordlist'),
+ (home+'electrum_xzc/locale', 'electrum_xzc/locale'),
+ (home+'electrum_xzc/plugins', 'electrum_xzc/plugins'),
  ('C:\\Program Files (x86)\\ZBar\\bin\\', '.'),
- (home+'electrum/gui/icons', 'electrum/gui/icons'),
+ (home+'electrum_xzc/gui/icons', 'electrum_xzc/gui/icons'),
 ]
 datas += collect_data_files('trezorlib')
 datas += collect_data_files('safetlib')
@@ -53,22 +53,22 @@ datas += collect_data_files('ckcc')
 
 # We don't put these files in to actually include them in the script but to make the Analysis method scan them for imports
 a = Analysis([home+'run_electrum',
- home+'electrum/gui/qt/main_window.py',
- home+'electrum/gui/text.py',
- home+'electrum/util.py',
- home+'electrum/wallet.py',
- home+'electrum/simple_config.py',
- home+'electrum/bitcoin.py',
- home+'electrum/dnssec.py',
- home+'electrum/commands.py',
- home+'electrum/plugins/cosigner_pool/qt.py',
- home+'electrum/plugins/email_requests/qt.py',
- home+'electrum/plugins/trezor/qt.py',
- home+'electrum/plugins/safe_t/client.py',
- home+'electrum/plugins/safe_t/qt.py',
- home+'electrum/plugins/keepkey/qt.py',
- home+'electrum/plugins/ledger/qt.py',
- home+'electrum/plugins/coldcard/qt.py',
+ home+'electrum_xzc/gui/qt/main_window.py',
+ home+'electrum_xzc/gui/text.py',
+ home+'electrum_xzc/util.py',
+ home+'electrum_xzc/wallet.py',
+ home+'electrum_xzc/simple_config.py',
+ home+'electrum_xzc/bitcoin.py',
+ home+'electrum_xzc/dnssec.py',
+ home+'electrum_xzc/commands.py',
+ home+'electrum_xzc/plugins/cosigner_pool/qt.py',
+ home+'electrum_xzc/plugins/email_requests/qt.py',
+ home+'electrum_xzc/plugins/trezor/qt.py',
+ home+'electrum_xzc/plugins/safe_t/client.py',
+ home+'electrum_xzc/plugins/safe_t/qt.py',
+ home+'electrum_xzc/plugins/keepkey/qt.py',
+ home+'electrum_xzc/plugins/ledger/qt.py',
+ home+'electrum_xzc/plugins/coldcard/qt.py',
  #home+'packages/requests/utils.py'
  ],
  binaries=binaries,
@@ -116,11 +116,11 @@ exe_standalone = EXE(
  a.scripts,
  a.binaries,
  a.datas,
- name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + ".exe"),
+ name=os.path.join('build\\pyi.win32\\electrum-xzc', cmdline_name + ".exe"),
  debug=False,
  strip=None,
  upx=False,
- icon=home+'electrum/gui/icons/electrum.ico',
+ icon=home+'electrum_xzc/gui/icons/electrum.ico',
  console=False)
  # console=True makes an annoying black box pop up, but it does make Electrum output command line commands, with this turned off no output will be given but commands can still be used
 
@@ -129,11 +129,11 @@ exe_portable = EXE(
  a.scripts,
  a.binaries,
  a.datas + [ ('is_portable', 'README.md', 'DATA' ) ],
- name=os.path.join('build\\pyi.win32\\electrum', cmdline_name + "-portable.exe"),
+ name=os.path.join('build\\pyi.win32\\electrum-xzc', cmdline_name + "-portable.exe"),
  debug=False,
  strip=None,
  upx=False,
- icon=home+'electrum/gui/icons/electrum.ico',
+ icon=home+'electrum_xzc/gui/icons/electrum.ico',
  console=False)
 
 #####
@@ -143,11 +143,11 @@ exe_dependent = EXE(
  pyz,
  a.scripts,
  exclude_binaries=True,
- name=os.path.join('build\\pyi.win32\\electrum', cmdline_name),
+ name=os.path.join('build\\pyi.win32\\electrum-xzc', cmdline_name),
  debug=False,
  strip=None,
  upx=False,
- icon=home+'electrum/gui/icons/electrum.ico',
+ icon=home+'electrum_xzc/gui/icons/electrum.ico',
  console=False)
 
 coll = COLLECT(
@@ -158,6 +158,6 @@ coll = COLLECT(
  strip=None,
  upx=True,
  debug=False,
- icon=home+'electrum/gui/icons/electrum.ico',
+ icon=home+'electrum_xzc/gui/icons/electrum.ico',
  console=False,
- name=os.path.join('dist', 'electrum'))
+ name=os.path.join('dist', 'electrum-xzc'))

contrib/build-wine/electrum.nsi

@@ -6,8 +6,8 @@
 ;--------------------------------
 ;Variables
 
- !define PRODUCT_NAME "Electrum"
- !define PRODUCT_WEB_SITE "https://github.com/spesmilo/electrum"
+ !define PRODUCT_NAME "Electrum-XZC"
+ !define PRODUCT_WEB_SITE "https://github.com/zcoinofficial/electrum-xzc"
  !define PRODUCT_PUBLISHER "Electrum Technologies GmbH"
  !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 
@@ -16,7 +16,7 @@
 
  ;Name and file
  Name "${PRODUCT_NAME}"
- OutFile "dist/electrum-setup.exe"
+ OutFile "dist/electrum-xzc-setup.exe"
 
  ;Default installation folder
  InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
@@ -72,7 +72,7 @@
  !define MUI_ABORTWARNING
  !define MUI_ABORTWARNING_TEXT "Are you sure you wish to abort the installation of ${PRODUCT_NAME}?"
 
- !define MUI_ICON "c:\electrum\electrum\gui\icons\electrum.ico"
+ !define MUI_ICON "c:\electrum-xzc\electrum_xzc\gui\icons\electrum.ico"
 
 ;--------------------------------
 ;Pages
@@ -110,8 +110,8 @@ Section
  Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"
 
  ;Files to pack into the installer
- File /r "dist\electrum\*.*"
- File "c:\electrum\electrum\gui\icons\electrum.ico"
+ File /r "dist\electrum-xzc\*.*"
+ File "c:\electrum-xzc\electrum_xzc\gui\icons\electrum.ico"
 
  ;Store installation folder
  WriteRegStr HKCU "Software\${PRODUCT_NAME}" "" $INSTDIR
@@ -128,15 +128,15 @@ Section
  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-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0
- CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-${PRODUCT_VERSION}.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe" "" "$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe" 0
+ CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME} Testnet.lnk" "$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe" "--testnet" "$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe" 0
 
 
  ;Links bitcoin: URI's to Electrum
- WriteRegStr HKCU "Software\Classes\bitcoin" "" "URL:bitcoin Protocol"
- WriteRegStr HKCU "Software\Classes\bitcoin" "URL Protocol" ""
- WriteRegStr HKCU "Software\Classes\bitcoin" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\""
- WriteRegStr HKCU "Software\Classes\bitcoin\shell\open\command" "" "$\"$INSTDIR\electrum-${PRODUCT_VERSION}.exe$\" $\"%1$\""
+ WriteRegStr HKCU "Software\Classes\zcoin" "" "URL:zcoin Protocol"
+ WriteRegStr HKCU "Software\Classes\zcoin" "URL Protocol" ""
+ WriteRegStr HKCU "Software\Classes\zcoin" "DefaultIcon" "$\"$INSTDIR\electrum.ico, 0$\""
+ WriteRegStr HKCU "Software\Classes\zcoin\shell\open\command" "" "$\"$INSTDIR\electrum-xzc-${PRODUCT_VERSION}.exe$\" $\"%1$\""
 
  ;Adds an uninstaller possibility to Windows Uninstall or change a program section
  WriteRegStr HKCU "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
@@ -167,7 +167,7 @@ Section "Uninstall"
  Delete "$SMPROGRAMS\${PRODUCT_NAME}\*.*"
  RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
 
- DeleteRegKey HKCU "Software\Classes\bitcoin"
+ DeleteRegKey HKCU "Software\Classes\zcoin"
  DeleteRegKey HKCU "Software\${PRODUCT_NAME}"
  DeleteRegKey HKCU "${PRODUCT_UNINST_KEY}"
 SectionEnd

contrib/build-wine/prepare-wine.sh

@@ -84,7 +84,7 @@ info "Building PyInstaller."
 # we build our own PyInstaller boot loader as the default one has high
 # anti-virus false positives
 (
- cd "$WINEPREFIX/drive_c/electrum"
+ cd "$WINEPREFIX/drive_c/electrum-xzc"
  ELECTRUM_COMMIT_HASH=$(git rev-parse HEAD)
  cd "$CACHEDIR"
  rm -rf pyinstaller

contrib/deterministic-build/check_submodules.sh

@@ -20,9 +20,9 @@ fail=0
 
 
 if [ $(date +%s -d "2 weeks ago") -gt $(get_git_mtime "contrib/deterministic-build/electrum-locale/") ]; then
- echo "Last update from electrum-locale is older than 2 weeks."\
+ echo "Last update from electrum_xzc-locale is older than 2 weeks."\
  "Please update it to incorporate the latest translations from crowdin."
  fail=1
 fi
 
-exit ${fail}
+exit ${fail}

contrib/make_download

@@ -3,7 +3,7 @@ import re
 import os
 import sys
 
-from electrum.version import ELECTRUM_VERSION, APK_VERSION
+from electrum_xzc.version import ELECTRUM_VERSION, APK_VERSION
 print("version", ELECTRUM_VERSION)
 
 dirname = sys.argv[1]
@@ -23,18 +23,18 @@ string = string.replace("##VERSION_ANDROID##", version_android)
 string = string.replace("##VERSION_APK##", APK_VERSION)
 
 files = {
- 'tgz': "Electrum-%s.tar.gz" % version,
- 'appimage': "electrum-%s-x86_64.AppImage" % version,
- 'zip': "Electrum-%s.zip" % version,
- 'mac': "electrum-%s.dmg" % version_mac,
- 'win': "electrum-%s.exe" % version_win,
- 'win_setup': "electrum-%s-setup.exe" % version_win,
- 'win_portable': "electrum-%s-portable.exe" % version_win,
+ 'tgz': "Electrum-XZC-%s.tar.gz" % version,
+ 'appimage': "electrum-xzc-%s-x86_64.AppImage" % version,
+ 'zip': "Electrum-XZC-%s.zip" % version,
+ 'mac': "electrum-xzc-%s.dmg" % version_mac,
+ 'win': "electrum-xzc-%s.exe" % version_win,
+ 'win_setup': "electrum-xzc-%s-setup.exe" % version_win,
+ 'win_portable': "electrum-xzc-%s-portable.exe" % version_win,
 }
 
 for k, n in files.items():
  path = "dist/%s"%n
- link = "https://download.electrum.org/%s/%s"%(version,n)
+ link = "https://download.electrum-xzc.org/%s"%n
  if not os.path.exists(path):
  os.system("wget -q %s -O %s" % (link, path))
  if not os.path.getsize(path):

contrib/make_tgz

@@ -5,7 +5,7 @@ set -e
 CONTRIB="$(dirname "$(readlink -e "$0")")"
 ROOT_FOLDER="$CONTRIB"/..
 PACKAGES="$ROOT_FOLDER"/packages/
-LOCALE="$ROOT_FOLDER"/electrum/locale/
+LOCALE="$ROOT_FOLDER"/electrum_xzc/locale/
 
 if [ ! -d "$PACKAGES" ]; then
  echo "Run make_packages first!"
@@ -22,10 +22,10 @@ git submodule update --init
  exit 1
  fi
  for i in ./locale/*; do
- dir="$ROOT_FOLDER"/electrum/$i/LC_MESSAGES
+ dir="$ROOT_FOLDER"/electrum-xzc/$i/LC_MESSAGES
  mkdir -p $dir
  msgfmt --output-file=$dir/electrum.mo $i/electrum.po || true
- cp $i/electrum.po "$ROOT_FOLDER"/electrum/$i/electrum.po
+ cp $i/electrum.po "$ROOT_FOLDER"/electrum-xzc/$i/electrum.po
  done
 )
 

contrib/osx/make_osx

@@ -3,7 +3,7 @@
 # Parameterize
 PYTHON_VERSION=3.6.4
 BUILDDIR=/tmp/electrum-build
-PACKAGE=Electrum
+PACKAGE=Electrum-XZC
 GIT_REPO=https://github.com/spesmilo/electrum
 LIBSECP_VERSION="b408c6a8b287003d1ade5709e6f7bc3c7f1d5be7"
 
@@ -17,7 +17,7 @@ src_dir=$(dirname "$0")
 cd $src_dir/../..
 
 export PYTHONHASHSEED=22
-VERSION=`git describe --tags --dirty --always`
+VERSION=`git describe --tags --always`
 
 which brew > /dev/null 2>&1 || fail "Please install brew from https://brew.sh/ to continue"
 which xcodebuild > /dev/null 2>&1 || fail "Please install Xcode and xcode command line tools to continue"