spec update for #5254

2 files changed, 8 insertions, 36 deletions

diff --git a/api-exchange.rst b/api-exchange.rst
index d0b215e2..39b4dd9e 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -1,6 +1,6 @@
 ..
   This file is part of GNU TALER.
-  Copyright (C) 2014-2017 GNUnet e.V. and INRIA
+  Copyright (C) 2014-2018 GNUnet e.V. and INRIA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU General Public License as published by the Free Software
@@ -70,6 +70,10 @@ possibly by using HTTPS.
       // EdDSA master public key of the exchange, used to sign entries in `denoms` and `signkeys`
       master_public_key: EddsaPublicKey;
 
+      // Relative duration until inactive reserves are closed; not signed, expressed as
+      // a string in relative time in microseconds, i.e. "/Delay(1000)/" for 1 second.
+      reserve_closing_delay: RelativeTime;
+
       // Denominations offered by this exchange.
       denoms: Denom[];
 
diff --git a/api-merchant.rst b/api-merchant.rst
index 96a8bc02..ef1c35b5 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -265,7 +265,7 @@ The following API are made available by the merchant's `backend` to the merchant
       merchant_pub: MerchantPublicKeyP;
     }
 
-    
+
     interface RefundDetail {
       // Merchant signature over the hashed order id.
       // The purpose is `TALER_SIGNATURE_MERCHANT_REFUND_OK`.
@@ -273,12 +273,12 @@ The following API are made available by the merchant's `backend` to the merchant
 
       // Public key of the coin which is being refunded.
       coin_pub: EddsaPublicKey;
-      
+
       // refund transaction ID chosen by the merchant.
       rtransaction_id: uint64_t;
     }
 
-    
+
 .. http:post:: /refund
 
   Increase the refund amount associated with a given order.
@@ -358,38 +358,6 @@ The following API are made available by the merchant's `backend` to the merchant
     }
 
 
-.. http:post:: /tip-enable
-
-  Enable tipping by telling the backend that a reserve was created with funds for tipping.
-
-  **Request**
-
-  The request body is a `TipEnable`_ object.  Note that if an existing,
-  non-expired reserve is credited, the credits are added and the
-  expiration time is updated to the max of the expiration times.
-
-  **Response**
-
-  :status 200 OK:
-    A reserve with credit for tipping has been created. The response is empty.
-
-  .. _TipEnable:
-  .. code-block:: tsref
-
-    interface TipEnable {
-      // Amount that was credited to the reserve
-      credit: Amount;
-
-      // Expiration time for the reserve
-      expiration: Timestamp;
-
-      // Private key of the reserve
-      reserve_priv: ReservePrivateKeyP;
-
-      // Unique ID for the wire transfer, used to detect duplicate credits
-      credit_uuid: HashCode;
-    }
-
 .. http:post:: /tip-authorize
 
   Authorize a tip that can be picked up by the customer's wallet by POSTing to `/tip-pickup`.  Note that this is simply the authorization step the back office has to trigger first.  The frontend must return the tip's identifier (and exchange URL) via a "402 Payment Required" response to the wallet.