[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] 03/03: add TALER_EXCHANGE_refund2, make su
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-exchange] 03/03: add TALER_EXCHANGE_refund2, make sure fee test initializes all amounts; update ChangeLog |
|
Date: |
Tue, 02 Jan 2018 00:07:49 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit ff0d4bb6eb99d446a891b97b9fa48027b3b553b2
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 1 23:26:34 2018 +0100
add TALER_EXCHANGE_refund2, make sure fee test initializes all amounts;
update ChangeLog
---
ChangeLog | 10 +++++
src/exchange-lib/exchange_api_refund.c | 73 ++++++++++++++++++++++++++++++----
src/exchangedb/test_exchangedb_fees.c | 6 +++
src/include/taler_exchange_service.h | 44 ++++++++++++++++++++
4 files changed, 125 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2948a76..2c18ef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Mon Jan 1 23:15:37 CET 2018
+ Add TALER_EXCHANGE_refund2() API call to libtalerexchange. -CG
+
+Tue Dec 14 23:15:37 CET 2018
+ Eliminated /admin/add/incoming.
+ Add taler-bank-transfer tool. -CG
+
+Sun Dec 10 19:03:11 CET 2018
+ Implement support for optimized refresh protocol. -CG
+
Thu Nov 2 17:39:40 CET 2017
Limit amount values to 2^53 as we always wanted (#5167). -CG
diff --git a/src/exchange-lib/exchange_api_refund.c
b/src/exchange-lib/exchange_api_refund.c
index a39dd23..ef1d66b 100644
--- a/src/exchange-lib/exchange_api_refund.c
+++ b/src/exchange-lib/exchange_api_refund.c
@@ -243,12 +243,8 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle
*exchange,
TALER_EXCHANGE_RefundResultCallback cb,
void *cb_cls)
{
- struct TALER_EXCHANGE_RefundHandle *rh;
- struct GNUNET_CURL_Context *ctx;
struct TALER_RefundRequestPS rr;
struct TALER_MerchantSignatureP merchant_sig;
- json_t *refund_obj;
- CURL *eh;
GNUNET_assert (GNUNET_YES ==
MAH_handle_is_ready (exchange));
@@ -267,7 +263,68 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle
*exchange,
GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv,
&rr.purpose,
&merchant_sig.eddsa_sig));
- refund_obj = json_pack ("{s:o, s:o," /* amount/fee */
+ return TALER_EXCHANGE_refund2 (exchange,
+ amount,
+ refund_fee,
+ h_contract_terms,
+ coin_pub,
+ rtransaction_id,
+ &rr.merchant,
+ &merchant_sig,
+ cb,
+ cb_cls);
+}
+
+
+/**
+ * Submit a refund request to the exchange and get the exchange's
+ * response. This API is used by a merchant. Note that
+ * while we return the response verbatim to the caller for further
+ * processing, we do already verify that the response is well-formed
+ * (i.e. that signatures included in the response are all valid). If
+ * the exchange's reply is not well-formed, we return an HTTP status code
+ * of zero to @a cb.
+ *
+ * The @a exchange must be ready to operate (i.e. have
+ * finished processing the /keys reply). If this check fails, we do
+ * NOT initiate the transaction with the exchange and instead return NULL.
+ *
+ * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param amount the amount to be refunded; must be larger than the refund fee
+ * (as that fee is still being subtracted), and smaller than the amount
+ * (with deposit fee) of the original deposit contribution of this coin
+ * @param refund_fee fee applicable to this coin for the refund
+ * @param h_contract_terms hash of the contact of the merchant with the
customer that is being refunded
+ * @param coin_pub coin’s public key of the coin from the original deposit
operation
+ * @param rtransaction_id transaction id for the transaction between merchant
and customer (of refunding operation);
+ * this is needed as we may first do a partial refund
and later a full refund. If both
+ * refunds are also over the same amount, we need the
@a rtransaction_id to make the disjoint
+ * refund requests different (as requests are
idempotent and otherwise the 2nd refund might not work).
+ * @param merchant_pub public key of the merchant
+ * @param merchant_sig signature affirming the refund from the merchant
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ * signatures fail to verify). In this case, the callback is not
called.
+ */
+struct TALER_EXCHANGE_RefundHandle *
+TALER_EXCHANGE_refund2 (struct TALER_EXCHANGE_Handle *exchange,
+ const struct TALER_Amount *amount,
+ const struct TALER_Amount *refund_fee,
+ const struct GNUNET_HashCode *h_contract_terms,
+ const struct TALER_CoinSpendPublicKeyP *coin_pub,
+ uint64_t rtransaction_id,
+ const struct TALER_MerchantPublicKeyP *merchant_pub,
+ const struct TALER_MerchantSignatureP *merchant_sig,
+ TALER_EXCHANGE_RefundResultCallback cb,
+ void *cb_cls)
+{
+ struct TALER_EXCHANGE_RefundHandle *rh;
+ struct GNUNET_CURL_Context *ctx;
+ json_t *refund_obj;
+ CURL *eh;
+
+refund_obj = json_pack ("{s:o, s:o," /* amount/fee */
" s:o, s:o," /* h_contract_terms, coin_pub */
" s:I," /* rtransaction id */
" s:o, s:o}", /* merchant_pub, merchant_sig */
@@ -276,8 +333,8 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle
*exchange,
"h_contract_terms", GNUNET_JSON_from_data_auto
(h_contract_terms),
"coin_pub", GNUNET_JSON_from_data_auto (coin_pub),
"rtransaction_id", (json_int_t) rtransaction_id,
- "merchant_pub", GNUNET_JSON_from_data_auto
(&rr.merchant),
- "merchant_sig", GNUNET_JSON_from_data_auto
(&merchant_sig)
+ "merchant_pub", GNUNET_JSON_from_data_auto
(merchant_pub),
+ "merchant_sig", GNUNET_JSON_from_data_auto
(merchant_sig)
);
if (NULL == refund_obj)
{
@@ -294,7 +351,7 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle
*exchange,
rh->depconf.purpose.purpose = htonl
(TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND);
rh->depconf.h_contract_terms = *h_contract_terms;
rh->depconf.coin_pub = *coin_pub;
- rh->depconf.merchant = rr.merchant;
+ rh->depconf.merchant = *merchant_pub;
rh->depconf.rtransaction_id = GNUNET_htonll (rtransaction_id);
TALER_amount_hton (&rh->depconf.refund_amount,
amount);
diff --git a/src/exchangedb/test_exchangedb_fees.c
b/src/exchangedb/test_exchangedb_fees.c
index 2bee774..0c9ecea 100644
--- a/src/exchangedb/test_exchangedb_fees.c
+++ b/src/exchangedb/test_exchangedb_fees.c
@@ -86,6 +86,9 @@ main (int argc,
GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount ("EUR:1.0",
&af->wire_fee));
+ GNUNET_assert (GNUNET_OK ==
+ TALER_string_to_amount ("EUR:1.0",
+ &af->closing_fee));
sign_af (af,
priv);
n = GNUNET_new (struct TALER_EXCHANGEDB_AggregateFees);
@@ -94,6 +97,9 @@ main (int argc,
GNUNET_assert (GNUNET_OK ==
TALER_string_to_amount ("EUR:0.1",
&n->wire_fee));
+ GNUNET_assert (GNUNET_OK ==
+ TALER_string_to_amount ("EUR:0.1",
+ &n->closing_fee));
sign_af (n,
priv);
af->next = n;
diff --git a/src/include/taler_exchange_service.h
b/src/include/taler_exchange_service.h
index da39a17..f1af114 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -717,6 +717,50 @@ TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle
*exchange,
/**
+ * Submit a refund request to the exchange and get the exchange's
+ * response. This API is used by a merchant. Note that
+ * while we return the response verbatim to the caller for further
+ * processing, we do already verify that the response is well-formed
+ * (i.e. that signatures included in the response are all valid). If
+ * the exchange's reply is not well-formed, we return an HTTP status code
+ * of zero to @a cb.
+ *
+ * The @a exchange must be ready to operate (i.e. have
+ * finished processing the /keys reply). If this check fails, we do
+ * NOT initiate the transaction with the exchange and instead return NULL.
+ *
+ * @param exchange the exchange handle; the exchange must be ready to operate
+ * @param amount the amount to be refunded; must be larger than the refund fee
+ * (as that fee is still being subtracted), and smaller than the amount
+ * (with deposit fee) of the original deposit contribution of this coin
+ * @param refund_fee fee applicable to this coin for the refund
+ * @param h_contract_terms hash of the contact of the merchant with the
customer that is being refunded
+ * @param coin_pub coin’s public key of the coin from the original deposit
operation
+ * @param rtransaction_id transaction id for the transaction between merchant
and customer (of refunding operation);
+ * this is needed as we may first do a partial refund
and later a full refund. If both
+ * refunds are also over the same amount, we need the
@a rtransaction_id to make the disjoint
+ * refund requests different (as requests are
idempotent and otherwise the 2nd refund might not work).
+ * @param merchant_pub public key of the merchant
+ * @param merchant_sig signature affirming the refund from the merchant
+ * @param cb the callback to call when a reply for this request is available
+ * @param cb_cls closure for the above callback
+ * @return a handle for this request; NULL if the inputs are invalid (i.e.
+ * signatures fail to verify). In this case, the callback is not
called.
+ */
+struct TALER_EXCHANGE_RefundHandle *
+TALER_EXCHANGE_refund2 (struct TALER_EXCHANGE_Handle *exchange,
+ const struct TALER_Amount *amount,
+ const struct TALER_Amount *refund_fee,
+ const struct GNUNET_HashCode *h_contract_terms,
+ const struct TALER_CoinSpendPublicKeyP *coin_pub,
+ uint64_t rtransaction_id,
+ const struct TALER_MerchantPublicKeyP *merchant_pub,
+ const struct TALER_MerchantSignatureP *merchant_sig,
+ TALER_EXCHANGE_RefundResultCallback cb,
+ void *cb_cls);
+
+
+/**
* Cancel a refund permission request. This function cannot be used
* on a request handle if a response is already served for it. If
* this function is called, the refund may or may not have happened.
--
To stop receiving notification emails like this one, please contact
address@hidden