commit 24e3f5cd5d6c70940e78aa7bc157567284a8258b
parent 215e48fbf3a7a73358dc2441ee0818b632e1ecf0
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date: Mon, 9 Oct 2023 19:23:34 +0200
[header] adjustments of last week
Diffstat:
1 file changed, 266 insertions(+), 274 deletions(-)
diff --git a/src/include/taler_donau_service.h b/src/include/taler_donau_service.h
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2014-2023 Taler Systems SA
+ Copyright (C) 2023 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
@@ -19,6 +19,7 @@
* @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Christian Grothoff
* @author Özgür Kesim
+ * @author Lukas Matyja
*/
#ifndef _TALER_DONAU_SERVICE_H
#define _TALER_DONAU_SERVICE_H
@@ -59,13 +60,11 @@ struct TALER_DONAU_DonationUnitPublicKey
/**
* The public key
*/
- struct TALER_XXX key;
+ struct TALER_DonationUnitPublicKey key;
/**
- * The hash of the public key. Redundant.
+ * amount of the donation
*/
- struct TALER_BDRHashP h_key;
-
struct TALER_Amount donation_unit;
/**
@@ -87,9 +86,9 @@ struct TALER_DONAU_Keys
struct TALER_DONAU_SigningPublicKey *sign_keys;
/**
- * Array of the donau's BDR keys.
+ * Array of the donau'sdonation unit keys.
*/
- struct TALER_DONAU_BDRPublicKey *BDR_keys; // no caps here please!
+ struct TALER_DONAU_DonationUnitPublicKey *donation_unit_keys;
/**
* Supported protocol version by the donau.
@@ -116,10 +115,10 @@ struct TALER_DONAU_Keys
char *donau_url;
/**
- * Default number of fractional digits to render
- * amounts with.
+ * Specifies how an amount's fractional digits should be rendered.
+ * More details in DD51.
*/
- uint32_t currency_fraction_digits; // See new DD51!
+ struct CurrencySpecification currency_specification;
/**
* Length of the @e sign_keys array (number of valid entries).
@@ -127,9 +126,9 @@ struct TALER_DONAU_Keys
unsigned int num_sign_keys;
/**
- * Length of the @e BDR_keys array.
+ * Length of the @e donation_unit_keys array.
*/
- unsigned int num_BDR_keys; // no caps here please!
+ unsigned int num_donation_unit_keys;
/**
* Reference counter for this structure.
@@ -383,54 +382,54 @@ TALER_DONAU_test_signing_key (
/**
- * Obtain the BDR key details from the donau.
+ * Obtain thedonation unit key details from the donau.
*
* @param keys the donau's key set
- * @param pk public key of the BDR to lookup
- * @return details about the given BDR key, NULL if the key is not
+ * @param pk public key of thedonation unit to lookup
+ * @return details about the givendonation unit key, NULL if the key is not
* found
*/
-const struct TALER_DONAU_BDRPublicKey *
-TALER_DONAU_get_BDR_key ( // no bdr in caps!
+const struct TALER_DONAU_DonationUnitPublicKey *
+TALER_DONAU_get_donation_unit_key (
const struct TALER_DONAU_Keys *keys,
- const struct TALER_BDRPublicKey *pk);
+ const struct TALER_DonationUnitPublicKey *pk);
/**
- * Create a copy of a BDR public key.
+ * Create a copy of adonation unit public key.
*
* @param key key to copy
- * @returns a copy, must be freed with #TALER_DONAU_destroy_BDR_key()
+ * @returns a copy, must be freed with #TALER_DONAU_destroy_donation_unit_key()
* @deprecated
*/
-struct TALER_DONAU_BDRPublicKey *
-TALER_DONAU_copy_BDR_key ( // no bdr in caps!
- const struct TALER_DONAU_BDRPublicKey *key);
+struct TALER_DONAU_DonationUnitPublicKey *
+TALER_DONAU_copy_donation_unit_key (
+ const struct TALER_DONAU_DonationUnitPublicKey *key);
/**
- * Destroy a BDR public key.
- * Should only be called with keys created by #TALER_DONAU_copy_BDR_key().
+ * Destroy adonation unit public key.
+ * Should only be called with keys created by #TALER_DONAU_copy_donation_unit_key().
*
* @param key key to destroy.
* @deprecated
*/
void
-TALER_DONAU_destroy_BDR_key ( // no bdr in caps!
- struct TALER_DONAU_BDRPublicKey *key);
+TALER_DONAU_destroy_donation_unit_key (
+ struct TALER_DONAU_DonationUnitPublicKey *key);
/**
- * Obtain the BDR key details from the donau.
+ * Obtain thedonation unit key details from the donau.
*
* @param keys the donau's key set
- * @param hc hash of the public key of the BDR to lookup
- * @return details about the given BDR key
+ * @param hc hash of the public key of thedonation unit to lookup
+ * @return details about the givendonation unit key
*/
-const struct TALER_DONAU_BDRPublicKey *
-TALER_DONAU_get_BDR_key_by_hash (
+const struct TALER_DONAU_DonationUnitPublicKey *
+TALER_DONAU_get_donation_unit_key_by_hash (
const struct TALER_DONAU_Keys *keys,
- const struct TALER_BDRHashP *hc);
+ const struct TALER_DonationUnitHashP *hc);
/**
@@ -452,30 +451,30 @@ TALER_DONAU_get_signing_key_info (
/**
* Information needed for a receipt to be collected.
*/
-struct TALER_DONAU_BDRDetail
+struct TALER_DONAU_DonationUnitDetail
{
/**
- * The BDR public key.
+ * Thedonation unit public key.
*/
- struct TALER_BDRPublicKeyP bdr_pub;
+ struct TALER_DonationUnitPublicKeyP bdr_pub;
/**
* Hash of the public key of the coin.
*/
- struct TALER_BDRHashP h_BDR_pub; // Eh, what? Coin? Nonce!
+ struct TALER_DonationUnitHashP h_donation_unit_pub; // Eh, what? Coin? Nonce!
/**
- * The BDR itself.
+ * Thedonation unit itself.
*/
- struct TALER_BDR bdr; // FIXME: what is this!?
+ struct TALER_DonationUnit bdr; // FIXME: what is this!?
};
/**
- * Information needed for a BDR to be signed.
+ * Information needed for adonation unit to be signed.
*/
-struct TALER_DONAU_BDRDetail // Duplicated name!
+struct TALER_DONAU_DonationUnitDetail // Duplicated name!
{
/**
@@ -497,12 +496,12 @@ struct TALER_DONAU_BDRDetail // Duplicated name!
/**
* Donau’s unblinded signature of the coin.
*/
- struct TALER_BDRSignature BDR_sig;
+ struct TALER_DonationUnitSignature donation_unit_sig;
/**
* Hash of the public key of the coin.
*/
- struct TALER_BDRHashP h_BDR_pub; // of the coin? or of the public key for BDR_sig!!?
+ struct TALER_DonationUnitHashP h_donation_unit_pub; // of the coin? or of the public key for donation_unit_sig!!?
};
@@ -538,13 +537,6 @@ struct TALER_DONAU_DepositContractDetail
struct GNUNET_HashCode wallet_data_hash;
/**
- * Date until which the charity can issue a refund to the donor via the
- * donau (can be zero if refunds are not allowed); must not be after the
- * @e wire_deadline.
- */
- struct GNUNET_TIME_Timestamp refund_deadline;
-
- /**
* Execution date, until which the charity would like the donau to
* settle the balance (advisory, the donau cannot be forced to settle in
* the past or upon very short notice, but of course a well-behaved donau
@@ -713,19 +705,19 @@ TALER_DONAU_batch_deposit_cancel (
struct TALER_DONAU_BatchDepositHandle *deposit);
-/* ********************* POST /csr singing BDR *********************** */
+/* ********************* POST /csr issue receipts (equivalent to issue_receipts of exchange) *********************** */
/**
- * @brief A /csr-withdraw Handle
+ * @brief A /csr-issue_receipts Handle
*/
-struct TALER_DONAU_CsRWithdrawHandle;
+struct TALER_DONAU_CsRIssueReceiptsHandle;
/**
* Details about a response for a CS R request.
*/
-struct TALER_DONAU_CsRWithdrawResponse
+struct TALER_DONAU_CsRIssueReceiptsResponse
{
/**
* HTTP response data.
@@ -744,9 +736,9 @@ struct TALER_DONAU_CsRWithdrawResponse
{
/**
* Values contributed by the donau for the
- * respective coin's withdraw operation.
+ * respective coin's issue_receipts operation.
*/
- struct TALER_DonauWithdrawValues alg_values;
+ struct TALER_DonauIssueReceiptsValues alg_values;
} ok;
/**
@@ -763,50 +755,50 @@ struct TALER_DONAU_CsRWithdrawResponse
/**
* Callbacks of this type are used to serve the result of submitting a
- * CS R withdraw request to a donau.
+ * CS R issue_receipts request to a donau.
*
* @param cls closure
* @param csrr response details
*/
typedef void
-(*TALER_DONAU_CsRWithdrawCallback) (
+(*TALER_DONAU_CsRIssueReceiptsCallback) (
void *cls,
- const struct TALER_DONAU_CsRWithdrawResponse *csrr);
+ const struct TALER_DONAU_CsRIssueReceiptsResponse *csrr);
/**
- * Get a CS R using a /csr-withdraw request.
+ * Get a CS R using a /csr-issue_receipts request.
*
* @param curl_ctx The curl context to use for the requests
* @param donau_url Base-URL to the excnange
- * @param pk Which BDR key is the /csr request for
+ * @param pk Whichdonation unit key is the /csr request for
* @param nonce client nonce for the request
* @param res_cb the callback to call when the final result for this request is available
* @param res_cb_cls closure for the above callback
* @return handle for the operation on success, NULL on error, i.e.
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
-struct TALER_DONAU_CsRWithdrawHandle *
-TALER_DONAU_csr_withdraw (
+struct TALER_DONAU_CsRIssueReceiptsHandle *
+TALER_DONAU_csr_issue_receipts (
struct GNUNET_CURL_Context *curl_ctx,
const char *donau_url,
- const struct TALER_DONAU_BDRPublicKey *pk,
+ const struct TALER_DONAU_DonationUnitPublicKey *pk,
const struct TALER_CsNonce *nonce,
- TALER_DONAU_CsRWithdrawCallback res_cb,
+ TALER_DONAU_CsRIssueReceiptsCallback res_cb,
void *res_cb_cls);
/**
*
- * Cancel a CS R withdraw request. This function cannot be used
+ * Cancel a CS R issue_receipts request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param csrh the withdraw handle
+ * @param csrh the issue_receipts handle
*/
void
-TALER_DONAU_csr_withdraw_cancel (
- struct TALER_DONAU_CsRWithdrawHandle *csrh);
+TALER_DONAU_csr_issue_receipts_cancel (
+ struct TALER_DONAU_CsRIssueReceiptsHandle *csrh);
/* ********************* GET /reserves/$RESERVE_PUB *********************** */
@@ -823,12 +815,12 @@ enum TALER_DONAU_ReserveTransactionType
TALER_DONAU_RTT_CREDIT,
/**
- * Withdrawal from the reserve.
+ * IssueReceiptsal from the reserve.
*/
TALER_DONAU_RTT_WITHDRAWAL,
/**
- * Age-Withdrawal from the reserve.
+ * Age-IssueReceiptsal from the reserve.
*/
TALER_DONAU_RTT_AGEWITHDRAWAL,
@@ -911,7 +903,7 @@ struct TALER_DONAU_ReserveHistoryEntry
} in_details;
/**
- * Information about withdraw operation.
+ * Information about issue_receipts operation.
* @e type is #TALER_DONAU_RTT_WITHDRAWAL.
*/
struct
@@ -928,7 +920,7 @@ struct TALER_DONAU_ReserveHistoryEntry
} withdraw;
/**
- * Information about withdraw operation.
+ * Information about issue_receipts operation.
* @e type is #TALER_DONAU_RTT_AGEWITHDRAWAL.
*/
struct
@@ -947,7 +939,7 @@ struct TALER_DONAU_ReserveHistoryEntry
* Fee that was charged for the withdrawal.
*/
struct TALER_Amount fee;
- } age_withdraw;
+ } age_issue_receipts;
/**
* Information provided if the reserve was filled via /recoup.
@@ -1493,24 +1485,24 @@ TALER_DONAU_reserves_history_cancel (
struct TALER_DONAU_ReservesHistoryHandle *rsh);
-/* ********************* POST /reserves/$RESERVE_PUB/withdraw *********************** */
+/* ********************* POST /reserves/$RESERVE_PUB/issue_receipts *********************** */
/**
- * @brief A /reserves/$RESERVE_PUB/withdraw Handle
+ * @brief A /reserves/$RESERVE_PUB/issue_receipts Handle
*/
-struct TALER_DONAU_WithdrawHandle;
+struct TALER_DONAU_IssueReceiptsHandle;
/**
- * Information input into the withdraw process per coin.
+ * Information input into the issue_receipts process per coin.
*/
-struct TALER_DONAU_WithdrawCoinInput
+struct TALER_DONAU_IssueReceiptsCoinInput
{
/**
- * BDR of the coin.
+ *donation unit of the coin.
*/
- const struct TALER_DONAU_BDRPublicKey *pk;
+ const struct TALER_DONAU_DonationUnitPublicKey *pk;
/**
* Master key material for the coin.
@@ -1540,25 +1532,25 @@ struct TALER_DONAU_PrivateCoinDetails
* Value used to blind the key for the signature.
* Needed for recoup operations.
*/
- union TALER_BDRBlindingKeyP bks;
+ union TALER_DonationUnitBlindingKeyP bks;
/**
* Signature over the coin.
*/
- struct TALER_BDRSignature sig;
+ struct TALER_DonationUnitSignature sig;
/**
* Values contributed from the donau during the
- * withdraw protocol.
+ * issue_receipts protocol.
*/
- struct TALER_DonauWithdrawValues donau_vals;
+ struct TALER_DonauIssueReceiptsValues donau_vals;
};
/**
- * Details about a response for a withdraw request.
+ * Details about a response for a issue_receipts request.
*/
-struct TALER_DONAU_WithdrawResponse
+struct TALER_DONAU_IssueReceiptsResponse
{
/**
* HTTP response data.
@@ -1615,20 +1607,20 @@ struct TALER_DONAU_WithdrawResponse
/**
* Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a donau.
+ * issue_receipts request to a donau.
*
* @param cls closure
* @param wr response details
*/
typedef void
-(*TALER_DONAU_WithdrawCallback) (
+(*TALER_DONAU_IssueReceiptsCallback) (
void *cls,
- const struct TALER_DONAU_WithdrawResponse *wr);
+ const struct TALER_DONAU_IssueReceiptsResponse *wr);
/**
- * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/withdraw
- * request. This API is typically used by a wallet to withdraw from a
+ * IssueReceipts a coin from the donau using a /reserves/$RESERVE_PUB/issueReceipts
+ * request. This API is typically used by a wallet to issue_receipts from a
* reserve.
*
* Note that to ensure that no money is lost in case of hardware
@@ -1639,45 +1631,45 @@ typedef void
* @param curl_ctx The curl context to use
* @param donau_url The base-URL of the donau
* @param keys The /keys material from the donau
- * @param reserve_priv private key of the reserve to withdraw from
+ * @param reserve_priv private key of the reserve to issue_receipts from
* @param wci inputs that determine the planchet
* @param res_cb the callback to call when the final result for this request is available
* @param res_cb_cls closure for @a res_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
-struct TALER_DONAU_WithdrawHandle *
-TALER_DONAU_withdraw (
+struct TALER_DONAU_IssueReceiptsHandle *
+TALER_DONAU_issue_receipts (
struct GNUNET_CURL_Context *curl_ctx,
const char *donau_url,
struct TALER_DONAU_Keys *keys,
const struct TALER_ReservePrivateKeyP *reserve_priv,
- const struct TALER_DONAU_WithdrawCoinInput *wci,
- TALER_DONAU_WithdrawCallback res_cb,
+ const struct TALER_DONAU_IssueReceiptsCoinInput *wci,
+ TALER_DONAU_IssueReceiptsCallback res_cb,
void *res_cb_cls);
/**
- * Cancel a withdraw status request. This function cannot be used
+ * Cancel a issue_receipts status request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param wh the withdraw handle
+ * @param wh the issue_receipts handle
*/
void
-TALER_DONAU_withdraw_cancel (struct TALER_DONAU_WithdrawHandle *wh);
+TALER_DONAU_issue_receipts_cancel (struct TALER_DONAU_IssueReceiptsHandle *wh);
/**
- * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle
+ * @brief A /reserves/$RESERVE_PUB/batch-issue_receipts Handle
*/
-struct TALER_DONAU_BatchWithdrawHandle;
+struct TALER_DONAU_BatchIssueReceiptsHandle;
/**
- * Details about a response for a batch withdraw request.
+ * Details about a response for a batch issue_receipts request.
*/
-struct TALER_DONAU_BatchWithdrawResponse
+struct TALER_DONAU_BatchIssueReceiptsResponse
{
/**
* HTTP response data.
@@ -1696,7 +1688,7 @@ struct TALER_DONAU_BatchWithdrawResponse
{
/**
- * Array of coins returned by the batch withdraw operation.
+ * Array of coins returned by the batch issue_receipts operation.
*/
struct TALER_DONAU_PrivateCoinDetails *coins;
@@ -1746,20 +1738,20 @@ struct TALER_DONAU_BatchWithdrawResponse
/**
* Callbacks of this type are used to serve the result of submitting a
- * batch withdraw request to a donau.
+ * batch issue_receipts request to a donau.
*
* @param cls closure
* @param wr response details
*/
typedef void
-(*TALER_DONAU_BatchWithdrawCallback) (
+(*TALER_DONAU_BatchIssueReceiptsCallback) (
void *cls,
- const struct TALER_DONAU_BatchWithdrawResponse *wr);
+ const struct TALER_DONAU_BatchIssueReceiptsResponse *wr);
/**
- * Withdraw multiple coins from the donau using a /reserves/$RESERVE_PUB/batch-withdraw
- * request. This API is typically used by a wallet to withdraw many coins from a
+ * IssueReceipts multiple coins from the donau using a /reserves/$RESERVE_PUB/batch-withdraw
+ * request. This API is typically used by a wallet to issue_receipts many coins from a
* reserve.
*
* Note that to ensure that no money is lost in case of hardware
@@ -1770,42 +1762,42 @@ typedef void
* @param curl_ctx The curl context to use
* @param donau_url The base-URL of the donau
* @param keys The /keys material from the donau
- * @param reserve_priv private key of the reserve to withdraw from
+ * @param reserve_priv private key of the reserve to issue_receipts from
* @param wci_length number of entries in @a wcis
* @param wcis inputs that determine the planchets
* @param res_cb the callback to call when the final result for this request is available
* @param res_cb_cls closure for @a res_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
-struct TALER_DONAU_BatchWithdrawHandle *
-TALER_DONAU_batch_withdraw (
+struct TALER_DONAU_BatchIssueReceiptsHandle *
+TALER_DONAU_batch_issue_receipts (
struct GNUNET_CURL_Context *curl_ctx,
const char *donau_url,
const struct TALER_DONAU_Keys *keys,
const struct TALER_ReservePrivateKeyP *reserve_priv,
unsigned int wci_length,
- const struct TALER_DONAU_WithdrawCoinInput wcis[static wci_length],
- TALER_DONAU_BatchWithdrawCallback res_cb,
+ const struct TALER_DONAU_IssueReceiptsCoinInput wcis[static wci_length],
+ TALER_DONAU_BatchIssueReceiptsCallback res_cb,
void *res_cb_cls);
/**
- * Cancel a batch withdraw status request. This function cannot be used on a
+ * Cancel a batch issue_receipts status request. This function cannot be used on a
* request handle if a response is already served for it.
*
- * @param wh the batch withdraw handle
+ * @param wh the batch issue_receipts handle
*/
void
-TALER_DONAU_batch_withdraw_cancel (
- struct TALER_DONAU_BatchWithdrawHandle *wh);
+TALER_DONAU_batch_issue_receipts_cancel (
+ struct TALER_DONAU_BatchIssueReceiptsHandle *wh);
/**
* Response from a withdraw2 request.
*/
-struct TALER_DONAU_Withdraw2Response
+struct TALER_DONAU_IssueReceipts2Response
{
/**
* HTTP response data
@@ -1825,7 +1817,7 @@ struct TALER_DONAU_Withdraw2Response
/**
* blind signature over the coin
*/
- struct TALER_BlindedBDRSignature blind_sig;
+ struct TALER_BlindedDonationUnitSignature blind_sig;
} ok;
} details;
@@ -1833,30 +1825,30 @@ struct TALER_DONAU_Withdraw2Response
/**
* Callbacks of this type are used to serve the result of submitting a
- * withdraw request to a donau without the (un)blinding factor.
+ * issue_receipts request to a donau without the (un)blinding factor.
*
* @param cls closure
* @param w2r response data
*/
typedef void
-(*TALER_DONAU_Withdraw2Callback) (
+(*TALER_DONAU_IssueReceipts2Callback) (
void *cls,
- const struct TALER_DONAU_Withdraw2Response *w2r);
+ const struct TALER_DONAU_IssueReceipts2Response *w2r);
/**
- * @brief A /reserves/$RESERVE_PUB/withdraw Handle, 2nd variant.
+ * @brief A /reserves/$RESERVE_PUB/issue_receipts Handle, 2nd variant.
* This variant does not do the blinding/unblinding and only
* fetches the blind signature on the already blinded planchet.
- * Used internally by the `struct TALER_DONAU_WithdrawHandle`
+ * Used internally by the `struct TALER_DONAU_IssueReceiptsHandle`
* implementation as well as for the tipping logic of charities.
*/
-struct TALER_DONAU_Withdraw2Handle;
+struct TALER_DONAU_IssueReceipts2Handle;
/**
- * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/withdraw
- * request. This API is typically used by a charity to withdraw a tip
+ * IssueReceipts a coin from the donau using a /reserves/$RESERVE_PUB/withdraw
+ * request. This API is typically used by a charity to issue_receipts a tip
* where the blinding factor is unknown to the charity.
*
* Note that to ensure that no money is lost in case of hardware
@@ -1868,38 +1860,38 @@ struct TALER_DONAU_Withdraw2Handle;
* @param donau_url The base-URL of the donau
* @param keys The /keys material from the donau
* @param pd planchet details of the planchet to withdraw
- * @param reserve_priv private key of the reserve to withdraw from
+ * @param reserve_priv private key of the reserve to issue_receipts from
* @param res_cb the callback to call when the final result for this request is available
* @param res_cb_cls closure for @a res_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
-struct TALER_DONAU_Withdraw2Handle *
-TALER_DONAU_withdraw2 (
+struct TALER_DONAU_IssueReceipts2Handle *
+TALER_DONAU_issue_receipts2 (
struct GNUNET_CURL_Context *curl_ctx,
const char *donau_url,
struct TALER_DONAU_Keys *keys,
const struct TALER_PlanchetDetail *pd,
const struct TALER_ReservePrivateKeyP *reserve_priv,
- TALER_DONAU_Withdraw2Callback res_cb,
+ TALER_DONAU_IssueReceipts2Callback res_cb,
void *res_cb_cls);
/**
- * Cancel a withdraw status request. This function cannot be used
+ * Cancel a issue_receipts status request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param wh the withdraw handle
+ * @param wh the issue_receipts handle
*/
void
-TALER_DONAU_withdraw2_cancel (struct TALER_DONAU_Withdraw2Handle *wh);
+TALER_DONAU_issue_receipts2_cancel (struct TALER_DONAU_IssueReceipts2Handle *wh);
/**
- * Response from a batch-withdraw request (2nd variant).
+ * Response from a batch-issue_receipts request (2nd variant).
*/
-struct TALER_DONAU_BatchWithdraw2Response
+struct TALER_DONAU_BatchIssueReceipts2Response
{
/**
* HTTP response data
@@ -1919,7 +1911,7 @@ struct TALER_DONAU_BatchWithdraw2Response
/**
* array of blind signatures over the coins.
*/
- const struct TALER_BlindedBDRSignature *blind_sigs;
+ const struct TALER_BlindedDonationUnitSignature *blind_sigs;
/**
* length of @e blind_sigs
@@ -1934,30 +1926,30 @@ struct TALER_DONAU_BatchWithdraw2Response
/**
* Callbacks of this type are used to serve the result of submitting a batch
- * withdraw request to a donau without the (un)blinding factor.
+ * issue_receipts request to a donau without the (un)blinding factor.
*
* @param cls closure
* @param bw2r response data
*/
typedef void
-(*TALER_DONAU_BatchWithdraw2Callback) (
+(*TALER_DONAU_BatchIssueReceipts2Callback) (
void *cls,
- const struct TALER_DONAU_BatchWithdraw2Response *bw2r);
+ const struct TALER_DONAU_BatchIssueReceipts2Response *bw2r);
/**
- * @brief A /reserves/$RESERVE_PUB/batch-withdraw Handle, 2nd variant.
+ * @brief A /reserves/$RESERVE_PUB/batch-issue_receipts Handle, 2nd variant.
* This variant does not do the blinding/unblinding and only
* fetches the blind signatures on the already blinded planchets.
- * Used internally by the `struct TALER_DONAU_BatchWithdrawHandle`
+ * Used internally by the `struct TALER_DONAU_BatchIssueReceiptsHandle`
* implementation as well as for the tipping logic of charities.
*/
-struct TALER_DONAU_BatchWithdraw2Handle;
+struct TALER_DONAU_BatchIssueReceipts2Handle;
/**
- * Withdraw a coin from the donau using a /reserves/$RESERVE_PUB/batch-withdraw
- * request. This API is typically used by a charity to withdraw a tip
+ * IssueReceipts a coin from the donau using a /reserves/$RESERVE_PUB/batch-withdraw
+ * request. This API is typically used by a charity to issue_receipts a tip
* where the blinding factor is unknown to the charity.
*
* Note that to ensure that no money is lost in case of hardware
@@ -1970,42 +1962,42 @@ struct TALER_DONAU_BatchWithdraw2Handle;
* @param keys The /keys material from the donau
* @param pds array of planchet details of the planchet to withdraw
* @param pds_length number of entries in the @a pds array
- * @param reserve_priv private key of the reserve to withdraw from
+ * @param reserve_priv private key of the reserve to issue_receipts from
* @param res_cb the callback to call when the final result for this request is available
* @param res_cb_cls closure for @a res_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
-struct TALER_DONAU_BatchWithdraw2Handle *
-TALER_DONAU_batch_withdraw2 (
+struct TALER_DONAU_BatchIssueReceipts2Handle *
+TALER_DONAU_batch_issue_receipts2 (
struct GNUNET_CURL_Context *curl_ctx,
const char *donau_url,
const struct TALER_DONAU_Keys *keys,
const struct TALER_ReservePrivateKeyP *reserve_priv,
unsigned int pds_length,
const struct TALER_PlanchetDetail pds[static pds_length],
- TALER_DONAU_BatchWithdraw2Callback res_cb,
+ TALER_DONAU_BatchIssueReceipts2Callback res_cb,
void *res_cb_cls);
/**
- * Cancel a batch withdraw request. This function cannot be used
+ * Cancel a batch issue_receipts request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param wh the withdraw handle
+ * @param wh the issue_receipts handle
*/
void
-TALER_DONAU_batch_withdraw2_cancel (
- struct TALER_DONAU_BatchWithdraw2Handle *wh);
+TALER_DONAU_batch_issue_receipts2_cancel (
+ struct TALER_DONAU_BatchIssueReceipts2Handle *wh);
-/* ********************* /reserve/$RESERVE_PUB/age-withdraw *************** */
+/* ********************* /reserve/$RESERVE_PUB/age-issue_receipts *************** */
/**
- * @brief Information needed to withdraw (and reveal) age restricted coins.
+ * @brief Information needed to issue_receipts (and reveal) age restricted coins.
*/
-struct TALER_DONAU_AgeWithdrawCoinInput
+struct TALER_DONAU_AgeIssueReceiptsCoinInput
{
/**
* The master secret from which we derive all other relevant values for
@@ -2014,10 +2006,10 @@ struct TALER_DONAU_AgeWithdrawCoinInput
struct TALER_PlanchetMasterSecretP secrets[TALER_CNC_KAPPA];
/**
- * The BDR of the coin. Must support age restriction, i.e
+ * Thedonation unit of the coin. Must support age restriction, i.e
* its .keys.age_mask MUST not be 0
*/
- struct TALER_DONAU_BDRPublicKey *BDR_pub;
+ struct TALER_DONAU_DonationUnitPublicKey *donation_unit_pub;
};
@@ -2025,7 +2017,7 @@ struct TALER_DONAU_AgeWithdrawCoinInput
* All the details about a coin that are generated during age-withdrawal and
* that may be needed for future operations on the coin.
*/
-struct TALER_DONAU_AgeWithdrawCoinPrivateDetails
+struct TALER_DONAU_AgeIssueReceiptsCoinPrivateDetails
{
/**
* Private key of the coin.
@@ -2041,7 +2033,7 @@ struct TALER_DONAU_AgeWithdrawCoinPrivateDetails
* Value used to blind the key for the signature.
* Needed for recoup operations.
*/
- union TALER_BDRBlindingKeyP blinding_key;
+ union TALER_DonationUnitBlindingKeyP blinding_key;
/**
* The age commitment, proof for the coin, derived from the
@@ -2056,9 +2048,9 @@ struct TALER_DONAU_AgeWithdrawCoinPrivateDetails
/**
* Values contributed from the donau during the
- * withdraw protocol.
+ * issue_receipts protocol.
*/
- struct TALER_DonauWithdrawValues alg_values;
+ struct TALER_DonauIssueReceiptsValues alg_values;
/**
* The planchet constructed
@@ -2067,14 +2059,14 @@ struct TALER_DONAU_AgeWithdrawCoinPrivateDetails
};
/**
- * @brief A handle to a /reserves/$RESERVE_PUB/age-withdraw request
+ * @brief A handle to a /reserves/$RESERVE_PUB/age-issue_receipts request
*/
-struct TALER_DONAU_AgeWithdrawHandle;
+struct TALER_DONAU_AgeIssueReceiptsHandle;
/**
- * @brief Details about the response for a age withdraw request.
+ * @brief Details about the response for a age issue_receipts request.
*/
-struct TALER_DONAU_AgeWithdrawResponse
+struct TALER_DONAU_AgeIssueReceiptsResponse
{
/**
* HTTP response data.
@@ -2092,16 +2084,16 @@ struct TALER_DONAU_AgeWithdrawResponse
struct
{
/**
- * Index that should not be revealed during the age-withdraw reveal
+ * Index that should not be revealed during the age-issue_receipts reveal
* phase.
*/
uint8_t noreveal_index;
/**
- * The commitment of the age-withdraw request, needed for the
+ * The commitment of the age-issue_receipts request, needed for the
* subsequent call to /age-withdraw/$ACH/reveal
*/
- struct TALER_AgeWithdrawCommitmentHashP h_commitment;
+ struct TALER_AgeIssueReceiptsCommitmentHashP h_commitment;
/**
* The number of elements in @e coins, each referring to
@@ -2112,7 +2104,7 @@ struct TALER_DONAU_AgeWithdrawResponse
/**
* The computed details of the non-revealed @e num_coins coins to keep.
*/
- const struct TALER_DONAU_AgeWithdrawCoinPrivateDetails *coin_details;
+ const struct TALER_DONAU_AgeIssueReceiptsCoinPrivateDetails *coin_details;
/**
* The array of blinded hashes of the non-revealed
@@ -2129,12 +2121,12 @@ struct TALER_DONAU_AgeWithdrawResponse
};
typedef void
-(*TALER_DONAU_AgeWithdrawCallback)(
+(*TALER_DONAU_AgeIssueReceiptsCallback)(
void *cls,
- const struct TALER_DONAU_AgeWithdrawResponse *awr);
+ const struct TALER_DONAU_AgeIssueReceiptsResponse *awr);
/**
- * Submit an age-withdraw request to the donau and get the donau's
+ * Submit an age-issue_receipts request to the donau and get the donau's
* response.
*
* This API is typically used by a wallet. Note that to ensure that
@@ -2144,7 +2136,7 @@ typedef void
*
* @param curl_ctx The curl context
* @param donau_url The base url of the donau
- * @param keys The BDR keys from the donau
+ * @param keys Thedonation unit keys from the donau
* @param reserve_priv The pivate key to the reserve
* @param num_coins The number of elements in @e coin_inputs
* @param coin_inputs The input for the coins to withdraw
@@ -2154,28 +2146,28 @@ typedef void
* @return a handle for this request; NULL if the argument was invalid.
* In this case, the callback will not be called.
*/
-struct TALER_DONAU_AgeWithdrawHandle *
-TALER_DONAU_age_withdraw (
+struct TALER_DONAU_AgeIssueReceiptsHandle *
+TALER_DONAU_age_issue_receipts (
struct GNUNET_CURL_Context *curl_ctx,
struct TALER_DONAU_Keys *keys,
const char *donau_url,
const struct TALER_ReservePrivateKeyP *reserve_priv,
size_t num_coins,
- const struct TALER_DONAU_AgeWithdrawCoinInput coin_inputs[static
+ const struct TALER_DONAU_AgeIssueReceiptsCoinInput coin_inputs[static
num_coins],
uint8_t max_age,
- TALER_DONAU_AgeWithdrawCallback res_cb,
+ TALER_DONAU_AgeIssueReceiptsCallback res_cb,
void *res_cb_cls);
/**
- * Cancel a age-withdraw request. This function cannot be used
+ * Cancel a age-issue_receipts request. This function cannot be used
* on a request handle if a response is already served for it.
*
- * @param awh the age-withdraw handle
+ * @param awh the age-issue_receipts handle
*/
void
-TALER_DONAU_age_withdraw_cancel (
- struct TALER_DONAU_AgeWithdrawHandle *awh);
+TALER_DONAU_age_issue_receipts_cancel (
+ struct TALER_DONAU_AgeIssueReceiptsHandle *awh);
/* ********************* /refreshes/$RCH/reveal ***************************** */
@@ -2205,12 +2197,12 @@ struct TALER_DONAU_RevealedCoinInfo
/**
* Blinding keys used to blind the fresh coin.
*/
- union TALER_BDRBlindingKeyP bks;
+ union TALER_DonationUnitBlindingKeyP bks;
/**
* Signature affirming the validity of the coin.
*/
- struct TALER_BDRSignature sig;
+ struct TALER_DonationUnitSignature sig;
};
@@ -2240,7 +2232,7 @@ struct TALER_DONAU_RevealResult
* Array of @e num_coins values about the coins obtained via the refresh
* operation. The array give the coins in the same order (and should
* have the same length) in which the original melt request specified the
- * respective BDR keys.
+ * respectivedonation unit keys.
*/
const struct TALER_DONAU_RevealedCoinInfo *coins;
@@ -2306,7 +2298,7 @@ TALER_DONAU_refreshes_reveal (
const struct TALER_RefreshMasterSecretP *rms,
const struct TALER_DONAU_RefreshData *rd,
unsigned int num_coins,
- const struct TALER_DonauWithdrawValues alg_values[static num_coins],
+ const struct TALER_DonauIssueReceiptsValues alg_values[static num_coins],
uint32_t noreveal_index,
TALER_DONAU_RefreshesRevealCallback reveal_cb,
void *reveal_cb_cls);
@@ -2357,12 +2349,12 @@ struct TALER_DONAU_LinkedCoinInfo
/**
* Signature affirming the validity of the coin.
*/
- struct TALER_BDRSignature sig;
+ struct TALER_DonationUnitSignature sig;
/**
- * BDR public key of the coin.
+ *donation unit public key of the coin.
*/
- struct TALER_BDRPublicKey pub;
+ struct TALER_DonationUnitPublicKey pub;
};
@@ -2746,7 +2738,7 @@ TALER_DONAU_deposits_get_cancel (
*/
enum GNUNET_GenericReturnValue
TALER_DONAU_verify_coin_history (
- const struct TALER_DONAU_BDRPublicKey *dk,
+ const struct TALER_DONAU_DonationUnitPublicKey *dk,
const struct TALER_CoinSpendPublicKeyP *coin_pub,
const json_t *history,
struct TALER_Amount *total);
@@ -2850,20 +2842,20 @@ typedef void
/**
* Ask the donau to pay back a coin due to the donau triggering
- * the emergency recoup protocol for a given BDR. The value
+ * the emergency recoup protocol for a givendonation unit. The value
* of the coin will be refunded to the original donor (without fees).
*
* @param ctx curl context
* @param url donau base URL
* @param keys donau keys
* @param pk kind of coin to pay back
- * @param BDR_sig signature over the coin by the donau using @a pk
+ * @param donation_unit_sig signature over the coin by the donau using @a pk
* @param donau_vals contribution from the donau on the withdraw
* @param ps secret internals of the original planchet
* @param recoup_cb the callback to call when the final result for this request is available
* @param recoup_cb_cls closure for @a recoup_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
struct TALER_DONAU_RecoupHandle *
@@ -2871,9 +2863,9 @@ TALER_DONAU_recoup (
struct GNUNET_CURL_Context *ctx,
const char *url,
struct TALER_DONAU_Keys *keys,
- const struct TALER_DONAU_BDRPublicKey *pk,
- const struct TALER_BDRSignature *BDR_sig,
- const struct TALER_DonauWithdrawValues *donau_vals,
+ const struct TALER_DONAU_DonationUnitPublicKey *pk,
+ const struct TALER_DonationUnitSignature *donation_unit_sig,
+ const struct TALER_DonauIssueReceiptsValues *donau_vals,
const struct TALER_PlanchetMasterSecretP *ps,
TALER_DONAU_RecoupResultCallback recoup_cb,
void *recoup_cb_cls);
@@ -2944,7 +2936,7 @@ typedef void
/**
* Ask the donau to pay back a coin due to the donau triggering
- * the emergency recoup protocol for a given BDR. The value
+ * the emergency recoup protocol for a givendonation unit. The value
* of the coin will be refunded to the original coin that the
* revoked coin was refreshed from. The original coin is then
* considered a zombie.
@@ -2953,7 +2945,7 @@ typedef void
* @param url donau base URL
* @param keys donau keys
* @param pk kind of coin to pay back
- * @param BDR_sig signature over the coin by the donau using @a pk
+ * @param donation_unit_sig signature over the coin by the donau using @a pk
* @param donau_vals contribution from the donau on the withdraw
* @param rms melt secret of the refreshing operation
* @param ps coin-specific secrets derived for this coin during the refreshing operation
@@ -2961,7 +2953,7 @@ typedef void
* @param recoup_cb the callback to call when the final result for this request is available
* @param recoup_cb_cls closure for @a recoup_cb
* @return NULL
- * if the inputs are invalid (i.e. BDR key not with this donau).
+ * if the inputs are invalid (i.e.donation unit key not with this donau).
* In this case, the callback is not called.
*/
struct TALER_DONAU_RecoupRefreshHandle *
@@ -2969,9 +2961,9 @@ TALER_DONAU_recoup_refresh (
struct GNUNET_CURL_Context *ctx,
const char *url,
struct TALER_DONAU_Keys *keys,
- const struct TALER_DONAU_BDRPublicKey *pk,
- const struct TALER_BDRSignature *BDR_sig,
- const struct TALER_DonauWithdrawValues *donau_vals,
+ const struct TALER_DONAU_DonationUnitPublicKey *pk,
+ const struct TALER_DonationUnitSignature *donation_unit_sig,
+ const struct TALER_DonauIssueReceiptsValues *donau_vals,
const struct TALER_RefreshMasterSecretP *rms,
const struct TALER_PlanchetMasterSecretP *ps,
unsigned int idx,
@@ -3027,38 +3019,38 @@ struct TALER_DONAU_FutureSigningPublicKey
/**
- * @brief Public information about a future donau's BDR key
+ * @brief Public information about a future donau'sdonation unit key
*/
-struct TALER_DONAU_FutureBDRPublicKey
+struct TALER_DONAU_FutureDonationUnitPublicKey
{
/**
* The public key
*/
- struct TALER_BDRPublicKey key;
+ struct TALER_DonationUnitPublicKey key;
/**
* Signature by the security module affirming it owns this key.
*/
- struct TALER_SecurityModuleSignatureP BDR_secmod_sig;
+ struct TALER_SecurityModuleSignatureP donation_unit_secmod_sig;
/**
- * Timestamp indicating when the BDR key becomes valid
+ * Timestamp indicating when thedonation unit key becomes valid
*/
struct GNUNET_TIME_Timestamp valid_from;
/**
- * Timestamp indicating when the BDR key can’t be used anymore to
- * withdraw new coins.
+ * Timestamp indicating when thedonation unit key can’t be used anymore to
+ * issue_receipts new coins.
*/
- struct GNUNET_TIME_Timestamp withdraw_valid_until;
+ struct GNUNET_TIME_Timestamp issue_receipts_valid_until;
/**
- * Timestamp indicating when coins of this BDR become invalid.
+ * Timestamp indicating when coins of thisdonation unit become invalid.
*/
struct GNUNET_TIME_Timestamp expire_deposit;
/**
- * When do signatures with this BDR key become invalid?
+ * When do signatures with thisdonation unit key become invalid?
* After this point, these signatures cannot be used in (legal)
* disputes anymore, as the Donau is then allowed to destroy its side
* of the evidence. @e expire_legal is expected to be significantly
@@ -3067,27 +3059,27 @@ struct TALER_DONAU_FutureBDRPublicKey
struct GNUNET_TIME_Timestamp expire_legal;
/**
- * The value of this BDR
+ * The value of thisdonation unit
*/
struct TALER_Amount value;
/**
- * The applicable fee for withdrawing a coin of this BDR
+ * The applicable fee for withdrawing a coin of thisdonation unit
*/
- struct TALER_Amount fee_withdraw;
+ struct TALER_Amount fee_issue_receipts;
/**
- * The applicable fee to spend a coin of this BDR
+ * The applicable fee to spend a coin of thisdonation unit
*/
struct TALER_Amount fee_deposit;
/**
- * The applicable fee to melt/refresh a coin of this BDR
+ * The applicable fee to melt/refresh a coin of thisdonation unit
*/
struct TALER_Amount fee_refresh;
/**
- * The applicable fee to refund a coin of this BDR
+ * The applicable fee to refund a coin of thisdonation unit
*/
struct TALER_Amount fee_refund;
@@ -3106,9 +3098,9 @@ struct TALER_DONAU_FutureKeys
struct TALER_DONAU_FutureSigningPublicKey *sign_keys;
/**
- * Array of the donau's BDR keys.
+ * Array of the donau'sdonation unit keys.
*/
- struct TALER_DONAU_FutureBDRPublicKey *BDR_keys;
+ struct TALER_DONAU_FutureDonationUnitPublicKey *donation_unit_keys;
/**
* Public key of the signkey security module.
@@ -3116,14 +3108,14 @@ struct TALER_DONAU_FutureKeys
struct TALER_SecurityModulePublicKeyP signkey_secmod_public_key;
/**
- * Public key of the RSA BDR security module.
+ * Public key of the RSAdonation unit security module.
*/
- struct TALER_SecurityModulePublicKeyP BDR_secmod_public_key;
+ struct TALER_SecurityModulePublicKeyP donation_unit_secmod_public_key;
/**
- * Public key of the CS BDR security module.
+ * Public key of the CSdonation unit security module.
*/
- struct TALER_SecurityModulePublicKeyP BDR_secmod_cs_public_key;
+ struct TALER_SecurityModulePublicKeyP donation_unit_secmod_cs_public_key;
/**
* Offline master public key used by this donau.
@@ -3136,9 +3128,9 @@ struct TALER_DONAU_FutureKeys
unsigned int num_sign_keys;
/**
- * Length of the @e BDR_keys array.
+ * Length of the @e donation_unit_keys array.
*/
- unsigned int num_BDR_keys;
+ unsigned int num_donation_unit_keys;
};
@@ -3241,17 +3233,17 @@ struct TALER_DONAU_SigningKeySignature
/**
- * @brief Public information about a signature on an donau's BDR key
+ * @brief Public information about a signature on an donau'sdonation unit key
*/
-struct TALER_DONAU_BDRKeySignature
+struct TALER_DONAU_DonationUnitKeySignature
{
/**
- * The hash of the BDR's public key
+ * The hash of thedonation unit's public key
*/
- struct TALER_BDRHashP h_BDR_pub;
+ struct TALER_DonationUnitHashP h_donation_unit_pub;
/**
- * Signature over this BDR key by the donau's master signature.
+ * Signature over thisdonation unit key by the donau's master signature.
* Of purpose #TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY.
*/
struct TALER_MasterSignatureP master_sig;
@@ -3271,9 +3263,9 @@ struct TALER_DONAU_ManagementPostKeysData
struct TALER_DONAU_SigningKeySignature *sign_sigs;
/**
- * Array of the master signatures for the donau's BDR keys.
+ * Array of the master signatures for the donau'sdonation unit keys.
*/
- struct TALER_DONAU_BDRKeySignature *BDR_sigs;
+ struct TALER_DONAU_DonationUnitKeySignature *donation_unit_sigs;
/**
* Length of the @e sign_keys array (number of valid entries).
@@ -3281,9 +3273,9 @@ struct TALER_DONAU_ManagementPostKeysData
unsigned int num_sign_sigs;
/**
- * Length of the @e BDR_keys array.
+ * Length of the @e donation_unit_keys array.
*/
- unsigned int num_BDR_sigs;
+ unsigned int num_donation_unit_sigs;
};
@@ -3491,9 +3483,9 @@ TALER_DONAU_management_drain_profits_cancel (
/**
- * Response from a POST /management/BDRs/$DENOM/revoke request.
+ * Response from a POST /management/DonationUnits/$DENOM/revoke request.
*/
-struct TALER_DONAU_ManagementRevokeBDRResponse
+struct TALER_DONAU_ManagementRevokeDonationUnitResponse
{
/**
* HTTP response data
@@ -3510,46 +3502,46 @@ struct TALER_DONAU_ManagementRevokeBDRResponse
* @param hr HTTP response data
*/
typedef void
-(*TALER_DONAU_ManagementRevokeBDRKeyCallback) (
+(*TALER_DONAU_ManagementRevokeDonationUnitKeyCallback) (
void *cls,
- const struct TALER_DONAU_ManagementRevokeBDRResponse *hr);
+ const struct TALER_DONAU_ManagementRevokeDonationUnitResponse *hr);
/**
- * @brief Handle for a POST /management/BDRs/$H_DENOM_PUB/revoke request.
+ * @brief Handle for a POST /management/DonationUnits/$H_DENOM_PUB/revoke request.
*/
-struct TALER_DONAU_ManagementRevokeBDRKeyHandle;
+struct TALER_DONAU_ManagementRevokeDonationUnitKeyHandle;
/**
- * Inform the donau that a BDR key was revoked.
+ * Inform the donau that adonation unit key was revoked.
*
* @param ctx the context
* @param url HTTP base URL for the donau
- * @param h_BDR_pub hash of the BDR public key that was revoked
+ * @param h_donation_unit_pub hash of thedonation unit public key that was revoked
* @param master_sig signature affirming the revocation
* @param cb function to call with the donau's result
* @param cb_cls closure for @a cb
* @return the request handle; NULL upon error
*/
-struct TALER_DONAU_ManagementRevokeBDRKeyHandle *
-TALER_DONAU_management_revoke_BDR_key (
+struct TALER_DONAU_ManagementRevokeDonationUnitKeyHandle *
+TALER_DONAU_management_revoke_donation_unit_key (
struct GNUNET_CURL_Context *ctx,
const char *url,
- const struct TALER_BDRHashP *h_BDR_pub,
+ const struct TALER_DonationUnitHashP *h_donation_unit_pub,
const struct TALER_MasterSignatureP *master_sig,
- TALER_DONAU_ManagementRevokeBDRKeyCallback cb,
+ TALER_DONAU_ManagementRevokeDonationUnitKeyCallback cb,
void *cb_cls);
/**
- * Cancel #TALER_DONAU_management_revoke_BDR_key() operation.
+ * Cancel #TALER_DONAU_management_revoke_donation_unit_key() operation.
*
* @param rh handle of the operation to cancel
*/
void
-TALER_DONAU_management_revoke_BDR_key_cancel (
- struct TALER_DONAU_ManagementRevokeBDRKeyHandle *rh);
+TALER_DONAU_management_revoke_donation_unit_key_cancel (
+ struct TALER_DONAU_ManagementRevokeDonationUnitKeyHandle *rh);
/**
@@ -4505,9 +4497,9 @@ TALER_DONAU_management_set_global_fees_cancel (
/**
- * Response when adding BDR signature by auditor.
+ * Response when addingdonation unit signature by auditor.
*/
-struct TALER_DONAU_AuditorAddBDRResponse
+struct TALER_DONAU_AuditorAddDonationUnitResponse
{
/**
* HTTP response data.
@@ -4524,23 +4516,23 @@ struct TALER_DONAU_AuditorAddBDRResponse
* @param adr HTTP response data
*/
typedef void
-(*TALER_DONAU_AuditorAddBDRCallback) (
+(*TALER_DONAU_AuditorAddDonationUnitCallback) (
void *cls,
- const struct TALER_DONAU_AuditorAddBDRResponse *adr);
+ const struct TALER_DONAU_AuditorAddDonationUnitResponse *adr);
/**
* @brief Handle for a POST /auditor/$AUDITOR_PUB/$H_DENOM_PUB request.
*/
-struct TALER_DONAU_AuditorAddBDRHandle;
+struct TALER_DONAU_AuditorAddDonationUnitHandle;
/**
- * Provide auditor signatures for a BDR to the donau.
+ * Provide auditor signatures for adonation unit to the donau.
*
* @param ctx the context
* @param url HTTP base URL for the donau
- * @param h_BDR_pub hash of the public key of the BDR
+ * @param h_donation_unit_pub hash of the public key of thedonation unit
* @param auditor_pub public key of the auditor
* @param auditor_sig signature of the auditor, of
* purpose #TALER_SIGNATURE_AUDITOR_DONAU_KEYS
@@ -4548,25 +4540,25 @@ struct TALER_DONAU_AuditorAddBDRHandle;
* @param cb_cls closure for @a cb
* @return the request handle; NULL upon error
*/
-struct TALER_DONAU_AuditorAddBDRHandle *
-TALER_DONAU_add_auditor_BDR (
+struct TALER_DONAU_AuditorAddDonationUnitHandle *
+TALER_DONAU_add_auditor_DonationUnit (
struct GNUNET_CURL_Context *ctx,
const char *url,
- const struct TALER_BDRHashP *h_BDR_pub,
+ const struct TALER_DonationUnitHashP *h_donation_unit_pub,
const struct TALER_AuditorPublicKeyP *auditor_pub,
const struct TALER_AuditorSignatureP *auditor_sig,
- TALER_DONAU_AuditorAddBDRCallback cb,
+ TALER_DONAU_AuditorAddDonationUnitCallback cb,
void *cb_cls);
/**
- * Cancel #TALER_DONAU_add_auditor_BDR() operation.
+ * Cancel #TALER_DONAU_add_auditor_DonationUnit() operation.
*
* @param ah handle of the operation to cancel
*/
void
-TALER_DONAU_add_auditor_BDR_cancel (
- struct TALER_DONAU_AuditorAddBDRHandle *ah);
+TALER_DONAU_add_auditor_donation_unit_cancel (
+ struct TALER_DONAU_AuditorAddDonationUnitHandle *ah);
/* ********************* W2W API ****************** */
@@ -4843,12 +4835,12 @@ struct TALER_DONAU_PurseDeposit
/**
* Signature proving the validity of the coin.
*/
- struct TALER_BDRSignature BDR_sig;
+ struct TALER_DonationUnitSignature donation_unit_sig;
/**
- * Hash of the BDR's public key.
+ * Hash of thedonation unit's public key.
*/
- struct TALER_BDRHashP h_BDR_pub;
+ struct TALER_DonationUnitHashP h_donation_unit_pub;
/**
* Amount of the coin to transfer into the purse.
