From fb8cece2410d26701695112c0367b0cb830e8fdb Mon Sep 17 00:00:00 2001
From: Kristaps Kaupe <kristaps@blogiem.lv>
Date: Sat, 29 Jul 2023 11:50:15 +0300
Subject: [PATCH] Update libsecp256k1 and python-bitcointx

---
 install.sh         | 11 ++++++-----
 jmbitcoin/setup.py | 16 ++++++++++++++++
 pyproject.toml     |  2 +-
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 jmbitcoin/setup.py

diff --git a/install.sh b/install.sh
index da6897649..246eb6a51 100755
--- a/install.sh
+++ b/install.sh
@@ -325,13 +325,14 @@ libsecp256k1_build()
 
 libsecp256k1_install()
 {
-    secp256k1_lib_tar='490022745164b56439688b0fc04f9bd43578e5c3'
-    secp256k1_lib_sha="4c87e32bff6815fb632a0ffd5bc89f2f7dfce11bd8501f1c779cf1e8e354c3c9"
-    secp256k1_lib_url='https://github.com/bitcoin-core/secp256k1/archive'
-    if ! dep_get "${secp256k1_lib_tar}.tar.gz" "${secp256k1_lib_sha}" "${secp256k1_lib_url}"; then
+    secp256k1_version="0.4.0"
+    secp256k1_lib_tar="v$secp256k1_version.tar.gz"
+    secp256k1_lib_sha="d7c956606e7f52b7703fd2967cb31d2e21ec90c0b440ff1cc7c7d764a4092b98"
+    secp256k1_lib_url='https://github.com/bitcoin-core/secp256k1/archive/refs/tags'
+    if ! dep_get "${secp256k1_lib_tar}" "${secp256k1_lib_sha}" "${secp256k1_lib_url}"; then
         return 1
     fi
-    pushd "secp256k1-${secp256k1_lib_tar}" || return 1
+    pushd "secp256k1-$secp256k1_version" || return 1
     if libsecp256k1_build; then
         $make install
     else
diff --git a/jmbitcoin/setup.py b/jmbitcoin/setup.py
new file mode 100644
index 000000000..f492ae687
--- /dev/null
+++ b/jmbitcoin/setup.py
@@ -0,0 +1,16 @@
+from setuptools import setup
+
+
+setup(name='joinmarketbitcoin',
+      version='0.9.11dev',
+      description='Joinmarket client library for Bitcoin coinjoins',
+      url='https://github.com/JoinMarket-Org/joinmarket-clientserver/tree/master/jmbitcoin',
+      author='',
+      author_email='',
+      license='GPL',
+      packages=['jmbitcoin'],
+      python_requires='>=3.7',
+      install_requires=[
+        'python-bitcointx @ https://github.com/Simplexum/python-bitcointx/archive/refs/heads/master.zip'
+      ],
+      zip_safe=False)
diff --git a/pyproject.toml b/pyproject.toml
index e83cfc02d..12d2f86b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ dependencies = [
 
 [project.optional-dependencies]
 jmbitcoin = [
-    "python-bitcointx==1.1.3",
+    "python-bitcointx @ https://github.com/Simplexum/python-bitcointx/archive/refs/heads/master.zip",
 ]
 jmclient = [
     "argon2_cffi==21.3.0",