3.1.6

* Enable Bip70 payment requests for merchants like BitPay.
* Prohibit unconfirmed inputs on payment request (invoice) payments because Bitpay will reject them anyway.
* Remove Bitpay address format from address converter as Bitpay is now fully on CashAddr.
* Introduce 'cash' moniker for micro bitcoin.

3 files changed, 9 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 648d1433d8ce..43f5412c8ba1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-cash
 	pkgdesc = Lightweight Bitcoin Cash wallet
-	pkgver = 3.1.5
-	pkgrel = 2
+	pkgver = 3.1.6
+	pkgrel = 1
 	url = http://www.electroncash.org/
 	install = electron-cash.install
 	arch = any
@@ -35,12 +35,10 @@ pkgbase = electron-cash
 	optdepends = zbar: QR code reading support
 	provides = electron-cash
 	conflicts = electron-cash
-	source = electron-cash-3.1.5.tar.gz::https://github.com/fyookball/electrum/archive/3.1.5.tar.gz
+	source = electron-cash-3.1.6.tar.gz::https://github.com/fyookball/electrum/archive/3.1.6.tar.gz
 	source = electron-cash.install
-	source = 0001-prevent-requirements.txt-from-being-installed-to-usr.patch
-	sha256sums = abc7806fdea08c42579614ad15c3521b13fdee4724170c373a260bc08b35f019
+	sha256sums = 52111f7295cbda267a41582205d20f6f80e0bc5f4d87faf3768d20b2ae8e7b50
 	sha256sums = d682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073
-	sha256sums = c16d0cbb44f6446bfdeb1d5d539a799aa84ced067b269ab4bf95e6a1ab0d4f9f
 
 pkgname = electron-cash
 
diff --git a/0001-prevent-requirements.txt-from-being-installed-to-usr.patch b/0001-prevent-requirements.txt-from-being-installed-to-usr.patch
deleted file mode 100644
index 8d17c520f675..000000000000
--- a/0001-prevent-requirements.txt-from-being-installed-to-usr.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From dd409ac24aafb7fd9b3e0cda8f1ffb132daaef78 Mon Sep 17 00:00:00 2001
-From: Marcel O'Neil <marcel@marceloneil.com>
-Date: Wed, 7 Mar 2018 15:29:20 -0500
-Subject: [PATCH] prevent requirements.txt from being installed to /usr
-
----
- MANIFEST.in | 2 ++
- setup.py    | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index d7e3fff9..528eaa86 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,6 +4,8 @@ include electron-cash.conf.sample
- include electron-cash.desktop
- include *.py
- include electron-cash
-+include contrib/requirements/requirements.txt
-+include contrib/requirements/requirements-hw.txt
- recursive-include lib *.py
- recursive-include gui *.py
- recursive-include plugins *.py
-diff --git a/setup.py b/setup.py
-index bab5dab7..e11aa778 100755
---- a/setup.py
-+++ b/setup.py
-@@ -20,7 +20,7 @@ version = imp.load_source('version', 'lib/version.py')
- if sys.version_info[:3] < (3, 5, 0):
-     sys.exit("Error: Electron Cash requires Python version >= 3.5.0...")
- 
--data_files = ['contrib/requirements/' + r for r in ['requirements.txt', 'requirements-hw.txt']]
-+data_files = []
- 
- if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
-     parser = argparse.ArgumentParser()
--- 
-2.16.2
-
diff --git a/PKGBUILD b/PKGBUILD
index cec5dae49480..6fc8a2dc94a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 
 pkgname='electron-cash'
 pkgdesc='Lightweight Bitcoin Cash wallet'
-pkgver=3.1.5
-pkgrel=2
+pkgver=3.1.6
+pkgrel=1
 url='http://www.electroncash.org/'
 install="${pkgname}.install"
 arch=('any')
@@ -55,17 +55,9 @@ conflicts=("${pkgname}")
 install="${pkgname}.install"
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/fyookball/electrum/archive/${pkgver/.0}.tar.gz"
-  "${pkgname}.install"
-  "0001-prevent-requirements.txt-from-being-installed-to-usr.patch"
-)
-sha256sums=('abc7806fdea08c42579614ad15c3521b13fdee4724170c373a260bc08b35f019'
-            'd682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073'
-            'c16d0cbb44f6446bfdeb1d5d539a799aa84ced067b269ab4bf95e6a1ab0d4f9f')
-
-prepare() {
-  cd "${pkgname/on-cash/um}-${pkgver/.0}"
-  patch -Np1 -i "${srcdir}/0001-prevent-requirements.txt-from-being-installed-to-usr.patch"
-}
+  "${pkgname}.install")
+sha256sums=('52111f7295cbda267a41582205d20f6f80e0bc5f4d87faf3768d20b2ae8e7b50'
+            'd682766321f9981ee38aee26dc050209882d8c1c6006e3e509649b47fa1bb073')
 
 build() {
   cd "${pkgname/on-cash/um}-${pkgver/.0}"