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

This commit is contained in:
Christian Grothoff 2016-10-07 02:52:39 +02:00
commit 56efe31c40

View File

@ -153,6 +153,12 @@
*/ */
#define TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION 1103 #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 */ /* Wallet signatures */
@ -1072,6 +1078,15 @@ struct TALER_ContractPS
struct TALER_MerchantPublicKeyP merchant_pub; 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 * Details affirmed by the exchange about a wire transfer the exchange