Bumped to version 1.4.6, patch to fix upstream spending bug

4 files changed, 35 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a46ed1703d5d..74de5121ff08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = specter-desktop
 	pkgdesc = Specter Desktop functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets.
-	pkgver = 1.4.5
+	pkgver = 1.4.6
 	pkgrel = 1
 	url = https://specter.solutions
 	arch = any
@@ -15,7 +15,7 @@ pkgbase = specter-desktop
 	depends = python-flask-wtf
 	depends = python-mnemonic
 	depends = python-hwilib
-	depends = python-embit-git
+	depends = python-embit
 	depends = python-flask-cors
 	depends = python-pgpy
 	depends = python-pyopenssl
@@ -31,11 +31,14 @@ pkgbase = specter-desktop
 	depends = python-wheel
 	depends = python-pyasn1
 	depends = python-cbor
-	source = https://github.com/cryptoadvance/specter-desktop/archive/refs/tags/v1.4.5.tar.gz
+	depends = python-urllib3
+	source = https://github.com/cryptoadvance/specter-desktop/archive/refs/tags/v1.4.6.tar.gz
 	source = specter.service
 	source = version.patch
-	sha256sums = c485931607fd8a063c494c8bbe4e888b62bc17eff78c0aec4eb817f06e5848a5
+	source = sign.patch
+	sha256sums = b6c0b439bb11961516ab5002c2cc86d37e4923fc3dc0ed8d64b2f96342dc519f
 	sha256sums = 9b5f57a0ebd48e6b7d1ac240913e4b502a6e3ffc5b64ff87ed263f1a4810a265
-	sha256sums = ec0994d82f71abbe62e0a40c1f084a1718aded9e77cca63b41e4c400c9eb7962
+	sha256sums = 2f18621d0a68a1d2b5686a9c002a8013483060920a0bfa86df7caf652a8be05e
+	sha256sums = 839d2577e81c963e1c35837d4fe1536aa9306ba00b835057d0209f373efff2c1
 
 pkgname = specter-desktop
diff --git a/PKGBUILD b/PKGBUILD
index b86b782c27f0..8f087f0bd42a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,30 @@
 # Maintainer: bitcoinlizard <bitcoinlizard@fastmail.com>
 
 pkgname=specter-desktop
-pkgver=1.4.5
+pkgver=1.4.6
 pkgrel=1
 pkgdesc="Specter Desktop functions as a watch-only coordinator for multi-signature and single-key Bitcoin wallets."
 arch=('any')
 url="https://specter.solutions"
 license=('MIT')
 makedepends=('python-setuptools')
-depends=('python' 'libusb' 'systemd-libs' 'python-dotenv' 'python-flask' 'python-flask-login' 'python-flask-wtf' 'python-mnemonic' 'python-hwilib' 'python-embit-git' 'python-flask-cors' 'python-pgpy' 'python-pyopenssl' 'python-stem' 
-'python-typing_extensions' 'python-psutil' 'python-hidapi' 'python-ecdsa' 'python-protobuf' 'python-importlib-metadata' 'python-daemonize' 'python-noiseprotocol-git' 'python-wheel' 'python-pyasn1' 'python-cbor')
+depends=('python' 'libusb' 'systemd-libs' 'python-dotenv' 'python-flask' 'python-flask-login' 'python-flask-wtf' 'python-mnemonic' 'python-hwilib' 'python-embit' 'python-flask-cors' 'python-pgpy' 'python-pyopenssl' 'python-stem' 
+'python-typing_extensions' 'python-psutil' 'python-hidapi' 'python-ecdsa' 'python-protobuf' 'python-importlib-metadata' 'python-daemonize' 'python-noiseprotocol-git' 'python-wheel' 'python-pyasn1' 'python-cbor' 'python-urllib3')
 
 source=("https://github.com/cryptoadvance/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz"
         'specter.service'
-	'version.patch')
+	'version.patch'
+        'sign.patch')
 
