aboutsummaryrefslogtreecommitdiff
path: root/src/lib/auditor_api_deposit_confirmation.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/auditor_api_deposit_confirmation.c')
-rw-r--r--src/lib/auditor_api_deposit_confirmation.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c
index cddfe8b14..1856a89f4 100644
--- a/src/lib/auditor_api_deposit_confirmation.c
+++ b/src/lib/auditor_api_deposit_confirmation.c
@@ -148,7 +148,7 @@ handle_deposit_confirmation_finished (void *cls,
148 * 148 *
149 * @param h_wire hash of merchant wire details 149 * @param h_wire hash of merchant wire details
150 * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor) 150 * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor)
151 * @param timestamp timestamp when the contract was finalized, must not be too far in the future 151 * @param exchange_timestamp timestamp when the deposit was received by the wallet
152 * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline 152 * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline
153 * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant 153 * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant
154 * @param coin_pub coin’s public key 154 * @param coin_pub coin’s public key
@@ -165,7 +165,7 @@ handle_deposit_confirmation_finished (void *cls,
165static int 165static int
166verify_signatures (const struct GNUNET_HashCode *h_wire, 166verify_signatures (const struct GNUNET_HashCode *h_wire,
167 const struct GNUNET_HashCode *h_contract_terms, 167 const struct GNUNET_HashCode *h_contract_terms,
168 struct GNUNET_TIME_Absolute timestamp, 168 struct GNUNET_TIME_Absolute exchange_timestamp,
169 struct GNUNET_TIME_Absolute refund_deadline, 169 struct GNUNET_TIME_Absolute refund_deadline,
170 const struct TALER_Amount *amount_without_fee, 170 const struct TALER_Amount *amount_without_fee,
171 const struct TALER_CoinSpendPublicKeyP *coin_pub, 171 const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -184,7 +184,7 @@ verify_signatures (const struct GNUNET_HashCode *h_wire,
184 .purpose.size = htonl (sizeof (dc)), 184 .purpose.size = htonl (sizeof (dc)),
185 .h_contract_terms = *h_contract_terms, 185 .h_contract_terms = *h_contract_terms,
186 .h_wire = *h_wire, 186 .h_wire = *h_wire,
187 .timestamp = GNUNET_TIME_absolute_hton (timestamp), 187 .exchange_timestamp = GNUNET_TIME_absolute_hton (exchange_timestamp),
188 .refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline), 188 .refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline),
189 .coin_pub = *coin_pub, 189 .coin_pub = *coin_pub,
190 .merchant = *merchant_pub 190 .merchant = *merchant_pub
@@ -256,7 +256,7 @@ verify_signatures (const struct GNUNET_HashCode *h_wire,
256 * @param auditor the auditor handle; the auditor must be ready to operate 256 * @param auditor the auditor handle; the auditor must be ready to operate
257 * @param h_wire hash of merchant wire details 257 * @param h_wire hash of merchant wire details
258 * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor) 258 * @param h_contract_terms hash of the contact of the merchant with the customer (further details are never disclosed to the auditor)
259 * @param timestamp timestamp when the contract was finalized, must not be too far in the future 259 * @param exchange_timestamp timestamp when deposit was received by the exchange
260 * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline 260 * @param refund_deadline date until which the merchant can issue a refund to the customer via the auditor (can be zero if refunds are not allowed); must not be after the @a wire_deadline
261 * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant 261 * @param amount_without_fee the amount confirmed to be wired by the exchange to the merchant
262 * @param coin_pub coin’s public key 262 * @param coin_pub coin’s public key
@@ -278,7 +278,7 @@ TALER_AUDITOR_deposit_confirmation (
278 struct TALER_AUDITOR_Handle *auditor, 278 struct TALER_AUDITOR_Handle *auditor,
279 const struct GNUNET_HashCode *h_wire, 279 const struct GNUNET_HashCode *h_wire,
280 const struct GNUNET_HashCode *h_contract_terms, 280 const struct GNUNET_HashCode *h_contract_terms,
281 struct GNUNET_TIME_Absolute timestamp, 281 struct GNUNET_TIME_Absolute exchange_timestamp,
282 struct GNUNET_TIME_Absolute refund_deadline, 282 struct GNUNET_TIME_Absolute refund_deadline,
283 const struct TALER_Amount *amount_without_fee, 283 const struct TALER_Amount *amount_without_fee,
284 const struct TALER_CoinSpendPublicKeyP *coin_pub, 284 const struct TALER_CoinSpendPublicKeyP *coin_pub,
@@ -298,7 +298,7 @@ TALER_AUDITOR_deposit_confirmation (
298 json_t *deposit_confirmation_obj; 298 json_t *deposit_confirmation_obj;
299 CURL *eh; 299 CURL *eh;
300 300
301 (void) GNUNET_TIME_round_abs (&timestamp); 301 (void) GNUNET_TIME_round_abs (&exchange_timestamp);
302 (void) GNUNET_TIME_round_abs (&refund_deadline); 302 (void) GNUNET_TIME_round_abs (&refund_deadline);
303 (void) GNUNET_TIME_round_abs (&ep_start); 303 (void) GNUNET_TIME_round_abs (&ep_start);
304 (void) GNUNET_TIME_round_abs (&ep_expire); 304 (void) GNUNET_TIME_round_abs (&ep_expire);
@@ -308,7 +308,7 @@ TALER_AUDITOR_deposit_confirmation (
308 if (GNUNET_OK != 308 if (GNUNET_OK !=
309 verify_signatures (h_wire, 309 verify_signatures (h_wire,
310 h_contract_terms, 310 h_contract_terms,
311 timestamp, 311 exchange_timestamp,
312 refund_deadline, 312 refund_deadline,
313 amount_without_fee, 313 amount_without_fee,
314 coin_pub, 314 coin_pub,
@@ -336,7 +336,8 @@ TALER_AUDITOR_deposit_confirmation (
336 "h_wire", GNUNET_JSON_from_data_auto (h_wire), 336 "h_wire", GNUNET_JSON_from_data_auto (h_wire),
337 "h_contract_terms", GNUNET_JSON_from_data_auto ( 337 "h_contract_terms", GNUNET_JSON_from_data_auto (
338 h_contract_terms), 338 h_contract_terms),
339 "timestamp", GNUNET_JSON_from_time_abs (timestamp), 339 "exchange_timestamp", GNUNET_JSON_from_time_abs (
340 exchange_timestamp),
340 "refund_deadline", GNUNET_JSON_from_time_abs (refund_deadline), 341 "refund_deadline", GNUNET_JSON_from_time_abs (refund_deadline),
341 "amount_without_fee", TALER_JSON_from_amount ( 342 "amount_without_fee", TALER_JSON_from_amount (
342 amount_without_fee), 343 amount_without_fee),