[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: -fix report generation field nam
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated: -fix report generation field name missmatch |
|
Date: |
Tue, 23 Aug 2022 14:23:02 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 758a1490 -fix report generation field name missmatch
758a1490 is described below
commit 758a149059fa1bc9874886a65c8808fb4c7996d1
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Aug 23 14:22:59 2022 +0200
-fix report generation field name missmatch
---
contrib/auditor-report.tex.j2 | 2 +-
src/auditor/taler-helper-auditor-wire.c | 6 ++--
src/exchange/taler-exchange-httpd_reserves_purse.c | 32 ++++++++++++----------
src/lib/exchange_api_purse_create_with_merge.c | 17 ++++++++----
4 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/contrib/auditor-report.tex.j2 b/contrib/auditor-report.tex.j2
index cfd613a0..edcab8cf 100644
--- a/contrib/auditor-report.tex.j2
+++ b/contrib/auditor-report.tex.j2
@@ -1107,7 +1107,7 @@ have a clear financial impact.
{{ item.row }} &
{{ item.diagnostic }} \\
\nopagebreak
- \multicolumn{3}{l}{ {\tiny {\tt \truncate{\textwidth}{ {{
item.wire_offset_hash }} } } } } \\ \hline
+ \multicolumn{3}{l}{ {\tiny {\tt \truncate{\textwidth}{ {{ item.id }} } } } }
\\ \hline
{% endfor %}
\end{longtable}
{% endif %}
diff --git a/src/auditor/taler-helper-auditor-wire.c
b/src/auditor/taler-helper-auditor-wire.c
index 28a87a39..2596a31e 100644
--- a/src/auditor/taler-helper-auditor-wire.c
+++ b/src/auditor/taler-helper-auditor-wire.c
@@ -1318,7 +1318,7 @@ complain_out_not_found (void *cls,
"profit_drains"),
GNUNET_JSON_pack_uint64 ("row",
serial),
- GNUNET_JSON_pack_data_auto ("wtid",
+ GNUNET_JSON_pack_data_auto ("id",
&roi->details.wtid),
GNUNET_JSON_pack_string ("diagnostic",
"invalid signature")));
@@ -1695,7 +1695,7 @@ reserve_in_cb (void *cls,
"reserves_in"),
GNUNET_JSON_pack_uint64 ("row",
rowid),
- GNUNET_JSON_pack_data_auto ("wire_offset_hash",
+ GNUNET_JSON_pack_data_auto ("id",
&rii->row_off_hash),
GNUNET_JSON_pack_string ("diagnostic",
"duplicate wire offset")));
@@ -2096,7 +2096,7 @@ reserve_closed_cb (void *cls,
"reserves_closures"),
GNUNET_JSON_pack_uint64 ("row",
rowid),
- GNUNET_JSON_pack_data_auto ("reserve_pub",
+ GNUNET_JSON_pack_data_auto ("id",
reserve_pub),
TALER_JSON_pack_amount ("amount_with_fee",
amount_with_fee),
diff --git a/src/exchange/taler-exchange-httpd_reserves_purse.c
b/src/exchange/taler-exchange-httpd_reserves_purse.c
index f7266bd2..930acf54 100644
--- a/src/exchange/taler-exchange-httpd_reserves_purse.c
+++ b/src/exchange/taler-exchange-httpd_reserves_purse.c
@@ -536,6 +536,23 @@ TEH_handler_reserves_purse (
reserve_pub);
TALER_payto_hash (payto_uri,
&rpc.h_payto);
+ TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_EDDSA]++;
+ if (GNUNET_OK !=
+ TALER_wallet_purse_merge_verify (payto_uri,
+ rpc.merge_timestamp,
+ &rpc.pd.purse_pub,
+ &rpc.merge_pub,
+ &rpc.merge_sig))
+ {
+ GNUNET_break_op (0);
+ GNUNET_JSON_parse_free (spec);
+ GNUNET_free (payto_uri);
+ return TALER_MHD_reply_with_error (
+ connection,
+ MHD_HTTP_FORBIDDEN,
+ TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
+ NULL);
+ }
GNUNET_free (payto_uri);
}
GNUNET_assert (GNUNET_OK ==
@@ -627,21 +644,6 @@ TEH_handler_reserves_purse (
TALER_EC_EXCHANGE_PURSE_CREATE_SIGNATURE_INVALID,
NULL);
}
- if (GNUNET_OK !=
- TALER_wallet_purse_merge_verify (TEH_base_url,
- rpc.merge_timestamp,
- &rpc.pd.purse_pub,
- &rpc.merge_pub,
- &rpc.merge_sig))
- {
- GNUNET_break_op (0);
- GNUNET_JSON_parse_free (spec);
- return TALER_MHD_reply_with_error (
- connection,
- MHD_HTTP_FORBIDDEN,
- TALER_EC_EXCHANGE_RESERVES_PURSE_MERGE_SIGNATURE_INVALID,
- NULL);
- }
if (GNUNET_OK !=
TALER_wallet_account_merge_verify (rpc.merge_timestamp,
&rpc.pd.purse_pub,
diff --git a/src/lib/exchange_api_purse_create_with_merge.c
b/src/lib/exchange_api_purse_create_with_merge.c
index 9fd1d552..460239fc 100644
--- a/src/lib/exchange_api_purse_create_with_merge.c
+++ b/src/lib/exchange_api_purse_create_with_merge.c
@@ -454,11 +454,18 @@ TALER_EXCHANGE_purse_create_with_merge (
&pcm->purse_value_after_fees,
purse_priv,
&pcm->purse_sig);
- TALER_wallet_purse_merge_sign (exchange->url,
- merge_timestamp,
- &pcm->purse_pub,
- merge_priv,
- &pcm->merge_sig);
+ {
+ char *payto_uri;
+
+ payto_uri = TALER_reserve_make_payto (exchange->url,
+ &pcm->reserve_pub);
+ TALER_wallet_purse_merge_sign (payto_uri,
+ merge_timestamp,
+ &pcm->purse_pub,
+ merge_priv,
+ &pcm->merge_sig);
+ GNUNET_free (payto_uri);
+ }
TALER_wallet_account_merge_sign (merge_timestamp,
&pcm->purse_pub,
pcm->purse_expiration,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: -fix report generation field name missmatch,
gnunet <=