polishing merchant's documetation

3 files changed, 53 insertions, 74 deletions

diff --git a/api-common.rst b/api-common.rst
index f41b9a46..8b5d5910 100644
--- a/api-common.rst
+++ b/api-common.rst
@@ -643,6 +643,19 @@ within the :ref:`exchange's codebase <exchange-repo>`.
   };
 
 
+.. _TALER_PaymentResponsePS:
+.. sourcecode:: c
+
+  struct PaymentResponsePS {
+      /**
+       * purpose.purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK
+       */
+      struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+      struct GNUNET_HashCode h_contract;
+  };
+
+
+.. _TALER_ContractPS:
 .. sourcecode:: c
 
   struct TALER_ContractPS {
@@ -654,6 +667,7 @@ within the :ref:`exchange's codebase <exchange-repo>`.
       struct TALER_AmountNBO total_amount;
       struct TALER_AmountNBO max_fee;
       struct GNUNET_HashCode h_contract;
+      struct TALER_MerchantPublicKeyP merchant_pub;
   };
 
   struct TALER_ConfirmWirePS {
diff --git a/api-merchant.rst b/api-merchant.rst
index 749681d3..a15e0b28 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -57,11 +57,13 @@ The Frontent HTTP API
   .. code-block:: tsref
 
     interface DepositPermission {
-      // the hashed :ref:`wire details <wireformats>` of this merchant. The wallet takes this value as-is from the contract
-      // `MyStruct`_
-      H_wire: MyStruct;
+      // the hashed `wire details <wireformats>`_ of this merchant.
+      // The wallet takes this value as-is from the contract 
+      H_wire: HashCode;
 
-      // the base32 encoding of the field `h_contract` of the contract `blob <contract-blob>`. The wallet can choose whether to take this value obtained from the field `h_contract`, or regenerating one starting from the values it gets within the contract
+      // `base32`_ encoded `TALER_ContractPS`_. The wallet can choose whether
+      // to take this value obtained from the field `h_contract`,
+      // or regenerating one starting from the values it gets within the contract
       H_contract: HashCode;
 
       // a 53-bit number corresponding to the contract being agreed on
@@ -73,10 +75,11 @@ The Frontent HTTP API
       // maximum fees merchant agreed to cover as per the contract
       max_fee: Amount;
 
-      // The merchant instance which is going to receive the final wire transfer. See :ref:`instances-lab`
+      // The merchant instance which is going to receive the final wire transfer.
+      // See `instances-lab`_
       receiver: string;
 
-      // signature by the merchant over the contract, must match signed data of purpose TALER_SIGNATURE_MERCHANT_CONTRACT
+      // Signature of `TALER_ContractPS`_
       merchant_sig: EddsaSignature;
 
       // a timestamp of this deposit permission. It equals just the contract's timestamp
@@ -107,10 +110,10 @@ The Frontent HTTP API
       // denomination key
       denom_pub: RsaPublicKey;
 
-      // exchange's signature over this coin's public key
+      // exchange's signature over this `coin's public key <eddsa-coin-pub>`_
       ub_sig: RsaSignature;
 
-      // the signature made by the coin's private key on a `struct TALER_DepositRequestPS`. See section `Signatures` on the exchange's API page.
+      // Signature of `TALER_DepositRequestPS`_
       coin_sig: EddsaSignature;
     }
 
@@ -204,7 +207,7 @@ The following API are made available by the merchant's `backend` to the merchant
   .. code-block:: tsref
 
     interface PaymentResponse {
-      // Signature of TALER_SIGNATURE_MERCHANT_PAYMENT_OK made by the merchant
+      // Signature of `TALER_PaymentResponsePS`_
       merchant_sig: EddsaSignature;
 
       // Contract's hash being signed over
@@ -322,12 +325,6 @@ The following API are made available by the merchant's `backend` to the merchant
       total_amount: Amount;
     }
 
----------
-Encodings
----------
-
-Data such as dates, binary blobs, and other useful formats, are encoded as described in :ref:`encodings-ref`.
-
 .. _contract:
 
 ------------------
@@ -345,16 +342,24 @@ that is legally non-binding:
       // The actual contract
       contract: Contract;
 
-      // The hash of the contract, encoded in base32, provided
-      // as a convenience.  All components that do not fully trust
-      // the merchant must verify this field.
+      // Contract's hash, provided as a convenience.  All components that do
+      // not fully trust the merchant must verify this field.
       H_contract: HashCode ;
 
-      // Signature over the contract made by the merchant.
-      // Must confirm to the `Signature specification`_ below.
+      // Signature over the hashcode of `contract` made by the merchant.
       merchant_sig: EddsaSignature;
     }
 
