[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 02/02: -minor merge conflict resolves
|
From: |
gnunet |
|
Subject: |
[taler-exchange] 02/02: -minor merge conflict resolves |
|
Date: |
Fri, 18 Feb 2022 00:53:08 +0100 |
This is an automated email from the git hooks/post-receive script.
oec pushed a commit to branch master
in repository exchange.
commit f4f502d037a84a38db4bc21a1db06324a05d26aa
Merge: a78b3345 22fe5da7
Author: Özgür Kesim <oec-taler@kesim.org>
AuthorDate: Fri Feb 18 00:44:55 2022 +0100
-minor merge conflict resolves
doc/cs/content/4_1_design.tex | 21 +-
src/auditor/report-lib.c | 2 +-
src/auditor/taler-helper-auditor-aggregation.c | 6 +-
src/auditor/taler-helper-auditor-coins.c | 34 +-
src/auditor/taler-helper-auditor-reserves.c | 2 +-
src/benchmark/taler-aggregator-benchmark.c | 8 +-
src/exchange-tools/taler-auditor-offline.c | 63 +---
src/exchange-tools/taler-exchange-offline.c | 55 +---
src/exchange/taler-exchange-httpd.c | 10 +-
src/exchange/taler-exchange-httpd_auditors.c | 5 +-
src/exchange/taler-exchange-httpd_csr.c | 361 ++++++++++++++-------
src/exchange/taler-exchange-httpd_csr.h | 25 +-
src/exchange/taler-exchange-httpd_deposit.c | 2 +-
src/exchange/taler-exchange-httpd_keys.c | 90 +----
.../taler-exchange-httpd_management_post_keys.c | 5 +-
src/exchange/taler-exchange-httpd_melt.c | 21 +-
src/exchange/taler-exchange-httpd_recoup.c | 23 +-
.../taler-exchange-httpd_refreshes_reveal.c | 29 +-
src/exchange/taler-exchange-httpd_refund.c | 4 +-
src/exchange/taler-exchange-httpd_withdraw.c | 31 +-
src/exchangedb/exchange-0001.sql | 220 +++++++++----
src/exchangedb/irbt_callbacks.c | 8 +-
src/exchangedb/lrbt_callbacks.c | 8 +-
src/exchangedb/plugin_exchangedb_postgres.c | 160 ++++-----
src/exchangedb/test_exchangedb.c | 80 ++---
src/include/taler_amount_lib.h | 12 +
src/include/taler_crypto_lib.h | 175 ++++++----
src/include/taler_exchange_service.h | 153 +++++++--
src/include/taler_exchangedb_plugin.h | 141 +++++---
src/include/taler_json_lib.h | 29 ++
src/include/taler_signatures.h | 51 +--
src/include/taler_util.h | 33 ++
src/lib/Makefile.am | 3 +-
src/lib/exchange_api_common.c | 21 +-
...{exchange_api_csr.c => exchange_api_csr_melt.c} | 59 ++--
...hange_api_csr.c => exchange_api_csr_withdraw.c} | 136 +++-----
src/lib/exchange_api_deposit.c | 8 +-
src/lib/exchange_api_handle.c | 43 +--
src/lib/exchange_api_melt.c | 36 +-
src/lib/exchange_api_recoup.c | 2 +-
src/lib/exchange_api_recoup_refresh.c | 2 +-
src/lib/exchange_api_refresh_common.c | 10 +-
src/lib/exchange_api_refreshes_reveal.c | 9 +
src/lib/exchange_api_withdraw.c | 42 +--
src/lib/exchange_api_withdraw2.c | 2 +-
.../testing_api_cmd_auditor_add_denom_sig.c | 5 +-
src/testing/testing_api_cmd_deposit.c | 5 +-
src/testing/testing_api_cmd_insert_deposit.c | 8 +-
src/testing/testing_api_cmd_refresh.c | 4 +-
src/testing/testing_api_cmd_withdraw.c | 22 +-
src/util/amount.c | 14 +
src/util/auditor_signatures.c | 32 +-
src/util/config.c | 68 ++++
src/util/crypto.c | 31 +-
src/util/denom.c | 93 +-----
src/util/offline_signatures.c | 30 +-
src/util/test_crypto.c | 4 +
src/util/test_helper_cs.c | 6 +
src/util/util.c | 67 ++++
59 files changed, 1484 insertions(+), 1145 deletions(-)
diff --cc src/lib/exchange_api_refresh_common.c
index 30711d78,3cd47a6f..b15e0d0d
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@@ -74,11 -75,9 +75,11 @@@ TALER_EXCHANGE_get_melt_data_
md->num_fresh_coins = rd->fresh_pks_len;
md->melted_coin.coin_priv = rd->melt_priv;
md->melted_coin.melt_amount_with_fee = rd->melt_amount;
- md->melted_coin.fee_melt = rd->melt_pk.fee_refresh;
+ md->melted_coin.fee_melt = rd->melt_pk.fees.refresh;
md->melted_coin.original_value = rd->melt_pk.value;
md->melted_coin.expire_deposit = rd->melt_pk.expire_deposit;
+ md->melted_coin.age_commitment = rd->age_commitment;
+
GNUNET_assert (GNUNET_OK ==
TALER_amount_set_zero (rd->melt_amount.currency,
&total));
@@@ -141,9 -141,9 +143,10 @@@
TALER_planchet_secret_to_transfer_priv (
rms,
+ &rd->melt_priv,
i,
&md->transfer_priv[i]);
+
GNUNET_CRYPTO_ecdhe_key_get_public (
&md->transfer_priv[i].ecdhe_priv,
&md->transfer_pub[i].ecdhe_pub);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.