diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-11-06 19:43:47 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-11-06 19:43:47 +0100 |
commit | 9d6e1040669435dfa2ab93abd4f1669c7bf90871 (patch) | |
tree | c072a1284e6b3da14f972d98197d22f4d14500d5 /src/include/taler_signatures.h | |
parent | 57acad487de0ecb3f964c83a60e4f2d7d1ec460b (diff) | |
download | exchange-9d6e1040669435dfa2ab93abd4f1669c7bf90871.tar.xz |
include h_extensions in deposit confirmation
Diffstat (limited to 'src/include/taler_signatures.h')
-rw-r--r-- | src/include/taler_signatures.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index 5eef0db6f..40755348d 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -556,12 +556,24 @@ struct TALER_DepositConfirmationPS struct TALER_MerchantWireHash h_wire GNUNET_PACKED; /** + * Hash over the extension options of the deposit, 0 if there + * were not extension options. + */ + struct TALER_ExtensionContractHash h_extensions GNUNET_PACKED; + + /** * Time when this confirmation was generated / when the exchange received * the deposit request. */ struct GNUNET_TIME_AbsoluteNBO exchange_timestamp; /** + * By when does the exchange expect to pay the merchant + * (as per the merchant's request). + */ + struct GNUNET_TIME_AbsoluteNBO wire_deadline; + + /** * How much time does the @e merchant have to issue a refund * request? Zero if refunds are not allowed. After this time, the * coin cannot be refunded. Note that the wire transfer will not be @@ -577,9 +589,7 @@ struct TALER_DepositConfirmationPS struct TALER_AmountNBO amount_without_fee; /** - * The coin's public key. This is the value that must have been - * signed (blindly) by the Exchange. The deposit request is to be - * signed by the corresponding private key (using EdDSA). + * The public key of the coin that was deposited. */ struct TALER_CoinSpendPublicKeyP coin_pub; @@ -587,7 +597,7 @@ struct TALER_DepositConfirmationPS * The Merchant's public key. Allows the merchant to later refund * the transaction or to inquire about the wire transfer identifier. */ - struct TALER_MerchantPublicKeyP merchant; + struct TALER_MerchantPublicKeyP merchant_pub; }; |