Merge pull request #5 from benkno/master

Changed RAD to RXD + fixes

electroncash/lns.py

@@ -42,7 +42,7 @@
 try:
     from web3 import Web3
     from web3.contract import Contract
-    available = True
+    available = False
 except ImportError:
     available = False
     Web3 = type(None)

electroncash/networks.py

@@ -40,8 +40,8 @@ class AbstractNet:
     LEGACY_POW_TARGET_TIMESPAN = 14 * 24 * 60 * 60   # 2 weeks
     LEGACY_POW_TARGET_INTERVAL = 10 * 60  # 10 minutes
     LEGACY_POW_RETARGET_BLOCKS = LEGACY_POW_TARGET_TIMESPAN // LEGACY_POW_TARGET_INTERVAL  # 2016 blocks
-    BASE_UNITS = {'RAD': 8, 'mRAD': 5, 'bits': 2}
-    DEFAULT_UNIT = "RAD"
+    BASE_UNITS = {'RXD': 8, 'mRXD': 5, 'bits': 2}
+    DEFAULT_UNIT = "RXD"
 
 
 class MainNet(AbstractNet):
@@ -103,8 +103,8 @@ class TestNet(AbstractNet):
     DEFAULT_PORTS = {'t':'51001', 's':'51002'}
     DEFAULT_SERVERS = _read_json_dict('servers_testnet.json')  # DO NOT MODIFY IN CLIENT CODE
     TITLE = 'Electron Radiant Testnet'
-    BASE_UNITS = {'tRAD': 8, 'mtRAD': 5, 'tbits': 2}
-    DEFAULT_UNIT = "tRAD"
+    BASE_UNITS = {'tRXD': 8, 'mtRXD': 5, 'tbits': 2}
+    DEFAULT_UNIT = "tRXD"
 
     # Nov 13. 2017 HF to CW144 DAA height (height of last block mined on old DAA)
     CW144_HEIGHT = 1188697
@@ -153,8 +153,8 @@ class TestNet4(TestNet):
 class ScaleNet(TestNet):
     GENESIS = "00000000e6453dc2dfe1ffa19023f86002eb11dbb8e87d0291a4599f0430be52"
     TITLE = 'Electron Cash Scalenet'
-    BASE_UNITS = {'sRAD': 8, 'msRAD': 5, 'sbits': 2}
-    DEFAULT_UNIT = "tRAD"
+    BASE_UNITS = {'sRXD': 8, 'msRXD': 5, 'sbits': 2}
+    DEFAULT_UNIT = "tRXD"
 
 
     HEADERS_URL = "http://bitcoincash.com/files/scalenet_headers"  # Unused

electroncash/util.py

@@ -45,8 +45,8 @@ def inv_dict(d):
     return {v: k for k, v in d.items()}
 
 
-DEFAULT_BASE_UNIT = "RAD"
-base_units = {'RAD':8, 'mRAD':5, 'bits':2}
+DEFAULT_BASE_UNIT = "RXD"
+base_units = {'RXD':8, 'mRXD':5, 'bits':2}
 
 inv_base_units = {}
 base_unit_labels = tuple()

electroncash/version.py

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

electroncash_gui/qt/contact_list.py

@@ -242,26 +242,18 @@ def create_menu(self, position):
                     menu.addAction(_("Details..."), lambda: lnsqt.lns_detail_dialog(self.parent, _contact_d.name))
             menu.addSeparator()
 
-        menu.addAction(self.icon_cashacct,
-                       _("Add Contact") + " - " + _("Cash Account"), self.new_cash_account_contact_dialog)
         if self.have_lns:
             menu.addAction(self.icon_lns,
                            _("Add Contact") + " - " + _("LNS Name"), self.new_lns_contact_dialog)
         menu.addAction(self.icon_contacts, _("Add Contact") + " - " + _("Address"), self.parent.new_contact_dialog)
         menu.addSeparator()
-        menu.addAction(self.icon_cashacct,
-                       _("Register Cash Account..."), self.parent.register_new_cash_account)
-        menu.addSeparator()
         menu.addAction(QIcon(":icons/import.svg" if not ColorScheme.dark_scheme else ":icons/import_dark_theme.svg"),
                        _("Import file"), self.import_contacts)
         if not self.parent.contacts.empty:
             menu.addAction(QIcon(":icons/save.svg" if not ColorScheme.dark_scheme else ":icons/save_dark_theme.svg"),
                            _("Export file"), self.export_contacts)
 
         menu.addSeparator()
-        a = menu.addAction(_("Show My Cash Accounts"), self.toggle_show_my_cashaccts)
-        a.setCheckable(True)
-        a.setChecked(self.show_my_cashaccts)
         if self.have_lns:
             a = menu.addAction(_("Show My LNS Names"), self.toggle_show_my_lns_names)
             a.setCheckable(True)

electroncash_gui/qt/exception_window.py

@@ -57,7 +57,8 @@
   <li>Locale: {locale}</li>
 </ul>
 """
-report_server = "https://crashhub.electroncash.org/crash"
+# There is currently no report server for Electron Radiant
+report_server = ""
 
 
 class Exception_Window(QWidget):
@@ -68,7 +69,7 @@ def __init__(self, config, exctype, value, tb):
         self.exc_args = (exctype, value, tb)
         self.config = config
         self.setWindowTitle('Electron Radiant - ' + _('An Error Occurred'))
-        self.setMinimumSize(600, 300)
+        self.setMinimumSize(600, 200)
 
         main_box = QVBoxLayout()
         main_box.setContentsMargins(20,20,20,20)
@@ -79,6 +80,12 @@ def __init__(self, config, exctype, value, tb):
         l.setWordWrap(True)
         main_box.addWidget(l)
 
+        l = QLabel(_('Please report the problem on <a href="https://github.com/RadiantBlockchain/electron-radiant/issues">GitHub</a>.'))
+        l.setWordWrap(True)
+        l.setOpenExternalLinks(True)
+        main_box.addWidget(l)
+
+        """
         l = QLabel(_('To help us diagnose and fix the problem, you can send us'
                      ' a bug report that contains useful debug information:'))
         l.setWordWrap(True)
@@ -98,10 +105,11 @@ def __init__(self, config, exctype, value, tb):
         self.description_textfield.setAcceptRichText(False)  # Force plain 'ol text descriptions.. no rich-text pastes
         self.description_textfield.setFixedHeight(50)
         main_box.addWidget(self.description_textfield)
-
+        """
 
         buttons = QHBoxLayout()
 
+        """
         l = QLabel(_("Do you want to send this report?"))
         l.setWordWrap(True)
 
@@ -118,8 +126,9 @@ def __init__(self, config, exctype, value, tb):
         report_button.clicked.connect(self.send_report)
         report_button.setIcon(QIcon(":icons/tab_send.png"))
         buttons.addWidget(report_button)
+        """
 
-        close_button = QPushButton(_('Not Now'))
+        close_button = QPushButton(_('Close'))
         close_button.clicked.connect(self.close)
         buttons.addWidget(close_button)
 

electroncash_gui/qt/request_list.py

@@ -71,7 +71,6 @@ def item_changed(self, item):
         self.parent.receive_opreturn_rawhex_cb.setChecked(opr_is_raw)
         self.parent.receive_opreturn_e.setText(opr or '')
         self.parent.save_request_button.setEnabled(False)
-        self.parent.cash_account_e.set_cash_acct()
 
     def select_item_by_address(self, address):
         self.setCurrentItem(None)