From 130661f2171c0fd5ecaf0f91590e0662a1370dc2 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sat, 1 Sep 2018 18:55:55 +0100 Subject: [PATCH 1/9] update mainnet block explorers --- lib/util.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/util.py b/lib/util.py index 73ff02e2..c9c04e51 100644 --- a/lib/util.py +++ b/lib/util.py @@ -432,15 +432,9 @@ def time_difference(distance_in_time, include_seconds): # For raw json, append /insight-api-zcash mainnet_block_explorers = { - 'zcl-explorer.com': ('https://zcl-explorer.com', + 'zclele.duckdns.org:3001': ('http://zclele.duckdns.org:3001', {'tx': 'tx', 'addr': 'address'}), - 'eu1.zcl-explorer.com': ('https://eu1.zcl-explorer.com', - {'tx': 'tx', 'addr': 'address'}), - 'as1.zcl-explorer.com': ('https://as1.zcl-explorer.com', - {'tx': 'tx', 'addr': 'address'}), - 'explorer.zclassic.org': ('https://explorer.zclassic.org', - {'tx': 'tx', 'addr': 'address'}), - 'zclzclzcl.com': ('https://zclzclzcl.com', + 'zclassic-ce.io': ('http://zclassic-ce.io', {'tx': 'tx', 'addr': 'address'}), } From 28251d26a30662e3f4ab601211856f808a5100b9 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sat, 1 Sep 2018 19:07:23 +0100 Subject: [PATCH 2/9] mainnet block explorer --- lib/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.py b/lib/util.py index c9c04e51..61432225 100644 --- a/lib/util.py +++ b/lib/util.py @@ -457,7 +457,7 @@ def block_explorer_info(): return testnet_block_explorers if bitcoin.NetworkConstants.TESTNET else mainnet_block_explorers def block_explorer(config): - return config.get('block_explorer', 'zcl-explorer.com') + return config.get('block_explorer', 'zclassic-ce.io') def block_explorer_tuple(config): return block_explorer_info().get(block_explorer(config)) From 2f63cce92f861a31ecfec5f4556d1c2de204f61c Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sat, 1 Sep 2018 21:15:04 +0100 Subject: [PATCH 3/9] updated to python-dns --- packages.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.txt b/packages.txt index 66887b86..f14b4d20 100644 --- a/packages.txt +++ b/packages.txt @@ -10,4 +10,4 @@ dirmngr gnupg2 libudev-dev libusb-1.0-0-dev -dnspython +python-dns From 7d0aa7a047070a44fb439f98094a89d852da75f6 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sat, 1 Sep 2018 21:38:08 +0100 Subject: [PATCH 4/9] updated servers list --- lib/servers.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/servers.json b/lib/servers.json index c6b5588b..acd28702 100644 --- a/lib/servers.json +++ b/lib/servers.json @@ -1,5 +1,4 @@ { - "electrum.zclassic.org": {"s":"5222"}, - "zcl-electrum.com": {"s":"50002"} + "electrum.zclassic.community": {"s":"50002"}, + "zclele.duckdns.org": {"s":"50002"} } - From b8aac56385fc891abb303c8eba63608ff4a5d02b Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sat, 1 Sep 2018 22:57:42 +0100 Subject: [PATCH 5/9] update version to 1.0.6 --- lib/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.py b/lib/version.py index 03eedcdd..27a5d524 100644 --- a/lib/version.py +++ b/lib/version.py @@ -1,5 +1,5 @@ # version of the client package -ELECTRUM_VERSION = 'Z!1.0.5' +ELECTRUM_VERSION = '1.0.6' # protocol version requested PROTOCOL_VERSION = '1.1' From 87d299dc68491f11c5279dcee327ae733379108d Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sun, 2 Sep 2018 08:35:31 +0100 Subject: [PATCH 6/9] various README updates --- README.rst | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 2af26a82..e84a0392 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ ZCL Electrum - Zclassic Electrum (Lite) Client ============================================== -Latest Release: https://github.com/BTCP-community/electrum-zcl/releases/ +Latest Release: https://github.com/z-classic/electrum-zcl/releases Viewing & Sending from Z addresses is not yet supported on this wallet. @@ -16,14 +16,14 @@ Know about your data directory:: You can also use 'Export Private Keys' and 'Show Seed' from inside the application to write down and store your funds. -Please use the issue tracker for bug reports, feature requests, and other mission-critical information. It is actively monitored by the Zclassic development team. For general support, please visit our Discord: https://discord.gg/2PRZ5q +Please use the issue tracker for bug reports, feature requests, and other mission-critical information. It is actively monitored by the Zclassic development team. For general support, please visit our Discord: https://discord.gg/45NNrMJ Development Version =================== First, clone from Github:: - git clone https://github.com/BTCP-community/electrum-zcl + git clone https://github.com/z-classic/electrum-zcl.git cd electrum-zcl For Mac: @@ -47,7 +47,7 @@ Using Homebrew:: protoc --proto_path=lib/ --python_out=lib/ lib/paymentrequest.proto # Build .app, .dmg - ./create-dmg + ./create-dmg.sh # Run the .app in dist/, or ./electrum-zcl @@ -151,12 +151,6 @@ Here is a good initial check to determine whether things are working (should suc The Zclassic Wiki is located at: https://github.com/z-classic/zclassic/wiki. Please use this as a reference and feel free to contribute. -There is also an Electrum-ZCL wiki at: https://github.com/BTCP-community/electrum-zcl/wiki. It contains information about setting up the ElectrumX Server (https://github.com/BTCP-community/electrumx), which is the provider for block and peer data. - --- - -Here is our roadmap for zk-SNARKs integration: https://github.com/BTCP-community/electrum-zcl/wiki/Shielded-Transactions - Original Project Info --------------------- @@ -181,6 +175,6 @@ Original Project Info --- -The Zclassic Team +The Zclassic CE Team -ZCL: t1gsePJZ6ojJYygj3PWMGJfojPUoMd5AVfU +ZCL: t3eYEnoMmfUV65CZvPvV2mfAUnfFGoFbkJu From 5737b613d8e6565ea8e22c31c1ebaaf43264e0d9 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sun, 2 Sep 2018 09:59:06 +0100 Subject: [PATCH 7/9] various link and text updates --- Dockerfile | 4 +--- gui/qt/main_window.py | 8 ++++---- setup.py | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2234164d..e763fb17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV VERSION 1.0.2 RUN set -x \ && apt-get update \ && apt-get install -y curl \ - && curl -sL https://github.com/BTCP-community/electrum-zcl/archive/Z!${VERSION}.tar.gz |tar xzv \ + && curl -sL https://github.com/z-classic/electrum-zcl/archive/${VERSION}.tar.gz |tar xzv \ && mv electrum-zcl-Z-${VERSION} electrum-zcl \ && cd electrum-zcl \ && apt-get install -y $(grep -vE "^\s*#" packages.txt | tr "\n" " ") \ @@ -20,5 +20,3 @@ WORKDIR /electrum-zcl ENV DISPLAY :0 CMD ./electrum - - diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index a0fa152a..bfe80dfe 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -516,9 +516,9 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): help_menu = menubar.addMenu(_("&Help")) help_menu.addAction(_("&About"), self.show_about) - help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://zclassic.org")) + help_menu.addAction(_("&Official website"), lambda: webbrowser.open("https://zclassic-ce.org")) help_menu.addSeparator() - help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("https://github.com/BTCP-community/electrum-zcl/")).setShortcut(QKeySequence.HelpContents) + help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("https://github.com/z-classic/electrum-zcl/")).setShortcut(QKeySequence.HelpContents) help_menu.addAction(_("&Report Bug"), self.show_report_bug) help_menu.addSeparator() help_menu.addAction(_("&Donate to server"), self.donate_to_server) @@ -542,7 +542,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): def show_report_bug(self): msg = ' '.join([ _("Please report any bugs as issues on github:
"), - "https://github.com/BTCP-community/electrum-zcl/issues

