[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant] branch master updated: -update to work with latest exch
From: |
gnunet |
Subject: |
[taler-merchant] branch master updated: -update to work with latest exchange API change |
Date: |
Wed, 29 Jun 2022 19:31:17 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
The following commit(s) were added to refs/heads/master by this push:
new b66dce24 -update to work with latest exchange API change
b66dce24 is described below
commit b66dce246c0141fe6e5bb6dc800e12295c1cd4cd
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jun 29 19:30:23 2022 +0200
-update to work with latest exchange API change
---
.../taler-merchant-httpd_post-orders-ID-pay.c | 44 +++++++++++++---------
1 file changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
index 43b68ff4..667f4ac2 100644
--- a/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
+++ b/src/backend/taler-merchant-httpd_post-orders-ID-pay.c
@@ -1293,24 +1293,32 @@ AGE_FAIL:
dc->wire_fee = *wire_fee;
GNUNET_assert (NULL != pc->wm);
TMH_db->preflight (TMH_db->cls);
- dc->dh = TALER_EXCHANGE_deposit (exchange_handle,
- &dc->amount_with_fee,
- pc->wire_transfer_deadline,
- pc->wm->payto_uri,
- &pc->wm->wire_salt,
- &pc->h_contract_terms,
- achp,
- NULL, /* FIXME oec: extension json blob */
- &dc->coin_pub,
- &dc->ub_sig,
- &denom_details->key,
- pc->timestamp,
- &hc->instance->merchant_pub,
- pc->refund_deadline,
- &dc->coin_sig,
- &deposit_cb,
- dc,
- &ec);
+ {
+ struct TALER_EXCHANGE_CoinDepositDetail cdd = {
+ .amount = dc->amount_with_fee,
+ .h_age_commitment = h_age_commitment,
+ .coin_pub = dc->coin_pub,
+ .coin_sig = dc->coin_sig,
+ .denom_sig = dc->ub_sig
+ };
+ struct TALER_EXCHANGE_DepositContractDetail dcd = {
+ .wire_deadline = pc->wire_transfer_deadline,
+ .merchant_payto_uri = pc->wm->payto_uri,
+ .wire_salt = pc->wm->wire_salt,
+ .h_contract_terms = pc->h_contract_terms,
+ .extension_details = NULL /* FIXME-OEC */,
+ .timestamp = pc->timestamp,
+ .merchant_pub = hc->instance->merchant_pub,
+ .refund_deadline = pc->refund_deadline
+ };
+
+ dc->dh = TALER_EXCHANGE_deposit (exchange_handle,
+ &dcd,
+ &cdd,
+ &deposit_cb,
+ dc,
+ &ec);
+ }
if (NULL == dc->dh)
{
/* Signature was invalid or some other constraint was not satisfied. If
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant] branch master updated: -update to work with latest exchange API change,
gnunet <=