+.. note::
+  When the contract is signed by the merchant or the wallet, the
+  signature is made over the hash of the JSON text, as the contract may
+  be confidential between merchant and customer and should not be
+  exposed to the exchange.  The hashcode is generated by hashing the
+  encoding of the contract's JSON obtained by using the flags
+  ``JSON_COMPACT | JSON_PRESERVE_ORDER``, as described in the `libjansson
+  documentation
+  <https://jansson.readthedocs.org/en/2.7/apiref.html?highlight=json_dumps#c.json_dumps>`_.
+
 The `contract` must have the following structure:
 
   .. _tsref-type-Contract:
@@ -419,9 +424,8 @@ The `contract` must have the following structure:
       // Exchanges that the merchant accepts even if it does not accept any auditors that audit them.
       exchanges: Exchange[];
 
-      // Map from label to a `Location`_.
-      // The label strings must not contain a colon (`:`).
-      locations: { [label: string]: Location>;
+      // Map from label to a location
+      locations: { [label: string]: Location }; // FIXME make 'Location' clickable
     }
 
   The wallet must select a exchange that either the mechant accepts directly by listing it in the exchanges arry, or for which the merchant accepts an auditor that audits that exchange by listing it in the auditors array.
@@ -488,19 +492,22 @@ The `contract` must have the following structure:
       street_number?: string;
     }
 
-  .. code-block:: ts
+  .. _tsref-type-Auditor:
+  .. code-block:: tsref
 
     interface Auditor {
       // official name
       name: string;
 
-      auditor_pub: EddsaPublicKey
+      // Auditor's public key
+      auditor_pub: EddsaPublicKey;
 
       // Base URL of the auditor
       url: string;
     }
 
-  .. code-block:: ts
+  .. _tsref-type-Exchange:
+  .. code-block:: tsref
 
     interface Exchange {
       // the exchange's base URL
@@ -509,45 +516,3 @@ The `contract` must have the following structure:
       // master public key of the exchange
       master_pub: EddsaPublicKey;
     }
-
-
-.. _`Signature specification`:
-
-When the contract is signed by the merchant or the wallet, the
-signature is made over the hash of the JSON text, as the contract may
-be confidential between merchant and customer and should not be
-exposed to the exchange.  The hashcode is generated by hashing the
-encoding of the contract's JSON obtained by using the flags
-``JSON_COMPACT | JSON_PRESERVE_ORDER``, as described in the `libjansson
-documentation
-<https://jansson.readthedocs.org/en/2.7/apiref.html?highlight=json_dumps#c.json_dumps>`_.
-The following structure is a container for the signature. The purpose
-should be set to ``TALER_SIGNATURE_MERCHANT_CONTRACT``.
-
-.. _contract-blob:
-.. code-block:: c
-
-   struct MERCHANT_Contract
-   {
-     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-     /**
-      * Transaction ID must match the one in the JSON contract, here given
-      * in big endian.
-      */
-     uint64_t transaction_id;
-
-     /**
-      * Total amount to be paid for the contract, must match JSON "amount".
-      */
-     struct TALER_AmountNBO total_amount;
-
-     /**
-      * Total amount to be paid for the contract, must match JSON "max_fee".
-      */
-     struct TALER_AmountNBO max_fee;
-
-     /**
-      * Hash of the overall JSON contract.
-      */
-     struct GNUNET_HashCode h_contract;
-   }
diff --git a/releases.rst b/releases.rst
index 50ac9ee4..d0191ba0 100644
--- a/releases.rst
+++ b/releases.rst
@@ -29,20 +29,20 @@ The following components are published on the GNU mirrors
 * taler-wallet-webex (wallet-webex.git)
 
 
---------
+-------
 Tagging
 -------
 
 Tag releases with an *annotated* commit, like
 
-.. code-block: none
+::
 
   git tag -a v0.1.0 -m "Official release v0.1.0"
   git push origin v0.1.0
 
 ------------------
 Database for tests
------------------
+------------------
 
 For tests in the exchange and merchant to run, make sure that
 a database `talertest` is accessible by `$USER`.  Otherwise tests
@@ -58,7 +58,7 @@ should be the change of the version.
 For the exchange test cases to pass, `make install` must be run first.
 Without it, test cases will fail because plugins can't be located.
 
-.. code-block:
+::
 
   ./bootstrap
   ./configure # add required options for your system
@@ -75,7 +75,7 @@ The version of the wallet is in `manifest.json`.  The `version_name` should be
 adjusted, and `version` should be increased independently on every upload to
 the WebStore.
 
-.. code-block:
+::
 
   ./configure
   make dist
@@ -93,7 +93,7 @@ See https://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
 
 Directive file: 
 
-.. code-block:
+::
 
   version: 1.2
   directory: taler