Prepare for merge with EC Regular repo

- Bump version to 4.0.0
- Update URLs in app to point to the appropriate Electron-Cash/ and
electroncash.org
- And other miscellany related to this

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

@@ -3,7 +3,7 @@
 NAME_ROOT=Electron-Cash
 PYTHON_VERSION=3.5.4
 
-CHECKOUT_TAG=3.3.6
+CHECKOUT_TAG=4.0.0
 
 # These settings probably don't need any change
 export WINEPREFIX=/opt/wine64
@@ -27,7 +27,7 @@ if [ -d electrum ]; then
     git pull
     cd ..
 else
-    URL=https://github.com/clifordsymack/Electron-Cash
+    URL=https://github.com/Electron-Cash/Electron-Cash
     git clone -b master $URL electrum # rest of script assumes the dir is called 'electrum'
 fi
 

contrib/osx/make_osx

@@ -15,8 +15,8 @@ VERSION=`git describe --tags`
 PYTHON_VERSION=3.6.8
 BUILDDIR=/tmp/electron-cash-build
 PACKAGE=Electron-Cash
-GIT_REPO_ACCT=https://github.com/cashshuffle
-GIT_REPO=https://github.com/clifordsymack/Electron-Cash
+GIT_REPO_ACCT=https://github.com/Electron-Cash
+GIT_REPO=$GIT_REPO_ACCT/Electron-Cash
 LIBSECP_VERSION="b408c6a8b287003d1ade5709e6f7bc3c7f1d5be7"
 # Compute major.minor Python version from above using Bash array magic
 MAJ_MIN=(${PYTHON_VERSION//./ })

gui/qt/update_checker.py

@@ -63,8 +63,8 @@ class UpdateChecker(QWidget, PrintError):
     _dl_prog = pyqtSignal(object, int) # [0 -> 100] range
 
     #url = "https://www.c3-soft.com/downloads/BitcoinCash/Electron-Cash/update_check" # Testing URL
-    url = "https://raw.github.com/clifordsymack/Electron-Cash/master/contrib/update_checker/releases.json" # Release URL
-    download_url = "https://github.com/clifordsymack/Electron-Cash/releases"
+    url = "https://raw.github.com/Electron-Cash/Electron-Cash/master/contrib/update_checker/releases.json" # Release URL
+    download_url = "https://electroncash.org/#download"
 
     VERSION_ANNOUNCEMENT_SIGNING_ADDRESSES = (
         address.Address.from_string("bitcoincash:qphax4cg8sxuc0qnzk6sx25939ma7y877uz04s2z82", net=MainNet), # Calin's key

lib/version.py

@@ -1,4 +1,4 @@
-PACKAGE_VERSION  = '3.9.15ShufBeta'  # version of the client package
+PACKAGE_VERSION  = '4.0.0'  # version of the client package
 PROTOCOL_VERSION = '1.4'     # protocol version requested
 
 # The hash of the mnemonic seed must begin with this