diff options
author | Christian Grothoff <christian@grothoff.org> | 2023-09-11 13:22:15 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2023-09-11 13:22:15 +0200 |
commit | 3b99f24648f477a2b7afd890657bb2675e211d31 (patch) | |
tree | 5c611d850e6d6d31868f17fc37ddfcf875c132d5 /src/include/taler_exchange_service.h | |
parent | e967208e8c01af28e2ebde34c8deea326f09e5e3 (diff) | |
download | exchange-3b99f24648f477a2b7afd890657bb2675e211d31.tar.xz |
add support for wallet_data_hash in API
Diffstat (limited to 'src/include/taler_exchange_service.h')
-rw-r--r-- | src/include/taler_exchange_service.h | 48 |
1 files changed, 27 insertions, 21 deletions
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index a1a1e3997..31f41e178 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -1054,18 +1054,16 @@ struct TALER_EXCHANGE_DepositContractDetail { /** - * Execution date, until which the merchant would like the exchange to - * settle the balance (advisory, the exchange cannot be forced to settle in - * the past or upon very short notice, but of course a well-behaved exchange - * will limit aggregation based on the advice received). + * Hash of the contact of the merchant with the customer (further details + * are never disclosed to the exchange) */ - struct GNUNET_TIME_Timestamp wire_deadline; + struct TALER_PrivateContractHashP h_contract_terms; /** - * The merchant’s account details, in the payto://-format supported by the - * exchange. + * The public key of the merchant (used to identify the merchant for refund + * requests). */ - const char *merchant_payto_uri; + struct TALER_MerchantPublicKeyP merchant_pub; /** * Salt used to hash the @e merchant_payto_uri. @@ -1073,34 +1071,42 @@ struct TALER_EXCHANGE_DepositContractDetail struct TALER_WireSaltP wire_salt; /** - * Hash of the contact of the merchant with the customer (further details - * are never disclosed to the exchange) + * Hash over data provided by the wallet to customize the contract. + * All zero if not used. */ - struct TALER_PrivateContractHashP h_contract_terms; + struct GNUNET_HashCode wallet_data_hash; /** - * Policy extension specific details about the deposit relevant to the exchange. + * Date until which the merchant can issue a refund to the customer via the + * exchange (can be zero if refunds are not allowed); must not be after the + * @e wire_deadline. */ - json_t *policy_details; + struct GNUNET_TIME_Timestamp refund_deadline; + + /** + * Execution date, until which the merchant would like the exchange to + * settle the balance (advisory, the exchange cannot be forced to settle in + * the past or upon very short notice, but of course a well-behaved exchange + * will limit aggregation based on the advice received). + */ + struct GNUNET_TIME_Timestamp wire_deadline; /** * Timestamp when the contract was finalized, must match approximately the * current time of the exchange. */ - struct GNUNET_TIME_Timestamp timestamp; + struct GNUNET_TIME_Timestamp wallet_timestamp; /** - * The public key of the merchant (used to identify the merchant for refund - * requests). + * The merchant’s account details, in the payto://-format supported by the + * exchange. */ - struct TALER_MerchantPublicKeyP merchant_pub; + const char *merchant_payto_uri; /** - * Date until which the merchant can issue a refund to the customer via the - * exchange (can be zero if refunds are not allowed); must not be after the - * @e wire_deadline. + * Policy extension specific details about the deposit relevant to the exchange. */ - struct GNUNET_TIME_Timestamp refund_deadline; + const json_t *policy_details; }; |