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

start with new history API implementation

Browse Source
This commit is contained in:
Christian Grothoff 2020-02-11 15:39:39 +01:00
parent 26c9563ef0
commit de0d987e34
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/prebuilt

@ -1 +1 @@
Subproject commit 934a6a18301e81c4fd1b3a8cda2dc13dca4741cc Subproject commit ca53235ccfa0458ebf11c204888ca370e20ec3f5

22
src/bank-lib/fakebank.c
View File

@ -776,7 +776,7 @@ handle_transfer (struct TALER_FAKEBANK_Handle *h,
/** /**
* Handle incoming HTTP request for /history * Handle incoming HTTP request for /
* *
* @param h the fakebank handle * @param h the fakebank handle
* @param connection the connection * @param connection the connection
@ -925,8 +925,13 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
const char *account) const char *account)
{ {
struct HistoryArgs ha; struct HistoryArgs ha;
struct Transaction *pos; const struct Transaction *pos;
json_t *history; json_t *history;
struct TALER_Amount total_incoming;
struct TALER_Amount start_outgoing;
struct TALER_Amount end_outgoing;
const struct Transaction *start_pos;
const struct Transaction *end_pos;
if (GNUNET_OK != if (GNUNET_OK !=
parse_history_common_args (connection, parse_history_common_args (connection,
@ -967,6 +972,11 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
/* list is empty */ /* list is empty */
pos = NULL; pos = NULL;
} }
if (0 > ha.delta)
end_pos = pos;
else
start_pos = pos;
history = json_array (); history = json_array ();
while ( (0 != ha.delta) && while ( (0 != ha.delta) &&
(NULL != pos) ) (NULL != pos) )
@ -1018,6 +1028,14 @@ handle_debit_history (struct TALER_FAKEBANK_Handle *h,
if (0 < ha.delta) if (0 < ha.delta)
pos = pos->next; pos = pos->next;
} }
if (0 > ha.delta)
start_pos = pos;
else
end_pos = pos;
GNUNET_assert (GNUNET_OK ==
TALER_amount_get_zero (fb->currency,
&));
return TALER_MHD_reply_json_pack (connection, return TALER_MHD_reply_json_pack (connection,
MHD_HTTP_OK, MHD_HTTP_OK,
"{s:o}", "{s:o}",

2
src/exchange-tools/taler-exchange-keyup.c
View File

@ -770,7 +770,7 @@ create_denomkey_issue (const struct CoinTypeParams *params,
GNUNET_assert (NULL != dki->denom_priv.rsa_private_key); GNUNET_assert (NULL != dki->denom_priv.rsa_private_key);
dki->denom_pub.rsa_public_key dki->denom_pub.rsa_public_key
= GNUNET_CRYPTO_rsa_private_key_get_public ( = GNUNET_CRYPTO_rsa_private_key_get_public (
dki->denom_priv.rsa_private_key); dki->denom_priv.rsa_private_key);
GNUNET_CRYPTO_rsa_public_key_hash (dki->denom_pub.rsa_public_key, GNUNET_CRYPTO_rsa_public_key_hash (dki->denom_pub.rsa_public_key,
&dki->issue.properties.denom_hash); &dki->issue.properties.denom_hash);
dki->issue.properties.master = master_public_key; dki->issue.properties.master = master_public_key;

6
src/exchange/taler-exchange-httpd_refresh_reveal.c
View File

@ -697,9 +697,9 @@ resolve_refresh_reveal_denominations (struct TEH_KS_StateHandle *key_state,
{ {
rctx->ev_sigs[i].rsa_signature rctx->ev_sigs[i].rsa_signature
= GNUNET_CRYPTO_rsa_sign_blinded ( = GNUNET_CRYPTO_rsa_sign_blinded (
rctx->dkis[i]->denom_priv.rsa_private_key, rctx->dkis[i]->denom_priv.rsa_private_key,
rctx->rcds[i].coin_ev, rctx->rcds[i].coin_ev,
rctx->rcds[i].coin_ev_size); rctx->rcds[i].coin_ev_size);
if (NULL == rctx->ev_sigs[i].rsa_signature) if (NULL == rctx->ev_sigs[i].rsa_signature)
{ {
GNUNET_break (0); GNUNET_break (0);

2
src/lib/exchange_api_handle.c
View File

@ -1259,7 +1259,7 @@ keys_completed_cb (void *cls,
for (unsigned int i = 0; i<kd_old.num_denom_keys; i++) for (unsigned int i = 0; i<kd_old.num_denom_keys; i++)
kd.denom_keys[i].key.rsa_public_key kd.denom_keys[i].key.rsa_public_key
= GNUNET_CRYPTO_rsa_public_key_dup ( = GNUNET_CRYPTO_rsa_public_key_dup (
kd_old.denom_keys[i].key.rsa_public_key); kd_old.denom_keys[i].key.rsa_public_key);
kd.num_auditors = kd_old.num_auditors; kd.num_auditors = kd_old.num_auditors;
kd.auditors = GNUNET_new_array (kd.num_auditors, kd.auditors = GNUNET_new_array (kd.num_auditors,