From ae9f751a7cddeeb27fda10921fa47c1fa0260bac Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 28 Mar 2020 20:46:57 +0100 Subject: do return fees in history --- src/lib/exchange_api_common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib') diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c index 70d1432ff..2748b8fc3 100644 --- a/src/lib/exchange_api_common.c +++ b/src/lib/exchange_api_common.c @@ -109,7 +109,7 @@ TALER_EXCHANGE_parse_reserve_history ( GNUNET_JSON_spec_end () }; - rhistory[off].type = TALER_EXCHANGE_RTT_DEPOSIT; + rhistory[off].type = TALER_EXCHANGE_RTT_CREDIT; if (GNUNET_OK != TALER_amount_add (&total_in, &total_in, @@ -201,8 +201,9 @@ TALER_EXCHANGE_parse_reserve_history ( GNUNET_JSON_parse_free (withdraw_spec); return GNUNET_SYSERR; } + rhistory[off].details.withdraw.fee = fee; } - rhistory[off].details.out_authorization_sig + rhistory[off].details.withdraw.out_authorization_sig = json_object_get (transaction, "signature"); /* Check check that the same withdraw transaction @@ -355,7 +356,8 @@ TALER_EXCHANGE_parse_reserve_history ( rcc.reserve_pub = *reserve_pub; timestamp = GNUNET_TIME_absolute_ntoh (rcc.timestamp); rhistory[off].details.close_details.timestamp = timestamp; - + TALER_amount_ntoh (&rhistory[off].details.close_details.fee, + &rcc.closing_fee); key_state = TALER_EXCHANGE_get_keys (exchange); if (GNUNET_OK != TALER_EXCHANGE_test_signing_key (key_state, @@ -424,7 +426,7 @@ TALER_EXCHANGE_free_reserve_history ( { switch (rhistory[i].type) { - case TALER_EXCHANGE_RTT_DEPOSIT: + case TALER_EXCHANGE_RTT_CREDIT: GNUNET_free_non_null (rhistory[i].details.in_details.wire_reference); GNUNET_free_non_null (rhistory[i].details.in_details.sender_url); break; -- cgit v1.2.3