exchange

commit 3db03d0e5d8e91e0122843d4e55c02e0f4764d03
parent 9c7e6ed4eefe02db198b978f460348222b42577f
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  9 Oct 2026 21:34:43 +0200

bump protocol version to v42

Diffstat:
M
contrib/gnunet.tag
 | 
12
++++++++++++
M
contrib/uncrustify_precommit
 | 
1
+
M
scripts/doxygen.meson.sh
 | 
2
+-
M
src/exchange/taler-exchange-httpd.c
 | 
4
++--
M
src/exchange/taler-exchange-httpd_get-config.h
 | 
2
+-
M
src/exchange/taler-exchange-httpd_post-recoup-refresh.c
 | 
2
+-
M
src/exchange/taler-exchange-httpd_post-recoup-withdraw.c
 | 
2
+-
M
src/lib/exchange_api_handle.c
 | 
4
++--

8 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/contrib/gnunet.tag b/contrib/gnunet.tag
@@ -167,6 +167,12 @@
     </member>
     <member kind="define">
       <type>#define</type>
+      <name>GNUNET_PQ_query_param_unblinded_sig</name>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <arglist>(x)</arglist>
+    </member>
+    <member kind="define">
+      <type>#define</type>
       <anchorfile>gnunet_pq_lib.h</anchorfile>
       <name>GNUNET_PQ_result_spec_end</name>
       <arglist></arglist>
@@ -183,6 +189,12 @@
       <name>GNUNET_PQ_result_spec_auto_from_type</name>
       <arglist>(name, dst)</arglist>
     </member>
+    <member kind="define">
+      <type>#define</type>
+      <anchorfile>gnunet_pq_lib.h</anchorfile>
+      <name>GNUNET_PQ_result_spec_unblinded_sig</name>
+      <arglist>(name, dst)</arglist>
+    </member>
     <member kind="function">
       <type>struct GNUNET_PQ_ResultSpec</type>
       <name>GNUNET_PQ_result_spec_absolute_time</name>
diff --git a/contrib/uncrustify_precommit b/contrib/uncrustify_precommit
@@ -76,6 +76,7 @@ fi
 # Make sure doxygen is happy with our annotations
 if (which doxygen > /dev/null)
 then
+    export MESON_SOURCE_ROOT=$PWD
     export REPORT=$(mktemp /tmp/doxygenXXXXXX)
     [ -f doc/doxygen/Makefile ] && \
     ( set -o pipefail;
diff --git a/scripts/doxygen.meson.sh b/scripts/doxygen.meson.sh
@@ -14,7 +14,7 @@ then
   exit 1
 fi
 cd "${MESON_SOURCE_ROOT}/doc/doxygen"
-echo "PROJECT_NUMBER = ${PACKAGE_VERSION}" > version.doxy
+echo "PROJECT_NUMBER = ${PACKAGE_VERSION:-git}" > version.doxy
 if [ "${1:-full}" = "fast" ]
 then
   make fast
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
@@ -1725,14 +1725,14 @@ handle_mhd_request (void *cls,
       .handler.post = &TEH_handler_withdraw,
       .nargs = 0
     },
-    /* batch recoup of withdrawn coins, introduced with vRECOUP */
+    /* batch recoup of withdrawn coins, introduced with v42P */
     {
       .url = "recoup-withdraw",
       .method = MHD_HTTP_METHOD_POST,
       .handler.post = &TEH_handler_recoup_withdraw,
       .nargs = 0
     },
-    /* batch recoup of refreshed coins, introduced with vRECOUP */
+    /* batch recoup of refreshed coins, introduced with v42 */
     {
       .url = "recoup-refresh",
       .method = MHD_HTTP_METHOD_POST,
diff --git a/src/exchange/taler-exchange-httpd_get-config.h b/src/exchange/taler-exchange-httpd_get-config.h
@@ -41,7 +41,7 @@
  *
  * Returned via both /config and /keys endpoints.
  */
-#define EXCHANGE_PROTOCOL_VERSION "41:0:7"
+#define EXCHANGE_PROTOCOL_VERSION "42:0:8"
 
 
 /**
diff --git a/src/exchange/taler-exchange-httpd_post-recoup-refresh.c b/src/exchange/taler-exchange-httpd_post-recoup-refresh.c
@@ -171,7 +171,7 @@ struct RecoupRefreshContext
 
 /**
  * The following macros set the given error code,
- * set the phase to #RECOUP_REFRESH_PHASE_GENERATE_REPLY_ERROR,
+ * set the phase to RECOUP_REFRESH_PHASE_GENERATE_REPLY_ERROR,
  * and optionally set the given field to the given value.
  */
 #define SET_ERROR(wc, ec) \
diff --git a/src/exchange/taler-exchange-httpd_post-recoup-withdraw.c b/src/exchange/taler-exchange-httpd_post-recoup-withdraw.c
@@ -171,7 +171,7 @@ struct RecoupWithdrawContext
 
 /**
  * The following macros set the given error code,
- * set the phase to #RECOUP_WITHDRAW_PHASE_GENERATE_REPLY_ERROR,
+ * set the phase to RECOUP_WITHDRAW_PHASE_GENERATE_REPLY_ERROR,
  * and optionally set the given field to the given value.
  */
 #define SET_ERROR(wc, ec) \
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
@@ -35,12 +35,12 @@
  * Which version of the Taler protocol is implemented
  * by this library?  Used to determine compatibility.
  */
-#define EXCHANGE_PROTOCOL_CURRENT 41
+#define EXCHANGE_PROTOCOL_CURRENT 42
 
 /**
  * How many versions are we backwards compatible with?
  */
-#define EXCHANGE_PROTOCOL_AGE 5
+#define EXCHANGE_PROTOCOL_AGE 0
 
 /**
  * Set to 1 for extra debug logging.