", + "https://github.com/z-classic/electrum-zcl/issues

", _("Before reporting a bug, upgrade to the most recent version of Electrum-ZCL (latest release or git HEAD), and include the version number in your report."), _("Try to explain not only what the bug is, but how it occurs.") ]) @@ -795,7 +795,7 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): _('Expiration date of your request.'), _('This information is seen by the recipient if you send them a signed payment request.'), _('Expired requests have to be deleted manually from your list, in order to free the corresponding Zclassic addresses.'), - _('The bitcoin address never expires and will always be part of this electrum wallet.'), + _('The Zclassic address never expires and will always be part of this electrum wallet.'), ]) grid.addWidget(HelpLabel(_('Request expires'), msg), 3, 0) grid.addWidget(self.expires_combo, 3, 1) diff --git a/setup.py b/setup.py index 8c156abb..f70f3bf3 100755 --- a/setup.py +++ b/setup.py @@ -91,9 +91,9 @@ setup( scripts=['electrum-zcl'], data_files=data_files, description="Lightweight Zclassic Wallet", - author="BTCP Community", - author_email="csulmone@gmail.com", + author="Zclassic CE", + author_email="team@zclassic-ce.org", license="MIT Licence", - url="https://zclassic.org", + url="https://zclassic-ce.org", long_description="""Lightweight Zclassic Wallet""" ) From 7e79dea1e8965a6e95b2655cd4f297cd9d3376cb Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Sun, 2 Sep 2018 10:44:25 +0100 Subject: [PATCH 8/9] added donation to Zclassic menu item --- gui/qt/main_window.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index bfe80dfe..7414795a 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -521,7 +521,8 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): help_menu.addAction(_("&Documentation"), lambda: webbrowser.open("https://github.com/z-classic/electrum-zcl/")).setShortcut(QKeySequence.HelpContents) help_menu.addAction(_("&Report Bug"), self.show_report_bug) help_menu.addSeparator() - help_menu.addAction(_("&Donate to server"), self.donate_to_server) + help_menu.addAction(_("Donate to &Zclassic"), self.donate_to_zcl) + help_menu.addAction(_("Donate to &server"), self.donate_to_server) self.setMenuBar(menubar) @@ -533,6 +534,11 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError): else: self.show_error(_('No donation address for this server')) + def donate_to_zcl(self): + d = "t3eYEnoMmfUV65CZvPvV2mfAUnfFGoFbkJu" + host = "" + self.pay_to_URI('bitcoin:%s?message=support for Zclassic infrastructure and development %s'%(d, host)) + def show_about(self): QMessageBox.about(self, "Zclassic Electrum", _("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" + From 87ac0056450216f215f7a078660cc7dbf6c40e90 Mon Sep 17 00:00:00 2001 From: Skellers21 Date: Tue, 4 Sep 2018 22:39:44 +0100 Subject: [PATCH 9/9] update mainnet block explorers --- lib/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util.py b/lib/util.py index 61432225..bcc097ab 100644 --- a/lib/util.py +++ b/lib/util.py @@ -432,7 +432,7 @@ def time_difference(distance_in_time, include_seconds): # For raw json, append /insight-api-zcash mainnet_block_explorers = { - 'zclele.duckdns.org:3001': ('http://zclele.duckdns.org:3001', + 'zclbex.duckdns.org:3001': ('http://zclbex.duckdns.org:3001', {'tx': 'tx', 'addr': 'address'}), 'zclassic-ce.io': ('http://zclassic-ce.io', {'tx': 'tx', 'addr': 'address'}),