summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-05-03 06:39:50 +0200
committerChristian Grothoff <christian@grothoff.org>2016-05-03 06:39:50 +0200
commitbfc532e3150ea98967d8b8bbaa8d74aff5358d9c (patch)
tree9b7127a320bf38a245bd9c28616fbd6805798912
parente26998615d4a251702bd4ec2576ef19a96f882e0 (diff)
downloaddocs-bfc532e3150ea98967d8b8bbaa8d74aff5358d9c.tar.gz
docs-bfc532e3150ea98967d8b8bbaa8d74aff5358d9c.tar.bz2
docs-bfc532e3150ea98967d8b8bbaa8d74aff5358d9c.zip
#4135 was resolved, document the change
-rw-r--r--api-exchange.rst35
1 files changed, 21 insertions, 14 deletions
diff --git a/api-exchange.rst b/api-exchange.rst
index 668bb49c..c396986a 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -965,26 +965,30 @@ typically also view the balance.)
// Total amount transferred
total: Amount;
- // hash of the wire details (identical for all deposits)
- H_wire: HashCode;
-
// public key of the merchant (identical for all deposits)
merchant_pub: EddsaPublicKey;
+ // hash of the wire details (identical for all deposits)
+ H_wire: HashCode;
+
+ // details about the deposits
deposits: DepositDetail[];
- }
+ // signature from the exchange made with purpose
+ // `TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT`
+ exchange_sig: EddsaSignature;
+
+ // public EdDSA key of the exchange that was used to generate the signature.
+ // Should match one of the exchange's signing keys from /keys. Again given
+ // explicitly as the client might otherwise be confused by clock skew as to
+ // which signing key was used.
+ exchange_pub: EddsaSignature;
+ }
.. _tsref-type-DepositDetail:
.. code-block:: tsref
- interface DepositDetail {
- // The total amount the original deposit was worth.
- deposit_value: Amount;
-
- // applicable fees for the deposit
- deposit_fee: Amount;
-
+ interface WireDepositDetail {
// SHA-512 hash of the contact of the merchant with the customer.
H_contract: HashCode;
@@ -994,11 +998,14 @@ typically also view the balance.)
// coin's public key, both ECDHE and EdDSA.
coin_pub: CoinPublicKey;
- }
- .. note::
- We might want to add a signature of the exchange over the response in the future. That way, a merchant has proof should a exchange ever try to change the story here. (#4135)
+ // The total amount the original deposit was worth.
+ deposit_value: Amount;
+
+ // applicable fees for the deposit
+ deposit_fee: Amount;
+ }
.. http:post:: /deposit/wtid