From 15bf9b2187d3b8a03939e61b4c3ebf4d90fcc919 Mon Sep 17 00:00:00 2001 From: tecnovert Date: Thu, 14 Dec 2023 20:29:32 +0200 Subject: [PATCH] Raise coincurve version. --- .cirrus.yml | 2 +- .travis.yml | 2 +- Dockerfile | 2 +- doc/install.md | 2 +- docker/production/swapclient/Dockerfile | 2 +- guix.scm | 15 +++++++++------ 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index b30f755..61bc708 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -24,7 +24,7 @@ test_task: - apt-get install -y wget python3-pip gnupg unzip protobuf-compiler automake libtool pkg-config - pip install tox pytest - python3 setup.py install - - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.1.zip + - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip - unzip -d coincurve-anonswap coincurve-anonswap.zip - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true - cd coincurve-anonswap diff --git a/.travis.yml b/.travis.yml index 929bffb..90e64e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ before_install: install: - travis_retry pip install tox pytest before_script: - - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.1.zip + - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip - unzip -d coincurve-anonswap coincurve-anonswap.zip - mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true - cd coincurve-anonswap diff --git a/Dockerfile b/Dockerfile index 7a97948..51b3a77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN wget -O protobuf_src.tar.gz https://github.com/protocolbuffers/protobuf/rele make -j$(nproc) install && \ ldconfig -ARG COINCURVE_VERSION=v0.1 +ARG COINCURVE_VERSION=v0.2 RUN wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_$COINCURVE_VERSION.zip && \ unzip coincurve-anonswap.zip && \ mv ./coincurve-anonswap_$COINCURVE_VERSION ./coincurve-anonswap && \ diff --git a/doc/install.md b/doc/install.md index f802eac..e7ae95a 100644 --- a/doc/install.md +++ b/doc/install.md @@ -162,7 +162,7 @@ Close the terminal and open a new one to update the python symlinks. python3 -m venv "$SWAP_DATADIR/venv" . $SWAP_DATADIR/venv/bin/activate && python -V cd $SWAP_DATADIR - wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.1.zip + wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_v0.2.zip unzip -d coincurve-anonswap coincurve-anonswap.zip mv ./coincurve-anonswap/*/{.,}* ./coincurve-anonswap || true cd $SWAP_DATADIR/coincurve-anonswap diff --git a/docker/production/swapclient/Dockerfile b/docker/production/swapclient/Dockerfile index 9f07030..dd8b9d6 100644 --- a/docker/production/swapclient/Dockerfile +++ b/docker/production/swapclient/Dockerfile @@ -15,7 +15,7 @@ RUN wget -O protobuf_src.tar.gz https://github.com/protocolbuffers/protobuf/rele make -j$(nproc) install && \ ldconfig -ARG COINCURVE_VERSION=v0.1 +ARG COINCURVE_VERSION=v0.2 RUN wget -O coincurve-anonswap.zip https://github.com/tecnovert/coincurve/archive/refs/tags/anonswap_$COINCURVE_VERSION.zip && \ unzip coincurve-anonswap.zip && \ mv ./coincurve-anonswap_$COINCURVE_VERSION ./coincurve-anonswap && \ diff --git a/guix.scm b/guix.scm index cb40a3e..5568bd0 100644 --- a/guix.scm +++ b/guix.scm @@ -26,7 +26,7 @@ (define libsecp256k1-anonswap (package (name "libsecp256k1-anonswap") - (version "anonswap_v0.1") + (version "anonswap_v0.2") (source (origin (method git-fetch) (uri (git-reference @@ -34,15 +34,17 @@ (commit version))) (sha256 (base32 - "1lrcc5gjywlzvrgwzifva4baa2nsvwr3h0wmkc71q0zhag9pjbah")) + "1r07rkrw5qsnc5v1q7cb0zfs1cr62fqwq7kd2v8650g6ha4k5r8i")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-shared" "--disable-dependency-tracking" - "--with-valgrind=no" - "--enable-experimental" + "--with-pic" + "--enable-module-extrakeys" "--enable-module-recovery" + "--enable-module-schnorrsig" + "--enable-experimental" "--enable-module-ecdh" "--enable-benchmark=no" "--enable-tests=no" @@ -50,6 +52,7 @@ "--enable-module-generator" "--enable-module-dleag" "--enable-module-ecdsaotves" + "--with-valgrind=no" ))) (native-inputs (list autoconf automake libtool)) @@ -63,7 +66,7 @@ (define python-coincurve-anonswap (package (name "python-coincurve-anonswap") - (version "anonswap_v0.1") + (version "anonswap_v0.2") (source (origin (method git-fetch) @@ -74,7 +77,7 @@ (file-name (git-file-name name version)) (sha256 - (base32 "0vyzvpp2s21js01185qbm1lgs4ps4hki2d6yzprfsjqap1i5qhmp")))) + (base32 "08fz02afh88m83axfm8jsgq1c65mw1f3g07x9hz361vblvqjwzqh")))) (build-system python-build-system) (arguments '(#:tests? #f ;XXX fails to load "libsecp256k1.dll"