From f8af571d5454025756f1559687c7efd65a57b9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCr=20Kesim?= Date: Mon, 23 Jan 2023 11:16:38 +0100 Subject: [PATCH] WiP:age-withdraw: added get_age_withdraw_info --- src/exchangedb/Makefile.am | 1 + src/exchangedb/pg_get_age_withdraw_info.c | 80 +++++++++++++++++++++ src/exchangedb/pg_get_age_withdraw_info.h | 45 ++++++++++++ src/exchangedb/plugin_exchangedb_postgres.c | 3 + src/include/taler_exchangedb_plugin.h | 17 +++-- 5 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 src/exchangedb/pg_get_age_withdraw_info.c create mode 100644 src/exchangedb/pg_get_age_withdraw_info.h diff --git a/src/exchangedb/Makefile.am b/src/exchangedb/Makefile.am index 2ae5fe426..89abf7095 100644 --- a/src/exchangedb/Makefile.am +++ b/src/exchangedb/Makefile.am @@ -114,6 +114,7 @@ libtaler_plugin_exchangedb_postgres_la_SOURCES = \ pg_drain_kyc_alert.h pg_drain_kyc_alert.c \ pg_reserves_in_insert.h pg_reserves_in_insert.c \ pg_get_withdraw_info.h pg_get_withdraw_info.c \ + pg_get_age_withdraw_info.c pg_get_age_withdraw_info.h \ pg_do_batch_withdraw.h pg_do_batch_withdraw.c \ pg_get_policy_details.h pg_get_policy_details.c \ pg_persist_policy_details.h pg_persist_policy_details.c \ diff --git a/src/exchangedb/pg_get_age_withdraw_info.c b/src/exchangedb/pg_get_age_withdraw_info.c new file mode 100644 index 000000000..7662d4b51 --- /dev/null +++ b/src/exchangedb/pg_get_age_withdraw_info.c @@ -0,0 +1,80 @@ +/* + This file is part of TALER + Copyright (C) 2023 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see + */ +/** + * @file exchangedb/pg_get_age_withdraw_info.c + * @brief Implementation of the get_age_withdraw_info function for Postgres + * @author Özgür Kesim + */ +#include "platform.h" +#include "taler_error_codes.h" +#include "taler_dbevents.h" +#include "taler_pq_lib.h" +#include "pg_get_age_withdraw_info.h" +#include "pg_helper.h" + + +enum GNUNET_DB_QueryStatus +TEH_PG_get_age_withdraw_info ( + void *cls, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct TALER_AgeWithdrawCommitmentHashP *ach, + struct TALER_EXCHANGEDB_AgeWithdrawCommitment *awc) +{ + struct PostgresClosure *pg = cls; + struct GNUNET_PQ_QueryParam params[] = { + GNUNET_PQ_query_param_auto_from_type (ach), + GNUNET_PQ_query_param_end + }; + struct GNUNET_PQ_ResultSpec rs[] = { + GNUNET_PQ_result_spec_auto_from_type ("h_commitment", + &awc->h_commitment), + GNUNET_PQ_result_spec_auto_from_type ("reserve_sig", + &awc->reserve_sig), + GNUNET_PQ_result_spec_auto_from_type ("reserve_pub", + &awc->reserve_pub), + GNUNET_PQ_result_spec_uint32 ("max_age_group", + &awc->max_age_group), + TALER_PQ_RESULT_SPEC_AMOUNT ("amount_with_fee", + &awc->amount_with_fee), + GNUNET_PQ_result_spec_uint32 ("noreveal_index", + &awc->noreveal_index), + GNUNET_PQ_result_spec_timestamp ("timtestamp", + &awc->timestamp), + GNUNET_PQ_result_spec_end + }; + + /* Used in #postgres_get_age_withdraw_info() to + locate the response for a /reserve/$RESERVE_PUB/age-withdraw request using + the hash of the blinded message. Used to make sure + /reserve/$RESERVE_PUB/age-withdraw requests are idempotent. */ + PREPARE (pg, + "get_age_withdraw_info", + "SELECT" + " h_commitment" + ",reserve_sig" + ",reserve_pub" + ",max_age_group" + ",amount_with_fee_val" + ",amount_with_fee_frac" + ",noreveal_index" + ",timestamp" + " FROM withdraw_age_commitments" + " WHERE h_commitment=$1;"); + return GNUNET_PQ_eval_prepared_singleton_select (pg->conn, + "get_age_withdraw_info", + params, + rs); +} diff --git a/src/exchangedb/pg_get_age_withdraw_info.h b/src/exchangedb/pg_get_age_withdraw_info.h new file mode 100644 index 000000000..b32933b34 --- /dev/null +++ b/src/exchangedb/pg_get_age_withdraw_info.h @@ -0,0 +1,45 @@ +/* + This file is part of TALER + Copyright (C) 2023 Taler Systems SA + + TALER is free software; you can redistribute it and/or modify it under the + terms of the GNU General Public License as published by the Free Software + Foundation; either version 3, or (at your option) any later version. + + TALER is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along with + TALER; see the file COPYING. If not, see + */ +/** + * @file exchangedb/pg_get_age_withdraw_info.h + * @brief implementation of the get_age_withdraw_info function for Postgres + * @author Özgür KESIM + */ +#ifndef PG_GET_AGE_WITHDRAW_INFO_H +#define PG_GET_AGE_WITHDRAW_INFO_H + +#include "taler_util.h" +#include "taler_json_lib.h" +#include "taler_exchangedb_plugin.h" + +/** + * Locate the response for a age-withdraw request under a hash that uniquely + * identifies the age-withdraw operation. Used to ensure idempotency of the + * request. + * + * @param cls the @e cls of this struct with the plugin-specific state + * @param reserve_pub public key of the reserve for which the age-withdraw request is made + * @param ach hash that uniquely identifies the age-withdraw operation + * @param[out] awc corresponding details of the previous age-withdraw request if an entry was found + * @return statement execution status + */ +enum GNUNET_DB_QueryStatus +TEH_PG_get_age_withdraw_info (void *cls, + const struct TALER_ReservePublicKeyP *reserve_pub, + const struct + TALER_AgeWithdrawCommitmentHashP *ach, + struct TALER_EXCHANGEDB_AgeWithdrawCommitment *awc); +#endif diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c index cd5773a05..3aefa8b72 100644 --- a/src/exchangedb/plugin_exchangedb_postgres.c +++ b/src/exchangedb/plugin_exchangedb_postgres.c @@ -115,6 +115,7 @@ #include "pg_drain_kyc_alert.h" #include "pg_reserves_in_insert.h" #include "pg_get_withdraw_info.h" +#include "pg_get_age_withdraw_info.h" #include "pg_do_batch_withdraw.h" #include "pg_get_policy_details.h" #include "pg_persist_policy_details.h" @@ -577,6 +578,8 @@ libtaler_plugin_exchangedb_postgres_init (void *cls) = &TEH_PG_reserves_in_insert; plugin->get_withdraw_info = &TEH_PG_get_withdraw_info; + plugin->get_age_withdraw_info + = &TEH_PG_get_age_withdraw_info; plugin->do_batch_withdraw = &TEH_PG_do_batch_withdraw; plugin->get_policy_details diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index 2c23f7d64..8789a0716 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -1062,15 +1062,10 @@ struct TALER_EXCHANGEDB_AgeWithdrawCommitment */ struct TALER_Amount amount_with_fee; - /** - * Public key of the reserve that was drained. - */ - struct TALER_ReservePublicKeyP reserve_pub; - /** * Maximum age group that the coins are restricted to. */ - uint8_t max_age_group; + uint32_t max_age_group; /** * The hash of the commitment of all n*kappa coins @@ -1084,6 +1079,11 @@ struct TALER_EXCHANGEDB_AgeWithdrawCommitment */ uint32_t noreveal_index; + /** + * Public key of the reserve that was drained. + */ + struct TALER_ReservePublicKeyP reserve_pub; + /** * Signature confirming the age withdrawal, matching @e reserve_pub, @e * maximum_age_group and @e h_commitment and @e total_amount_with_fee. @@ -1094,6 +1094,11 @@ struct TALER_EXCHANGEDB_AgeWithdrawCommitment * The exchange's signature of the response. */ struct TALER_ExchangeSignatureP sig; + + /** + * Timestamp of the request beeing made + */ + struct GNUNET_TIME_Timestamp timestamp; };