From 78388999a743c346482648bc49c23e40e8ae6f3e Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Mon, 6 Aug 2018 18:26:16 +0900
Subject: [PATCH] Prepare 1.8

---
 docs/changelog.rst     | 15 +++++++++++++++
 docs/conf.py           |  2 +-
 docs/rpc-interface.rst |  2 ++
 electrumx/__init__.py  |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9e30814..fae97d5 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,6 +7,21 @@
    and memory consumption whilst serving clients.  Those problems
    should not occur with Python 3.7.
 
+
+Version 1.8.1 (in development)
+==============================
+
+Version 1.8  (06 Aug 2018)
+==========================
+
+* require aiorpcX 0.6.2
+* fix query.py; move to contrib.  Add :ref:`query <query>` function to RPC
+* rewrite :command:`electrumx_rpc` so that proper command-line help is provided
+* per-coin tx hash functions (erasmospunk)
+* coin additions / updates: Groestlcoin (Kefkius, erasmospunk),
+  Decred (erasmonpsunk)
+* other minor (smmalis37)
+
 Version 1.7.3  (01 Aug 2018)
 ============================
 
diff --git a/docs/conf.py b/docs/conf.py
index 5f30fd5..9822a3c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,7 +15,7 @@
 import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
-VERSION="ElectrumX 1.8beta"
+VERSION="ElectrumX 1.8"
 
 # -- Project information -----------------------------------------------------
 
diff --git a/docs/rpc-interface.rst b/docs/rpc-interface.rst
index 62cef1b..08e58c7 100644
--- a/docs/rpc-interface.rst
+++ b/docs/rpc-interface.rst
@@ -161,6 +161,8 @@ Peer data is obtained via a peer discovery protocol documented
   [...]
   electroncash.checksum0.com     good   50001 50002 ElectrumX 1.2.1    0.9  1.1          07h 30m 40s 07h 30m 41s     0                 peer 149.56.198.233
 
+.. _query:
+
 query
 -----
 
diff --git a/electrumx/__init__.py b/electrumx/__init__.py
index d8a075c..475394d 100644
--- a/electrumx/__init__.py
+++ b/electrumx/__init__.py
@@ -1,4 +1,4 @@
-version = 'ElectrumX 1.8beta'
+version = 'ElectrumX 1.8'
 version_short = version.split()[-1]
 
 from electrumx.server.controller import Controller