Merge dash changes

Author: Kefkius

.gitignore

@@ -6,9 +6,9 @@ lib/icons_rc.py
 build/
 dist/
 *.egg/
-/electrum.py
+/electrum-dash.py
 contrib/pyinstaller/
-Electrum.egg-info/
+Electrum*.egg-info/
 gui/qt/icons_rc.py
 locale/
 .devlocaltmp/

MANIFEST.in

@@ -1,8 +1,8 @@
 include README LICENCE RELEASE-NOTES AUTHORS
-include electrum.conf.sample
-include electrum.desktop
+include electrum-dash.conf.sample
+include electrum_dash.desktop
 include *.py
-include electrum
+include electrum-dash
 recursive-include lib *.py
 recursive-include gui *.py
 recursive-include plugins *.py

RELEASE-NOTES

@@ -16,7 +16,7 @@
    in DNS (OpenAlias). The identity of the requestor is verified using
    DNSSEC.
  * Payment requests signed with OpenAlias keys can be shared as
-   bitcoin: URIs, if they are simple (a single address-type
+   dash: URIs, if they are simple (a single address-type
    output). The BIP21 URI scheme is extended with 'name', 'sig',
    'time', 'exp'.
  * Arbitrary m-of-n multisig wallets are supported (n<=15).
@@ -90,7 +90,7 @@
  * A Search Box is available in the GUI (Ctrl-S)
  * Payment requests have an expiration date and can be exported to
    BIP70 files.
- * file: scheme support in BIP72 URIs: "bitcoin:?r=file:///..."
+ * file: scheme support in BIP72 URIs: "dash:?r=file:///..."
  * Own addresses are shown in green in the Transaction dialog.
  * Address History dialog.
  * The OpenAlias plugin was improved.

electrum electrum-dash

@@ -62,19 +62,19 @@ except Exception:
     sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
 
 
-# load local module as electrum
+# load local module as electrum_dash
 if is_bundle or is_local or is_android:
     import imp
-    imp.load_module('electrum', *imp.find_module('lib'))
-    imp.load_module('electrum_gui', *imp.find_module('gui'))
+    imp.load_module('electrum_dash', *imp.find_module('lib'))
+    imp.load_module('electrum_dash_gui', *imp.find_module('gui'))
 
 
-from electrum import util
-from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy
-from electrum.util import print_msg, print_error, print_stderr, print_json, set_verbosity, InvalidPassword
-from electrum.daemon import get_daemon
-from electrum.plugins import init_plugins, run_hook, always_hook
-from electrum.commands import get_parser, known_commands, Commands, config_variables
+from electrum_dash import util
+from electrum_dash import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy
+from electrum_dash.util import print_msg, print_error, print_stderr, print_json, set_verbosity, InvalidPassword
+from electrum_dash.daemon import get_daemon
+from electrum_dash.plugins import init_plugins, run_hook, always_hook
+from electrum_dash.commands import get_parser, known_commands, Commands, config_variables
 
 
 # get password routine
@@ -99,9 +99,9 @@ def run_gui(config):
     if url:
         if os.path.exists(url):
             # assume this is a payment request
-            url = "bitcoin:?r=file://"+ os.path.join(os.getcwd(), url)
+            url = "dash:?r=file://"+ os.path.join(os.getcwd(), url)
 
-        if not re.match('^bitcoin:', url):
+        if not re.match('^dash:', url):
             print_stderr('unknown command:', url)
             sys.exit(1)
 
@@ -110,7 +110,7 @@ def run_gui(config):
         gui_name = 'qt'
 
     try:
-        gui = __import__('electrum_gui.' + gui_name, fromlist=['electrum_gui'])
+        gui = __import__('electrum_dash_gui.' + gui_name, fromlist=['electrum_dash_gui'])
     except ImportError:
         traceback.print_exc(file=sys.stdout)
         sys.exit()
@@ -139,7 +139,7 @@ def run_gui(config):
 def run_daemon(config):
     cmd = config.get('subcommand')
     if cmd not in ['start', 'stop', 'status']:
-        print_msg("syntax: electrum daemon <start|status|stop>")
+        print_msg("syntax: electrum-dash daemon <start|status|stop>")
         sys.exit(1)
     s = get_daemon(config, False)
     if cmd == 'start':
@@ -262,7 +262,7 @@ def run_cmdline(config):
 
     if cmd.name not in ['create', 'restore'] and cmd.requires_wallet and not storage.file_exists:
         print_msg("Error: Wallet file not found.")
-        print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
+        print_msg("Type 'electrum-dash create' to create a new wallet, or provide a path to a wallet with the -w option")
         sys.exit(0)
 
     # create wallet instance
@@ -299,7 +299,7 @@ def run_cmdline(config):
     if cmd.requires_network and not config.get('offline'):
         s = get_daemon(config, False)
         if not s:
-            print_msg("Network daemon is not running. Try 'electrum daemon start'\nIf you want to run this command offline, use the -o flag.")
+            print_msg("Network daemon is not running. Try 'electrum-dash daemon start'\nIf you want to run this command offline, use the -o flag.")
             sys.exit(1)
         network = NetworkProxy(s, config)
         network.start()

electrum-env electrum-dash-env

@@ -19,6 +19,6 @@ fi
 
 export PYTHONPATH="/usr/local/lib/python2.7/site-packages:$PYTHONPATH"
 
-./electrum "$@"
+./electrum-dash "$@"
 
 deactivate

electrum.conf.sample electrum-dash.conf.sample

@@ -1,8 +1,8 @@
-# Configuration file for the electrum client
+# Configuration file for the electrum-dash client
 # Settings defined here are shared across wallets
 #
-# copy this file to /etc/electrum.conf if you want read-only settings
-# copy it into your ~/.electrum/ directory if you want global settings
+# copy this file to /etc/electrum-dash.conf if you want read-only settings
+# copy it into your ~/.electrum-dash/ directory if you want global settings
 # that can be rewritten by the client
 
 [client]

electrum.desktop

@@ -0,0 +1,17 @@
+# If you want electrum-dash to appear in a linux app launcher ("start menu"), install this by doing:
+# sudo desktop-file-install electrum_dash.desktop
+
+[Desktop Entry]
+Comment=Lightweight Dashpay Client
+Exec=electrum-dash %u
+GenericName[en_US]=Electrum-DASH
+GenericName=Electrum-DASH
+Icon=electrum_dash
+Name[en_US]=Electrum Dashpay Wallet
+Name=Electrum Dashpay Wallet
+Categories=Network;
+StartupNotify=false
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/bitcoin;
+

electrum_dash.desktop

@@ -22,9 +22,9 @@
 from __future__ import absolute_import
 import android
 
-from electrum import SimpleConfig, Wallet, WalletStorage, format_satoshis
-from electrum.bitcoin import is_address, COIN
-from electrum import util
+from electrum_dash import SimpleConfig, Wallet, WalletStorage, format_satoshis
+from electrum_dash.bitcoin import is_address, COIN
+from electrum_dash import util
 from decimal import Decimal
 import datetime, re
 
@@ -474,7 +474,7 @@ def make_new_contact():
     if r:
         data = str(r['extras']['SCAN_RESULT']).strip()
         if data:
-            if re.match('^bitcoin:', data):
+            if re.match('^dash:', data):
                 out = util.parse_URI(data)
                 address = out.get('address')
             elif is_address(data):
@@ -582,7 +582,7 @@ def payto_loop():
                 amount = droid.fullQueryDetail('amount').result.get('text')
 
                 if not is_address(recipient):
-                    modal_dialog('Error','Invalid Bitcoin address')
+                    modal_dialog('Error','Invalid Dash address')
                     continue
 
                 try:
@@ -606,7 +606,7 @@ def payto_loop():
                     data = str(r['extras']['SCAN_RESULT']).strip()
                     if data:
                         print "data", data
-                        if re.match('^bitcoin:', data):
+                        if re.match('^dash:', data):
                             payto, amount, label, message, _ = util.parse_URI(data)
                             if amount:
                                 amount = str(amount / COIN)
@@ -661,7 +661,7 @@ def receive_loop():
             modal_dialog('URI copied to clipboard', receive_URI)
 
         elif event["name"]=="amount":
-            amount = modal_input('Amount', 'Amount you want to receive (in BTC). ', format_satoshis(receive_amount) if receive_amount else None, "numberDecimal")
+            amount = modal_input('Amount', 'Amount you want to receive (in DASH). ', format_satoshis(receive_amount) if receive_amount else None, "numberDecimal")
             if amount is not None:
                 receive_amount = int(COIN * Decimal(amount)) if amount else None
                 out = 'receive'
@@ -880,7 +880,7 @@ def make_bitmap(data):
     droid.dialogShow()
     try:
         import qrcode
-        from electrum import bmp
+        from electrum_dash import bmp
         qr = qrcode.QRCode()
         qr.add_data(data)
         bmp.save_qrcode(qr,"/sdcard/sl4a/qrcode.bmp")

electrum.icns electrum_dash.icns

@@ -24,18 +24,18 @@
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk, Gdk, GObject, cairo
 from decimal import Decimal
-from electrum.util import print_error, InvalidPassword
-from electrum.bitcoin import is_valid, COIN
-from electrum.wallet import NotEnoughFunds
-from electrum import WalletStorage, Wallet
+from electrum_dash.util import print_error, InvalidPassword
+from electrum_dash.bitcoin import is_valid, COIN
+from electrum_dash.wallet import NotEnoughFunds
+from electrum_dash import WalletStorage, Wallet
 
 Gdk.threads_init()
 APP_NAME = "Electrum"
 import platform
 MONOSPACE_FONT = 'Lucida Console' if platform.system() == 'Windows' else 'monospace'
 
-from electrum.util import format_satoshis, parse_URI
-from electrum.bitcoin import MIN_RELAY_TX_FEE
+from electrum_dash.util import format_satoshis, parse_URI
+from electrum_dash.bitcoin import MIN_RELAY_TX_FEE
 
 def numbify(entry, is_int = False):
     text = entry.get_text().strip()
@@ -466,7 +466,7 @@ def __init__(self, wallet, config, network):
         self.window.set_default_size(720, 350)
         self.wallet_updated = False
 
-        from electrum.util import StoreDict
+        from electrum_dash.util import StoreDict
         self.contacts = StoreDict(self.config, 'contacts')
 
         vbox = Gtk.VBox()

gui/android.py

@@ -25,8 +25,8 @@
 import socket, os
 from jsonrpclib.SimpleJSONRPCServer import SimpleJSONRPCServer, SimpleJSONRPCRequestHandler
 
-from electrum.wallet import WalletStorage, Wallet
-from electrum.commands import known_commands, Commands
+from electrum_dash.wallet import WalletStorage, Wallet
+from electrum_dash.commands import known_commands, Commands
 
 
 class RequestHandler(SimpleJSONRPCRequestHandler):

gui/gtk.py

@@ -34,11 +34,11 @@
 from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 
-from electrum.i18n import _, set_language
-from electrum.util import print_error, print_msg
-from electrum.plugins import run_hook, always_hook
-from electrum import WalletStorage, Wallet
-from electrum.bitcoin import MIN_RELAY_TX_FEE
+from electrum_dash.i18n import _, set_language
+from electrum_dash.util import print_error, print_msg
+from electrum_dash.plugins import run_hook, always_hook
+from electrum_dash import WalletStorage, Wallet
+from electrum_dash.bitcoin import MIN_RELAY_TX_FEE
 
 try:
     import icons_rc
@@ -79,7 +79,7 @@ def build_tray_menu(self):
         m.addAction(_("Show/Hide"), self.show_or_hide)
         m.addAction(_("Dark/Light"), self.toggle_tray_icon)
         m.addSeparator()
-        m.addAction(_("Exit Electrum"), self.close)
+        m.addAction(_("Exit Electrum-DASH"), self.close)
         self.tray.setContextMenu(m)
 
     def toggle_tray_icon(self):
@@ -121,7 +121,7 @@ def init_lite(self):
         import lite_window
         if not self.check_qt_version():
             if self.config.get('lite_mode') is True:
-                msg = "Electrum was unable to load the 'Lite GUI' because it needs Qt version >= 4.7.\nChanging your config to use the 'Classic' GUI"
+                msg = "Electrum-DASH was unable to load the 'Lite GUI' because it needs Qt version >= 4.7.\nChanging your config to use the 'Classic' GUI"
                 QMessageBox.warning(None, "Could not start Lite GUI.", msg)
                 self.config.set_key('lite_mode', False, True)
                 sys.exit(0)
@@ -201,7 +201,7 @@ def main(self, url):
         self.dark_icon = self.config.get("dark_icon", False)
         icon = QIcon(":icons/electrum_dark_icon.png") if self.dark_icon else QIcon(':icons/electrum_light_icon.png')
         self.tray = QSystemTrayIcon(icon, None)
-        self.tray.setToolTip('Electrum')
+        self.tray.setToolTip('Electrum-DASH')
         self.tray.activated.connect(self.tray_activated)
         self.build_tray_menu()
         self.tray.show()

gui/jsonrpc.py

@@ -17,8 +17,8 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import sys, time, datetime, re, threading
-from electrum.i18n import _, set_language
-from electrum.util import print_error, print_msg
+from electrum_dash.i18n import _, set_language
+from electrum_dash.util import print_error, print_msg
 import os.path, json, ast, traceback
 import shutil
 import StringIO

gui/qt/__init__.py

@@ -4,7 +4,7 @@
 from PyQt4.QtGui import *
 
 from decimal import Decimal
-from electrum.util import format_satoshis_plain
+from electrum_dash.util import format_satoshis_plain
 
 class MyLineEdit(QLineEdit):
     frozen = pyqtSignal()
@@ -79,11 +79,11 @@ def _base_unit(self):
         p = self.decimal_point()
         assert p in [2, 5, 8]
         if p == 8:
-            return 'BTC'
+            return 'DASH'
         if p == 5:
-            return 'mBTC'
+            return 'mDASH'
         if p == 2:
-            return 'bits'
+            return 'uDASH'
         raise Exception('Unknown base unit')
 
     def get_amount(self):

gui/qt/address_dialog.py

@@ -4,7 +4,7 @@
 import traceback, platform
 from PyQt4 import QtCore
 from PyQt4 import QtGui
-from electrum import util
+from electrum_dash import util
 
 
 if platform.system() == 'Windows':

gui/qt/amountedit.py

@@ -20,9 +20,9 @@
 import webbrowser
 
 from util import *
-from electrum.i18n import _
-from electrum.util import block_explorer_URL, format_satoshis, format_time
-from electrum.plugins import run_hook
+from electrum_dash.i18n import _
+from electrum_dash.util import block_explorer_URL, format_satoshis, format_time
+from electrum_dash.plugins import run_hook
 
 
 class HistoryWidget(MyTreeWidget):

gui/qt/console.py

@@ -1,5 +1,5 @@
 from PyQt4.QtGui import *
-from electrum.i18n import _
+from electrum_dash.i18n import _
 
 class HistoryWidget(QTreeWidget):