From b4c0cbec78fc45d4ff24bf420178a870ef22e6cf Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:52:02 +1000
Subject: [PATCH 1/6] Changed RAD to RXD
---
electroncash/networks.py | 12 ++++++------
electroncash/util.py | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/electroncash/networks.py b/electroncash/networks.py
index e50c0f1b..6f608d37 100644
--- a/electroncash/networks.py
+++ b/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
diff --git a/electroncash/util.py b/electroncash/util.py
index 55620f18..0bbdeeae 100644
--- a/electroncash/util.py
+++ b/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()
From 19fa8dce5ed6f644363aa3308fc0c5542759ca78 Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:58:42 +1000
Subject: [PATCH 2/6] Removed cash account menu items from contacts tab
---
electroncash_gui/qt/contact_list.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/electroncash_gui/qt/contact_list.py b/electroncash_gui/qt/contact_list.py
index 3df0f9cf..286fd5e6 100644
--- a/electroncash_gui/qt/contact_list.py
+++ b/electroncash_gui/qt/contact_list.py
@@ -242,16 +242,11 @@ 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:
@@ -259,9 +254,6 @@ def create_menu(self, position):
_("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)
From 4e1474db1d55fe74da451f601a55cbf6d6102c6e Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Thu, 15 Sep 2022 00:29:01 +1000
Subject: [PATCH 3/6] Fixed crash when saving a payment request
---
electroncash_gui/qt/request_list.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/electroncash_gui/qt/request_list.py b/electroncash_gui/qt/request_list.py
index 024f0179..8891e603 100644
--- a/electroncash_gui/qt/request_list.py
+++ b/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)
From d3881419104fcf1bf6fda726e616cbee6e67b549 Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Thu, 15 Sep 2022 00:42:48 +1000
Subject: [PATCH 4/6] Disabled crash reporting
---
electroncash_gui/qt/exception_window.py | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/electroncash_gui/qt/exception_window.py b/electroncash_gui/qt/exception_window.py
index a1fc2cf3..bd523838 100644
--- a/electroncash_gui/qt/exception_window.py
+++ b/electroncash_gui/qt/exception_window.py
@@ -57,7 +57,8 @@
Locale: {locale}
"""
-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 GitHub.'))
+ 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)
From 8e91b96b12575f0ef07f8ed99e919470f4a76fd9 Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Fri, 16 Sep 2022 09:52:21 +1000
Subject: [PATCH 5/6] Disabled LNS
---
electroncash/lns.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electroncash/lns.py b/electroncash/lns.py
index 71c4a6a9..918e8f71 100644
--- a/electroncash/lns.py
+++ b/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)
From 000cf52c6e69e4b1bccda00f533128bd4b0e1cee Mon Sep 17 00:00:00 2001
From: BK <4597349+benkno@users.noreply.github.com>
Date: Fri, 16 Sep 2022 09:52:31 +1000
Subject: [PATCH 6/6] Bumped version to 0.1.1
---
electroncash/version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/electroncash/version.py b/electroncash/version.py
index 8b98ab12..10231fd4 100644
--- a/electroncash/version.py
+++ b/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