taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.taler.net/exchange

Browse Source
This commit is contained in:
Christian Grothoff 2022-11-21 14:21:01 +01:00
commit 0c94dcb79e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
12 changed files with 81 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/taler-exchange.taler-exchange-aggregator.service vendored
View File

@ -1,6 +1,7 @@
[Unit]
Description=GNU Taler payment system exchange aggregator service
PartOf=taler-exchange.target
After=postgres.service
[Service]
User=taler-exchange-aggregator

1
debian/taler-exchange.taler-exchange-closer.service vendored
View File

@ -1,6 +1,7 @@
[Unit]
Description=GNU Taler payment system exchange closer service
PartOf=taler-exchange.target
After=network.target postgres.service
[Service]
User=taler-exchange-closer

1
debian/taler-exchange.taler-exchange-expire.service vendored
View File

@ -1,6 +1,7 @@
[Unit]
Description=GNU Taler payment system exchange expire service
PartOf=taler-exchange.target
After=postgres.service
[Service]
User=taler-exchange-expire

2
debian/taler-exchange.taler-exchange-transfer.service vendored
View File

@ -1,6 +1,6 @@
[Unit]
Description=Taler Exchange Transfer Service
After=network.target
After=network.target postgres.service
PartOf=taler-exchange.target
[Service]

2
debian/taler-exchange.taler-exchange-wirewatch.service vendored
View File

@ -1,6 +1,6 @@
[Unit]
Description=GNU Taler payment system exchange wirewatch service
After=network.target
After=network.target postgres.service
PartOf=taler-exchange.target
[Service]

17
src/auditor/taler-helper-auditor-wire.c
View File

