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/README.rst b/README.rst
index c311c99a..a35d9fb3 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
@@ -139,12 +139,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
---------------------
@@ -169,6 +163,6 @@ Original Project Info
---
-The Zclassic Team
+The Zclassic CE Team
-ZCL: t1gsePJZ6ojJYygj3PWMGJfojPUoMd5AVfU
+ZCL: t3eYEnoMmfUV65CZvPvV2mfAUnfFGoFbkJu
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 05632dc5..cf4bf526 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -531,12 +531,13 @@ 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/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)
@@ -548,6 +549,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" +
@@ -557,7 +563,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.")
])
@@ -810,7 +816,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/lib/servers.json b/lib/servers.json
index bf03998a..e3004e9b 100644
--- a/lib/servers.json
+++ b/lib/servers.json
@@ -1,5 +1,4 @@
{
- "electrum.zclassic.org": {"s":"5222", "pruning": "-", "version": "1.1"},
- "zcl-electrum.com": {"s":"50002", "pruning": "-", "version": "1.1"}
+ "electrum.zclassic.community": {"s":"50002", "pruning": "-", "version": "1.1"},
+ "zclele.duckdns.org": {"s":"50002", "pruning": "-", "version": "1.1"}
}
-
diff --git a/lib/util.py b/lib/util.py
index d8b8bd4d..00277ab7 100644
--- a/lib/util.py
+++ b/lib/util.py
@@ -493,15 +493,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',
+ 'zclbex.duckdns.org:3001': ('http://zclbex.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'}),
}
@@ -524,7 +518,7 @@ def block_explorer_info():
return testnet_block_explorers if constants.net.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))
diff --git a/lib/version.py b/lib/version.py
index 2fb2ae77..764f2945 100644
--- a/lib/version.py
+++ b/lib/version.py
@@ -1,4 +1,4 @@
-ELECTRUM_VERSION = 'Z!1.0.5' #'3.1' # version of the client package
+ELECTRUM_VERSION = '1.0.7' # '3.1' = version of the client package
PROTOCOL_VERSION = '1.1' # protocol version requested
# The hash of the mnemonic seed must begin with this
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
diff --git a/setup.py b/setup.py
index 40cdd789..b5f8dd0a 100755
--- a/setup.py
+++ b/setup.py
@@ -83,9 +83,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"""
)