commit 8f0afa4b2734cb5d8bbe3bcbdc0c0999ebf7d066
parent a42e0dc5109bd94716b9f42fac53c238426cb44d
Author: Christian Grothoff <christian@grothoff.org>
Date: Sun, 1 Sep 2024 20:24:11 +0200
-dce
Diffstat:
3 files changed, 2 insertions(+), 164 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_batch-deposit.c b/src/exchange/taler-exchange-httpd_batch-deposit.c
@@ -612,7 +612,7 @@ bdc_phase_kyc (struct BatchDepositContext *bdc)
TALER_KYCLOGIC_KYC_TRIGGER_DEPOSIT,
bdc->bd.receiver_wire_account,
&bdc->bd.wire_target_h_payto,
- NULL,
+ NULL, /* account_pub */
&deposit_amount_cb,
bdc,
&deposit_legi_cb,
diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c
@@ -1,162 +0,0 @@
-/*
- This file is part of TALER
- Copyright (C) 2014-2024 Taler Systems SA
-
- TALER is free software; you can redistribute it and/or modify
- it under the terms of the GNU Affero 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 Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General
- Public License along with TALER; see the file COPYING. If not,
- see <http://www.gnu.org/licenses/>
-*/
-/**
- * @file taler-exchange-httpd_withdraw.c
- * @brief Common logic for withdraw operations
- * @author Florian Dold
- * @author Benedikt Mueller
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include <gnunet/gnunet_util_lib.h>
-#include <jansson.h>
-#include "taler-exchange-httpd.h"
-#include "taler_json_lib.h"
-#include "taler_kyclogic_lib.h"
-#include "taler_mhd_lib.h"
-#include "taler-exchange-httpd_common_kyc.h"
-#include "taler-exchange-httpd_withdraw.h"
-#include "taler-exchange-httpd_responses.h"
-#include "taler_util.h"
-
-
-/**
- * Closure for #withdraw_amount_cb().
- */
-struct WithdrawContext
-{
- /**
- * Total amount being withdrawn now.
- */
- const struct TALER_Amount *withdraw_total;
-
- /**
- * Current time.
- */
- struct GNUNET_TIME_Timestamp now;
-
- /**
- * Account we are checking against.
- */
- struct TALER_PaytoHashP h_payto;
-};
-
-
-/**
- * Function called to iterate over KYC-relevant transaction amounts for a
- * particular time range. Called within a database transaction, so must
- * not start a new one.
- *
- * @param cls closure, identifies the event type and account to iterate
- * over events for
- * @param limit maximum time-range for which events should be fetched
- * (timestamp in the past)
- * @param cb function to call on each event found, events must be returned
- * in reverse chronological order
- * @param cb_cls closure for @a cb, of type struct AgeWithdrawContext
- * @return transaction status
- */
-static enum GNUNET_DB_QueryStatus
-withdraw_amount_cb (
- void *cls,
- struct GNUNET_TIME_Absolute limit,
- TALER_EXCHANGEDB_KycAmountCallback cb,
- void *cb_cls)
-{
- struct WithdrawContext *wc = cls;
- enum GNUNET_GenericReturnValue ret;
- enum GNUNET_DB_QueryStatus qs;
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Signaling amount %s for KYC check during age-withdrawal\n",
- TALER_amount2s (wc->withdraw_total));
- ret = cb (cb_cls,
- wc->withdraw_total,
- wc->now.abs_time);
- GNUNET_break (GNUNET_SYSERR != ret);
- if (GNUNET_OK != ret)
- return GNUNET_DB_STATUS_SUCCESS_NO_RESULTS;
- qs = TEH_plugin->select_withdraw_amounts_for_kyc_check (
- TEH_plugin->cls,
- &wc->h_payto,
- limit,
- cb,
- cb_cls);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Got %d additional transactions for this age-withdrawal and limit %llu\n",
- qs,
- (unsigned long long) limit.abs_value_us);
- GNUNET_break (qs >= 0);
- return qs;
-}
-
-
-enum GNUNET_DB_QueryStatus
-TEH_withdraw_kyc_check (
- struct TALER_EXCHANGEDB_KycStatus *kyc,
- struct TALER_PaytoHashP *h_payto,
- struct MHD_Connection *connection,
- MHD_RESULT *mhd_ret,
- const struct TALER_ReservePublicKeyP *reserve_pub,
- const struct TALER_Amount *withdraw_total,
- struct GNUNET_TIME_Timestamp now
- )
-{
- enum GNUNET_DB_QueryStatus qs;
- struct WithdrawContext wc = {
- .withdraw_total = withdraw_total,
- .now = now
- };
- char *payto_uri;
-
- /* Check if the money came from a wire transfer */
- qs = TEH_plugin->reserves_get_origin (
- TEH_plugin->cls,
- reserve_pub,
- &wc.h_payto,
- &payto_uri);
- if (qs < 0)
- {
- if (GNUNET_DB_STATUS_HARD_ERROR == qs)
- *mhd_ret = TALER_MHD_reply_with_error (
- connection,
- MHD_HTTP_INTERNAL_SERVER_ERROR,
- TALER_EC_GENERIC_DB_FETCH_FAILED,
- "reserves_get_origin");
- return qs;
- }
- /* If _no_ results, reserve was created by merge,
- in which case no KYC check is required as the
- merge already did that. */
- if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == qs)
- return qs;
- *h_payto = wc.h_payto;
- qs = TEH_legitimization_check (
- kyc,
- connection,
- mhd_ret,
- TALER_KYCLOGIC_KYC_TRIGGER_WITHDRAW,
- payto_uri,
- &wc.h_payto,
- NULL,
- &withdraw_amount_cb,
- &wc);
- GNUNET_free (payto_uri);
- return qs;
-}
diff --git a/src/exchangedb/pg_trigger_kyc_rule_for_account.c b/src/exchangedb/pg_trigger_kyc_rule_for_account.c
@@ -63,7 +63,7 @@ TEH_PG_trigger_kyc_rule_for_account (
"trigger_kyc_rule_for_account",
"SELECT"
" out_legitimization_measure_serial_id"
- " AS legitimization_measure_serial_id"
+ " AS legitimization_measure_serial_id"
" FROM exchange_do_trigger_kyc_rule_for_account"
"($1, $2, $3, $4, $5, $6);");
