1 files changed, 48 insertions, 16 deletions

diff --git a/core/api-common.rst b/core/api-common.rst
index 81b85ab9..cc69870b 100644
--- a/core/api-common.rst
+++ b/core/api-common.rst
@@ -64,6 +64,8 @@ handle the error as if an internal error (500) had been returned.
     changed, the client MUST follow the link to the new location. If possible,
     the client SHOULD remember the new URL for the reserve for future
     requests.
+  :http:statuscode:`400 Bad request`:
+    One of the arguments to the request is missing or malformed.
   :http:statuscode:`500 Internal server error`:
     This always indicates some serious internal operational error of the exchange,
     such as a program bug, database problems, etc., and must not be used for
@@ -75,10 +77,7 @@ handle the error as if an internal error (500) had been returned.
     although the auditor API for this is not yet specified.  However, as internal
     server errors are always reported to the exchange operator, a good operator
     should naturally be able to address them in a timely fashion, especially
-    within 24h.  When generating an internal server error, the exchange responds with
-    a JSON object containing the following fields: FIXME: What are the fields?
-  :http:statuscode:`400 Bad request`:
-    One of the arguments to the request is missing or malformed.
+    within 24h.
 
   Unless specified otherwise, all error status codes (4xx and 5xx) have a message
   body with an `ErrorDetail` JSON object.
@@ -720,11 +719,6 @@ within the
     struct TALER_MerchantPublicKeyP merchant;
   };
 
-.. _TALER_RefreshCommitmentP:
-.. sourcecode:: c
-
-  // FIXME: put definition here
-
 .. _TALER_RefreshMeltCoinAffirmationPS:
 .. sourcecode:: c
 
@@ -810,7 +804,6 @@ within the
     struct GNUNET_HashCode h_wire_details;
   };
 
-
 .. _TALER_MasterWireFeePS:
 .. sourcecode:: c
 
@@ -831,7 +824,7 @@ within the
 
   struct TALER_DepositTrackPS {
     /**
-     * purpose.purpose = TALER_SIGNATURE_MASTER_SEPA_DETAILS || TALER_SIGNATURE_MASTER_TEST_DETAILS
+     * purpose.purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct GNUNET_HashCode h_contract_terms;
@@ -851,7 +844,6 @@ within the
     struct TALER_AmountNBO deposit_fee;
   };
 
-
 .. _TALER_WireDepositDataPS:
 .. _TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT:
 .. sourcecode:: c
@@ -934,12 +926,31 @@ within the
 .. _TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND:
 .. sourcecode:: c
 
-  // FIXME: put definition here
+   struct TALER_RefundConfirmationPS {
+     /**
+      * purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND.
+      */
+     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+     struct GNUNET_HashCode h_contract_terms;
+     struct TALER_CoinSpendPublicKeyP coin_pub;
+     struct TALER_MerchantPublicKeyP merchant;
+     uint64_t rtransaction_id;
+     struct TALER_AmountNBO refund_amount;
+   };
 
 .. _TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION:
 .. sourcecode:: c
 
-  // FIXME: put definition here
+    struct TALER_DepositTrackPS {
+      /**
+       * purpose.purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION.
+       */
+      struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+      struct GNUNET_HashCode h_contract_terms;
+      struct GNUNET_HashCode h_wire;
+      struct TALER_MerchantPublicKeyP merchant;
+      struct TALER_CoinSpendPublicKeyP coin_pub;
+    };
 
 .. _TALER_RefundRequestPS:
 .. sourcecode:: c
@@ -957,6 +968,9 @@ within the
     struct TALER_AmountNBO refund_fee;
   };
 
+.. _TALER_MerchantRefundConfirmationPS:
+.. sourcecode:: c
+
   struct TALER_MerchantRefundConfirmationPS {
     /**
      *  purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND_OK
@@ -986,7 +1000,6 @@ within the
 .. sourcecode:: c
 
   struct TALER_RecoupRefreshConfirmationPS {
-
     /**
      * purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH
      */
@@ -1105,6 +1118,26 @@ within the
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
   };
 
+.. _TALER_RefreshCommitmentP:
+.. sourcecode:: c
+
+   struct TALER_RefreshCommitmentP {
+     struct GNUNET_HashCode session_hash;
+   };
+
+
+.. _TALER_PurseRequestSignaturePS:
+.. sourcecode:: c
+
+  struct TALER_PurseRequestSignaturePS {
+    /**
+     * purpose.purpose = TALER_SIGNATURE_PURSE_REQUEST
+     */
+    struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+    struct GNUNET_TIME_AbsoluteNBO purse_expiration;
+    struct TALER_AmountNBO total_purse_amount;
+    struct GNUNET_HashCode h_contract_terms;
+  };
 
 
 .. _TALER_PurseDepositSignaturePS:
@@ -1137,7 +1170,6 @@ within the
     struct GNUNET_HashCode h_contract_terms;
   };
 
-
 .. _TALER_PurseMergeSignaturePS:
 .. sourcecode:: c