@ -1775,13 +1775,16 @@ conclude_account (struct WireAccount *wa)
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Reconciling CREDIT processing of account `%s'\n",
wa->ai->section_name);
GNUNET_CONTAINER_multihashmap_iterate (in_map,
&complain_in_not_found,
wa);
/* clean up before 2nd phase */
GNUNET_CONTAINER_multihashmap_iterate (in_map,
&free_rii,
NULL);
if (NULL != in_map)
{
GNUNET_CONTAINER_multihashmap_iterate (in_map,
&complain_in_not_found,
wa);
/* clean up before 2nd phase */
GNUNET_CONTAINER_multihashmap_iterate (in_map,
&free_rii,
NULL);
}
process_credits (wa->next);
}

8
src/auditor/test-auditor.sh
View File

@ -240,7 +240,13 @@ function audit_only () {
echo -n "."
$VALGRIND taler-helper-auditor-reserves -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-reserves-inc.json 2> ${MY_TMP_DIR}/test-audit-reserves-inc.log || exit_fail "incremental reserves audit failed"
echo -n "."
$VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire.json 2> ${MY_TMP_DIR}/test-wire-audit.log || exit_fail "wire audit failed"
rm -f ${MY_TMP_DIR}/test-wire-audit.log
thaw() {
$VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire.json 2>> ${MY_TMP_DIR}/test-wire-audit.log
}
thaw || ( echo -e " FIRST CALL TO taler-helper-auditor-wire FAILED,\nRETRY AFTER TWO SECONDS..." | tee -a ${MY_TMP_DIR}/test-wire-audit.log
sleep 2
thaw || exit_fail "wire audit failed" )
echo -n "."
$VALGRIND taler-helper-auditor-wire -i -L DEBUG -c $CONF -m $MASTER_PUB > test-audit-wire-inc.json 2> ${MY_TMP_DIR}/test-wire-audit-inc.log || exit_fail "wire audit inc failed"
echo -n "."

5
src/exchange/taler-exchange-httpd_extensions.c
View File

@ -20,6 +20,7 @@
#include "platform.h"
#include <gnunet/gnunet_json_lib.h>
#include "taler_dbevents.h"
#include "taler-exchange-httpd_keys.h"
#include "taler-exchange-httpd_responses.h"
#include "taler-exchange-httpd_extensions.h"
#include "taler_json_lib.h"
@ -156,6 +157,10 @@ extension_update_event_cb (void *cls,
TALER_age_mask_to_string (&conf->mask));
}
// Finally, call TEH_keys_update_states in order to refresh the cached
// values.
TEH_keys_update_states ();
}

20
src/exchange/taler-exchange-httpd_keys.c
View File

@ -2623,8 +2623,8 @@ TEH_keys_update_states ()
}
struct TEH_KeyStateHandle *
TEH_keys_get_state2 (bool management_only)
static struct TEH_KeyStateHandle *
keys_get_state (bool management_only)
{
struct TEH_KeyStateHandle *old_ksh;
struct TEH_KeyStateHandle *ksh;
@ -2659,20 +2659,29 @@ TEH_keys_get_state2 (bool management_only)
}
struct TEH_KeyStateHandle *
TEH_keys_get_state_for_management_only (void)
{
return keys_get_state (true);
}
struct TEH_KeyStateHandle *
TEH_keys_get_state (void)
{
struct TEH_KeyStateHandle *ksh;
ksh = TEH_keys_get_state2 (false);
ksh = keys_get_state (false);
if (NULL == ksh)
return NULL;
if (ksh->management_only)
{
if (GNUNET_OK !=
finish_keys_response (ksh))
return NULL;
}
return ksh;
}
@ -2715,6 +2724,7 @@ TEH_keys_denomination_by_hash (
NULL);
return NULL;
}
return TEH_keys_denomination_by_hash2 (ksh,
h_denom_pub,
conn,
@ -3410,7 +3420,7 @@ TEH_keys_get_timing (const struct TALER_ExchangePublicKeyP *exchange_pub,
struct HelperSignkey *hsk;
struct GNUNET_PeerIdentity pid;
ksh = TEH_keys_get_state2 (true);
ksh = TEH_keys_get_state_for_management_only ();
if (NULL == ksh)
{
GNUNET_break (0);
@ -3580,7 +3590,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
json_t *reply;
(void) rh;
ksh = TEH_keys_get_state2 (true);
ksh = TEH_keys_get_state_for_management_only ();
if (NULL == ksh)
{
return TALER_MHD_reply_with_error (connection,

12
src/exchange/taler-exchange-httpd_keys.h
View File

@ -168,18 +168,12 @@ TEH_check_invariants (void);
struct TEH_KeyStateHandle *
TEH_keys_get_state (void);
/**
* Obtain the key state. Should ONLY be used
* directly if @a management_only is true. Otherwise use #TEH_keys_get_state().
*
* @param management_only if we should NOT run finish_keys_response()
* because we only need the state for the /management/keys API
* @return NULL on error
* Obtain the key state if we should NOT run finish_keys_response() because we
* only need the state for the /management/keys API
*/
struct TEH_KeyStateHandle *
TEH_keys_get_state2 (bool management_only);
TEH_keys_get_state_for_management_only (void);
/**
* Something changed in the database. Rebuild all key states. This function

3
src/exchange/taler-exchange-httpd_management_post_keys.c
View File

@ -376,8 +376,7 @@ TEH_handler_management_post_keys (
}
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Received /management/keys\n");
akc.ksh = TEH_keys_get_state2 (true); /* may start its own transaction, thus
must be done here, before we run ours! */
akc.ksh = TEH_keys_get_state_for_management_only (); /* may start its own transaction, thus must be done here, before we run ours! */
if (NULL == akc.ksh)
{
GNUNET_break_op (0);

39
src/testing/testing_api_cmd_common.c
View File

@ -90,8 +90,7 @@ TALER_TESTING_history_entry_cmp (
(GNUNET_TIME_timestamp_cmp (
h1->details.history_details.request_timestamp,
==,
h2->details.history_details.
request_timestamp)) &&
h2->details.history_details.request_timestamp)) &&
(0 ==
GNUNET_memcmp (&h1->details.history_details.reserve_sig,
&h2->details.history_details.reserve_sig)) )
@ -131,10 +130,42 @@ TALER_TESTING_history_entry_cmp (
return 0;
return 1;
case TALER_EXCHANGE_RTT_OPEN:
// FIXME: verify response...
if ( (0 ==
TALER_amount_cmp (&h1->amount,
&h2->amount)) &&
(GNUNET_TIME_timestamp_cmp (
h1->details.open_request.request_timestamp,
==,
h2->details.open_request.request_timestamp)) &&
(GNUNET_TIME_timestamp_cmp (
h1->details.open_request.reserve_expiration,
==,
h2->details.open_request.reserve_expiration)) &&
(h1->details.open_request.purse_limit ==
h2->details.open_request.purse_limit) &&
(0 ==
TALER_amount_cmp (&h1->details.open_request.reserve_payment,
&h2->details.open_request.reserve_payment)) &&
(0 ==
GNUNET_memcmp (&h1->details.open_request.reserve_sig,
&h2->details.open_request.reserve_sig)) )
return 0;
return 1;
case TALER_EXCHANGE_RTT_CLOSE:
// FIXME: verify response...
if ( (0 ==
TALER_amount_cmp (&h1->amount,
&h2->amount)) &&
(GNUNET_TIME_timestamp_cmp (
h1->details.close_request.request_timestamp,
==,
h2->details.close_request.request_timestamp)) &&
(0 ==
GNUNET_memcmp (&h1->details.close_request.target_account_h_payto,
&h2->details.close_request.target_account_h_payto)) &&
(0 ==
GNUNET_memcmp (&h1->details.close_request.reserve_sig,
&h2->details.close_request.reserve_sig)) )
return 0;
return 1;
}
GNUNET_assert (0);