taler-docs

commit 7f5a434337e6916c05e7158301a092d3ea36a024
parent 93ebfd33d2b67d94f562c8d713db7f375f1447e9
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 12 Oct 2016 17:18:40 +0200

Merge branch 'master' of git.taler.net:api

Diffstat:
M
api-common.rst
 | 
5
++++-
M
api-exchange.rst
 | 
8
++++----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/api-common.rst b/api-common.rst
@@ -157,12 +157,15 @@ Keys
 ^^^^
 
 .. _`tsref-type-EddsaPublicKey`:
+.. _`tsref-type-EcdhePublicKey`:
+.. _`tsref-type-EcdhePrivateKey`:
 .. _`tsref-type-EddsaPrivateKey`:
 .. _`tsref-type-CoinPublicKey`:
 
 .. code-block:: tsref
 
-   // EdDSA public keys always point on Curve25519 (FIXME does that hold for private keys as well?) and represented
+   // EdDSA and ECDHE public keys always point on Curve25519 (FIXME does that hold for private
+   // keys as well?) and represented
    // using the standard 256 bits Ed25519 compact format, converted to Crockford
    // `Base32`_.
    type EddsaPublicKey = string;
diff --git a/api-exchange.rst b/api-exchange.rst
@@ -1298,8 +1298,8 @@ Administrative API: Bank transactions
       // Transaction identifier in the wire details
       transaction: number;
 
-      // Wire transaction details, as originally specified by the merchant
-      wire: any;
+      // `Wire transaction details <wireformats>`_, as originally specified by the merchant
+      wire: Object;
     }
 
   **Response**
@@ -1507,8 +1507,8 @@ binary-compatible with the implementation of the exchange.
       // Private transfer key
       trans_priv: string;
 
-      // Coin public ket
-      coin_pub: string;
+      // `Coin public key <eddsa-coin-pub>`_
+      coin_pub: EddsaPublicKey;
     }
 
   **Response:**