[taler-exchange] 09/13: Merge branch 'master' into feature/tokens

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

commit f99262923121d5c0e1b995e325d97830110f5ce5
Merge: 9b27ee9c 4347393e
Author: Christian Blättler <blatc2@bfh.ch>
AuthorDate: Tue Dec 5 12:44:25 2023 +0100

    Merge branch 'master' into feature/tokens

 ChangeLog                                          |   3 +
 configure.ac                                       |   2 +-
 contrib/Makefile.am.in                             |   5 +-
 contrib/ci/jobs/0-codespell/job.sh                 |   2 +-
 contrib/gnunet.tag                                 |  12 ++
 contrib/locale/de/LC_MESSAGES/exchange-tos-v0.po   |   6 +-
 contrib/taler-exchange-dbconfig                    |  35 ++--
 contrib/taler-nexus-prepare                        | 115 -------------
 contrib/wallet-core                                |   2 +-
 debian/changelog                                   |  18 ++
 debian/libtalerexchange-dev.install                |   1 -
 doc/prebuilt                                       |   2 +-
 src/auditor/report-lib.c                           |   2 +-
 src/auditor/taler-helper-auditor-aggregation.c     |   2 +-
 src/auditor/taler-helper-auditor-coins.c           |  10 +-
 src/auditor/taler-helper-auditor-purses.c          |   6 +-
 src/auditor/taler-helper-auditor-reserves.c        |   8 +-
 src/auditor/taler-helper-auditor-wire.c            |   9 +-
 src/auditordb/pg_select_pending_deposits.h         |   2 +
 src/bank-lib/fakebank.h                            |   2 +-
 src/bank-lib/fakebank_bank_get_withdrawals.h       |   2 +-
 .../fakebank_bank_post_accounts_withdrawals.c      |   2 +-
 .../fakebank_bank_post_withdrawals_abort.h         |   2 +-
 .../fakebank_bank_post_withdrawals_confirm.c       |   8 -
 src/exchange/taler-exchange-httpd.c                |   1 -
 src/exchange/taler-exchange-httpd_age-withdraw.c   |   8 +-
 src/exchange/taler-exchange-httpd_batch-deposit.c  |  17 +-
 src/exchange/taler-exchange-httpd_batch-withdraw.c |   2 +-
 src/exchange/taler-exchange-httpd_extensions.c     |  65 ++++---
 src/exchange/taler-exchange-httpd_melt.c           |   2 +-
 src/exchangedb/0002-batch_deposits.sql             |  24 ++-
 src/exchangedb/0002-policy_details.sql             | 190 +++++++++++++++++----
 src/exchangedb/0002-policy_fulfillments.sql        | 100 +++++++++--
 src/exchangedb/exchange-0002.sql.in                |   8 +-
 src/exchangedb/exchangedb-postgres.conf            |   2 +-
 .../pg_select_aggregations_above_serial.h          |   2 +-
 src/extensions/extensions.c                        |  15 +-
 src/include/taler_auditordb_plugin.h               |   2 +-
 src/include/taler_crypto_lib.h                     |  12 +-
 src/include/taler_exchange_service.h               |  22 +--
 src/include/taler_exchangedb_lib.h                 |   4 +-
 src/include/taler_exchangedb_plugin.h              |   8 +-
 src/include/taler_extensions.h                     |   2 +
 src/include/taler_extensions_policy.h              |  17 +-
 src/include/taler_json_lib.h                       |   7 +-
 src/include/taler_kyclogic_lib.h                   |   2 +-
 src/include/taler_mhd_lib.h                        |   2 +-
 src/include/taler_pq_lib.h                         |  29 ++++
 src/include/taler_testing_lib.h                    |   4 +-
 src/kyclogic/Makefile.am                           |   3 +-
 src/lib/auditor_api_deposit_confirmation.c         |   3 +-
 src/lib/exchange_api_age_withdraw.c                |   4 +-
 src/lib/exchange_api_coins_history.c               |   9 +
 src/lib/exchange_api_handle.c                      |   2 +-
 src/lib/exchange_api_purse_create_with_deposit.c   |   2 +-
 src/pq/pq_common.h                                 |   1 +
 src/pq/pq_query_helper.c                           |  45 ++++-
 src/pq/pq_result_helper.c                          |  56 +++++-
 src/pq/test_pq.c                                   |  52 +++++-
 src/testing/Makefile.am                            |   2 +-
 src/testing/test_exchange_api.c                    |   2 +-
 src/testing/test_exchange_api_age_restriction.c    |   2 +-
 src/testing/test_exchange_p2p.c                    |   2 +-
 src/testing/testing_api_cmd_batch_withdraw.c       |   2 +-
 src/testing/testing_api_cmd_withdraw.c             |   4 +-
 src/util/age_restriction.c                         |   2 +-
 src/util/currencies.conf                           |   9 +
 67 files changed, 666 insertions(+), 341 deletions(-)

diff --cc src/include/taler_pq_lib.h
index 06e7d53e,d9c23e35..a529b430
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@@ -163,7 -162,19 +163,20 @@@ TALER_PQ_query_param_array_blinded_coin
    const struct TALER_BlindedCoinHashP *coin_evs,
    struct GNUNET_PQ_Context *db);
  
 +
+ /**
+  * Generate query parameter for an array of GNUNET_HashCode
+  *
+  * @param num number of elements in @e hash_codes
+  * @param hashes array of GNUNET_HashCode
+  * @param db context for the db-connection
+  */
+ struct GNUNET_PQ_QueryParam
+ TALER_PQ_query_param_array_hash_code (
+   size_t num,
+   const struct GNUNET_HashCode *hashes,
+   struct GNUNET_PQ_Context *db);
+ 
  /**
   * Generate query parameter for an array of mounts
   *
@@@ -354,7 -343,22 +367,23 @@@ TALER_PQ_result_spec_array_denom_hash 
    size_t *num,
    struct TALER_DenominationHashP **denom_hs);
  
 +
+ /**
+  * Array of GNUNET_HashCode
+  *
+  * @param db context of the database connection
+  * @param name name of the field in the table
+  * @param[out] num number of elements in @e denom_sigs
+  * @param[out] hashes where to store the result
+  * @return array entry for the result specification to use
+  */
+ struct GNUNET_PQ_ResultSpec
+ TALER_PQ_result_spec_array_hash_code (
+   struct GNUNET_PQ_Context *db,
+   const char *name,
+   size_t *num,
+   struct GNUNET_HashCode **hashes);
+ 
  /**
   * Array of amounts
   *

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.