add wallet_data support to merchant

1 files changed, 10 insertions, 2 deletions

diff --git a/src/include/taler_merchant_service.h b/src/include/taler_merchant_service.h
index ef7a46ed..6d79d45e 100644
--- a/src/include/taler_merchant_service.h
+++ b/src/include/taler_merchant_service.h
@@ -919,12 +919,14 @@ struct TALER_MERCHANT_AccountsPostResponse
   /**
    * Details depending on HTTP status.
    */
-  union {
+  union
+  {
 
     /**
      * Details returned on #MHD_HTTP_OK.
      */
-    struct {
+    struct
+    {
 
       /**
        * Hash of @e payto_uri and @e salt.
@@ -2876,6 +2878,7 @@ struct TALER_MERCHANT_PaidCoin
  * @param merchant_url base URL of the merchant
  * @param order_id which order should be paid
  * @param session_id session to pay for, or NULL for none
+ * @param wallet_data inputs from the wallet for the contract, NULL for none
  * @param num_coins length of the @a coins array
  * @param coins array of coins to pay with
  * @param pay_cb the callback to call when a reply for this request is available
@@ -2888,6 +2891,7 @@ TALER_MERCHANT_order_pay_frontend (
   const char *merchant_url,
   const char *order_id,
   const char *session_id,
+  const json_t *wallet_data,
   unsigned int num_coins,
   const struct TALER_MERCHANT_PaidCoin coins[static num_coins],
   TALER_MERCHANT_OrderPayCallback pay_cb,
@@ -2952,6 +2956,7 @@ struct TALER_MERCHANT_PayCoin
  * @param merchant_url base URL of the merchant
  * @param session_id session to pay for, or NULL for none
  * @param h_contract hash of the contact of the merchant with the customer
+ * @param wallet_data inputs from the wallet for the contract, NULL for none
  * @param amount total value of the contract to be paid to the merchant
  * @param max_fee maximum fee covered by the merchant (according to the contract)
  * @param merchant_pub the public key of the merchant (used to identify the merchant for refund requests)
@@ -2973,6 +2978,7 @@ TALER_MERCHANT_order_pay (
   const char *merchant_url,
   const char *session_id,
   const struct TALER_PrivateContractHashP *h_contract,
+  const json_t *wallet_data,
   const struct TALER_Amount *amount,
   const struct TALER_Amount *max_fee,
   const struct TALER_MerchantPublicKeyP *merchant_pub,
@@ -3060,6 +3066,7 @@ typedef void
  * @param order_id which order should be paid
  * @param session_id session to pay for, or NULL for none
  * @param h_contract_terms hash of the contract terms
+ * @param wallet_data_hash inputs from the wallet for the contract, NULL for none
  * @param merchant_sig signature from the merchant
  *        affirming payment, or NULL on errors
  * @param paid_cb the callback to call when a reply for this request is available
@@ -3073,6 +3080,7 @@ TALER_MERCHANT_order_paid (
   const char *order_id,
   const char *session_id,
   const struct TALER_PrivateContractHashP *h_contract_terms,
+  const struct GNUNET_HashCode *wallet_data_hash,
   const struct TALER_MerchantSignatureP *merchant_sig,
   TALER_MERCHANT_OrderPaidCallback paid_cb,
   void *paid_cb_cls);