exchange

commit 56efe31c40c2e8ef76f4eb2a7ba7e98ac78a0b15
parent f5a2134da8a22dd48aa8ec3f6eda5e2a57aced7d
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  7 Oct 2016 02:52:39 +0200

Merge branch 'master' of ssh://taler.net:/var/git/exchange

Diffstat:
M
src/include/taler_signatures.h
 | 
15
+++++++++++++++

1 file changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
@@ -153,6 +153,12 @@
  */
 #define TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION 1103
 
+/**
+ * Signature where the merchant confirms that the payment was
+ * successful
+ */
+#define TALER_SIGNATURE_MERCHANT_PAYMENT_OK 1104
+
 
 /*********************/
 /* Wallet signatures */
@@ -1072,6 +1078,15 @@ struct TALER_ContractPS
   struct TALER_MerchantPublicKeyP merchant_pub;
 };
 
+/**
+ * Used by merchants to return signed responses to /pay requests.
+ * Currently only used to return 200 OK signed responses.
+ */
+struct PaymentResponsePS
+{
+  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+};
+
 
 /**
  * Details affirmed by the exchange about a wire transfer the exchange