From 397c718809f2f53f3e0714ea6433083ea7379124 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 2 Mar 2017 06:26:12 +0100 Subject: implementing #4921: add base URL to wire transfers --- src/include/taler_bank_service.h | 6 ++++-- src/include/taler_fakebank_lib.h | 11 +++++++---- src/include/taler_wire_plugin.h | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) (limited to 'src/include') diff --git a/src/include/taler_bank_service.h b/src/include/taler_bank_service.h index 221e9b013..e5ea42123 100644 --- a/src/include/taler_bank_service.h +++ b/src/include/taler_bank_service.h @@ -57,8 +57,9 @@ typedef void * to the operators of the bank. * * @param ctx curl context for the event loop - * @param bank_base_url URL of the bank - * @param reserve_pub public key of the reserve + * @param bank_base_url URL of the bank (used to execute this request) + * @param exchange_base_url base URL of the exchange (for tracking) + * @param wtid wire transfer identifier for the transfer * @param amount amount that was deposited * @param execution_date when did we receive the amount * @param debit_account_no account number to withdraw from (53 bits at most) @@ -72,6 +73,7 @@ typedef void struct TALER_BANK_AdminAddIncomingHandle * TALER_BANK_admin_add_incoming (struct GNUNET_CURL_Context *ctx, const char *bank_base_url, + const char *exchange_base_url, const struct TALER_WireTransferIdentifierRawP *wtid, const struct TALER_Amount *amount, uint64_t debit_account_no, diff --git a/src/include/taler_fakebank_lib.h b/src/include/taler_fakebank_lib.h index d2267cfba..f584cb85c 100644 --- a/src/include/taler_fakebank_lib.h +++ b/src/include/taler_fakebank_lib.h @@ -71,15 +71,18 @@ TALER_FAKEBANK_check_empty (struct TALER_FAKEBANK_Handle *h); * @param want_amount transfer amount desired * @param want_debit account that should have been debited * @param want_debit account that should have been credited + * @param exchange_base_url expected base URL of the exchange, + * i.e. "https://example.com/"; may include a port * @param[out] wtid set to the wire transfer identifier * @return #GNUNET_OK on success */ int TALER_FAKEBANK_check (struct TALER_FAKEBANK_Handle *h, - const struct TALER_Amount *want_amount, - uint64_t want_debit, - uint64_t want_credit, - struct TALER_WireTransferIdentifierRawP *wtid); + const struct TALER_Amount *want_amount, + uint64_t want_debit, + uint64_t want_credit, + const char *exchange_base_url, + struct TALER_WireTransferIdentifierRawP *wtid); /** diff --git a/src/include/taler_wire_plugin.h b/src/include/taler_wire_plugin.h index 6c06e8247..7a3460357 100644 --- a/src/include/taler_wire_plugin.h +++ b/src/include/taler_wire_plugin.h @@ -155,6 +155,7 @@ struct TALER_WIRE_Plugin * @param cls the @e cls of this struct with the plugin-specific state * @param wire valid wire account information * @param amount amount to transfer, already rounded + * @param exchange_base_url base URL of this exchange * @param wtid wire transfer identifier to use * @param ptc function to call with the prepared data to persist * @param ptc_cls closure for @a ptc @@ -164,6 +165,7 @@ struct TALER_WIRE_Plugin (*prepare_wire_transfer) (void *cls, const json_t *wire, const struct TALER_Amount *amount, + const char *exchange_base_url, const struct TALER_WireTransferIdentifierRawP *wtid, TALER_WIRE_PrepareTransactionCallback ptc, void *ptc_cls); -- cgit v1.2.3