-sha256sums=('c485931607fd8a063c494c8bbe4e888b62bc17eff78c0aec4eb817f06e5848a5'
+sha256sums=('b6c0b439bb11961516ab5002c2cc86d37e4923fc3dc0ed8d64b2f96342dc519f'
             '9b5f57a0ebd48e6b7d1ac240913e4b502a6e3ffc5b64ff87ed263f1a4810a265'
-	    'ec0994d82f71abbe62e0a40c1f084a1718aded9e77cca63b41e4c400c9eb7962')
+	    '2f18621d0a68a1d2b5686a9c002a8013483060920a0bfa86df7caf652a8be05e'
+            '839d2577e81c963e1c35837d4fe1536aa9306ba00b835057d0209f373efff2c1')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
   patch --forward --strip=1 --input="${srcdir}/version.patch"
+  patch --forward --strip=1 --input="${srcdir}/sign.patch"
 }
 
 build() {
diff --git a/sign.patch b/sign.patch
new file mode 100644
index 000000000000..db469c27d567
--- /dev/null
+++ b/sign.patch
@@ -0,0 +1,14 @@
+diff --unified --recursive --text specter-desktop-1.4.6/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja specter-desktop-1.4.6/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja
+--- specter-desktop-1.4.6/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja	2021-07-03 07:27:07.353228457 -0500
++++ specter-desktop-1.4.6/src/cryptoadvance/specter/templates/wallet/send/sign/wallet_send_sign_psbt.jinja	2021-07-03 07:30:20.773507680 -0500
+@@ -208,8 +208,8 @@
+ 		<div id="signing_container" class="signing_container flex-column {% if psbt['raw'] %}hidden{% endif %}" style="text-align: center;">
+ 			<p style="margin-bottom: 15px; margin-top: 0px;">Sign transaction with your:</p>
+ 			{% for device in wallet.devices %}
+-				<button type="button" class="btn signing-column-btn" id="{{ device.alias }}_tx_sign_btn" {{ 'disabled style=background-color:#303c49;' if device.alias in psbt["devices_signed"] else '' }}>
+-					{{ device.name }} {% if device.alias in psbt['devices_signed'] %} (&#10004;) {% endif %}
++				<button type="button" class="btn signing-column-btn" id="{{ device.alias }}_tx_sign_btn" {{ 'disabled style=background-color:#303c49;' if psbt.get("devices_signed") and device.alias in psbt.get("devices_signed") else '' }}>
++					{{ device.name }} {% if psbt.get("devices_signed") and device.alias in psbt.get("devices_signed") %} (&#10004;) {% endif %}
+ 				</button>
+ 			{% endfor %}
+ 		</div>
diff --git a/version.patch b/version.patch
index 6d5e49553476..c6b449c88775 100644
--- a/version.patch
+++ b/version.patch
@@ -1,12 +1,12 @@
-diff --unified --recursive --text specter-desktop-1.4.5/setup.py specter-desktop-1.4.5/setup.py
---- specter-desktop-1.4.5/setup.py	2021-06-27 16:59:48.882756807 -0500
-+++ specter-desktop-1.4.5/setup.py	2021-06-27 17:00:39.369469975 -0500
+diff --unified --recursive --text specter-desktop-1.4.6/setup.py specter-desktop-1.4.6/setup.py
+--- specter-desktop-1.4.6/setup.py	2021-06-27 16:59:48.882756807 -0500
++++ specter-desktop-1.4.6/setup.py	2021-06-27 17:00:39.369469975 -0500
 @@ -19,7 +19,7 @@
  
  setup(
      name="cryptoadvance.specter",
 -    version="vx.y.z-get-replaced-by-release-script",
-+    version="1.4.5",
++    version="1.4.6",
      author="Stepan Snigirev, Kim Neunert",
      author_email="snigirev.stepan@gmail.com, kim.neunert@gmail.com",
      description="A GUI for Bitcoin Core optimised to work with airgapped hardware wallets",