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

-get batch withdraw to build

Browse Source
This commit is contained in:
Christian Grothoff 2022-05-01 13:01:32 +02:00
parent 7718cd4153
commit 3d80b20459
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 0172bed41a8fdfc4ef2511e311441120a3d2572d Subproject commit 625ae124ff4404702be49a06cf118ce0c7510d22

1
src/exchange/Makefile.am
View File

@ -79,6 +79,7 @@ taler_exchange_transfer_LDADD = \
taler_exchange_httpd_SOURCES = \ taler_exchange_httpd_SOURCES = \
taler-exchange-httpd.c taler-exchange-httpd.h \ taler-exchange-httpd.c taler-exchange-httpd.h \
taler-exchange-httpd_auditors.c taler-exchange-httpd_auditors.h \ taler-exchange-httpd_auditors.c taler-exchange-httpd_auditors.h \
taler-exchange-httpd_batch-withdraw.c taler-exchange-httpd_batch-withdraw.h \
taler-exchange-httpd_contract.c taler-exchange-httpd_contract.h \ taler-exchange-httpd_contract.c taler-exchange-httpd_contract.h \
taler-exchange-httpd_csr.c taler-exchange-httpd_csr \ taler-exchange-httpd_csr.c taler-exchange-httpd_csr \
taler-exchange-httpd_db.c taler-exchange-httpd_db.h \ taler-exchange-httpd_db.c taler-exchange-httpd_db.h \

21
src/exchange/taler-exchange-httpd_batch-withdraw.c
View File

@ -217,7 +217,7 @@ batch_withdraw_transaction (void *cls,
/* The reserve does not have the required amount (actual /* The reserve does not have the required amount (actual
* amount + withdraw fee) */ * amount + withdraw fee) */
qs = TEH_plugin->get_reserve_history (TEH_plugin->cls, qs = TEH_plugin->get_reserve_history (TEH_plugin->cls,
&wc->collectable.reserve_pub, wc->reserve_pub,
&balance, &balance,
&rh); &rh);
if (NULL == rh) if (NULL == rh)
@ -303,7 +303,7 @@ batch_withdraw_transaction (void *cls,
: NULL; : NULL;
qs = TEH_plugin->do_batch_withdraw_insert (TEH_plugin->cls, qs = TEH_plugin->do_batch_withdraw_insert (TEH_plugin->cls,
nonce, nonce,
&wc->collectable, &pc->collectable,
now, now,
ruuid, ruuid,
&denom_unknown, &denom_unknown,
@ -334,7 +334,7 @@ batch_withdraw_transaction (void *cls,
"Idempotent coin in batch, not allowed. Aborting.\n"); "Idempotent coin in batch, not allowed. Aborting.\n");
*mhd_ret = TALER_MHD_reply_with_error (connection, *mhd_ret = TALER_MHD_reply_with_error (connection,
MHD_HTTP_CONFLICT, MHD_HTTP_CONFLICT,
TALER_EC_EXCHANGE_BATCH_IDEMPOTENT_PLANCHET, TALER_EC_EXCHANGE_WITHDRAW_BATCH_IDEMPOTENT_PLANCHET,
NULL); NULL);
return GNUNET_DB_STATUS_HARD_ERROR; return GNUNET_DB_STATUS_HARD_ERROR;
} }
@ -560,10 +560,9 @@ parse_planchets (struct TEH_RequestContext *rc,
wc, wc,
&mret)) &mret))
{ {
GNUNET_JSON_parse_free (spec);
return TEH_RESPONSE_reply_expired_denom_pub_hash ( return TEH_RESPONSE_reply_expired_denom_pub_hash (
rc->connection, rc->connection,
&wc->collectable.denom_pub_hash, &pc->collectable.denom_pub_hash,
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED, TALER_EC_EXCHANGE_GENERIC_DENOMINATION_EXPIRED,
"WITHDRAW"); "WITHDRAW");
} }
@ -575,7 +574,7 @@ parse_planchets (struct TEH_RequestContext *rc,
for idempotency! */ for idempotency! */
return TEH_RESPONSE_reply_expired_denom_pub_hash ( return TEH_RESPONSE_reply_expired_denom_pub_hash (
rc->connection, rc->connection,
&wc->collectable.denom_pub_hash, &pc->collectable.denom_pub_hash,
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE, TALER_EC_EXCHANGE_GENERIC_DENOMINATION_VALIDITY_IN_FUTURE,
"WITHDRAW"); "WITHDRAW");
} }
@ -588,13 +587,13 @@ parse_planchets (struct TEH_RequestContext *rc,
{ {
return TEH_RESPONSE_reply_expired_denom_pub_hash ( return TEH_RESPONSE_reply_expired_denom_pub_hash (
rc->connection, rc->connection,
&wc->collectable.denom_pub_hash, &pc->collectable.denom_pub_hash,
TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED, TALER_EC_EXCHANGE_GENERIC_DENOMINATION_REVOKED,
"WITHDRAW"); "WITHDRAW");
} }
return mret; return mret;
} }
if (dk->denom_pub.cipher != wc->blinded_planchet.cipher) if (dk->denom_pub.cipher != pc->blinded_planchet.cipher)
{ {
/* denomination cipher and blinded planchet cipher not the same */ /* denomination cipher and blinded planchet cipher not the same */
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
@ -615,7 +614,7 @@ parse_planchets (struct TEH_RequestContext *rc,
if (0 > if (0 >
TALER_amount_add (&wc->batch_total, TALER_amount_add (&wc->batch_total,
&wc->batch_total, &wc->batch_total,
pc->collectable.amount_with_fee)) &pc->collectable.amount_with_fee))
{ {
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
@ -629,7 +628,6 @@ parse_planchets (struct TEH_RequestContext *rc,
&pc->collectable.h_coin_envelope)) &pc->collectable.h_coin_envelope))
{ {
GNUNET_break (0); GNUNET_break (0);
GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_INTERNAL_SERVER_ERROR, MHD_HTTP_INTERNAL_SERVER_ERROR,
TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE, TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
@ -644,7 +642,6 @@ parse_planchets (struct TEH_RequestContext *rc,
&pc->collectable.reserve_sig)) &pc->collectable.reserve_sig))
{ {
GNUNET_break_op (0); GNUNET_break_op (0);
GNUNET_JSON_parse_free (spec);
return TALER_MHD_reply_with_error (rc->connection, return TALER_MHD_reply_with_error (rc->connection,
MHD_HTTP_FORBIDDEN, MHD_HTTP_FORBIDDEN,
TALER_EC_EXCHANGE_WITHDRAW_RESERVE_SIGNATURE_INVALID, TALER_EC_EXCHANGE_WITHDRAW_RESERVE_SIGNATURE_INVALID,
@ -720,7 +717,7 @@ TEH_handler_batch_withdraw (struct TEH_RequestContext *rc,
/* Clean up */ /* Clean up */
for (unsigned int i = 0; i<wc.planchets_length; i++) for (unsigned int i = 0; i<wc.planchets_length; i++)
{ {
struct PlanchetContext *pc = &wc->planchets[i]; struct PlanchetContext *pc = &wc.planchets[i];
// FIXME: Free more of memory in pc! // FIXME: Free more of memory in pc!
TALER_blinded_denom_sig_free (&pc->collectable.sig); TALER_blinded_denom_sig_free (&pc->collectable.sig);