summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-10-07 02:52:39 +0200
committerChristian Grothoff <christian@grothoff.org>2016-10-07 02:52:39 +0200
commit56efe31c40c2e8ef76f4eb2a7ba7e98ac78a0b15 (patch)
tree12b651351ee4b404eefc63d486909b6da8de0378 /src
parentf5a2134da8a22dd48aa8ec3f6eda5e2a57aced7d (diff)
parenta42155d5524538cdadb5d8a0bfc4ac41f5e39656 (diff)
downloadexchange-56efe31c40c2e8ef76f4eb2a7ba7e98ac78a0b15.tar.gz
exchange-56efe31c40c2e8ef76f4eb2a7ba7e98ac78a0b15.tar.bz2
exchange-56efe31c40c2e8ef76f4eb2a7ba7e98ac78a0b15.zip
Merge branch 'master' of ssh://taler.net:/var/git/exchange
Diffstat (limited to 'src')
-rw-r--r--src/include/taler_signatures.h15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index 09df98b26..8ce10b722 100644
--- 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