[GNUnet-SVN] [taler-api] branch master updated (fd0e526 -> 1244710)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository api.

    from fd0e526  names consistency
     new ad18330  fix docs for /refund, add refund permission to /pay
     new 1244710  fix typo

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 api-exchange.rst |  4 ++--
 api-merchant.rst | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/api-exchange.rst b/api-exchange.rst
index a4efd43..507eb56 100644
--- a/api-exchange.rst
+++ b/api-exchange.rst
@@ -911,8 +911,8 @@ the API during normal operation.
       // `kappa - 1` transfer private keys (ephemeral ECDHE keys)
       transfer_privs: EddsaPrivateKey[];
 
-      // transfer public keys at the `noreveal_index`.
-      transfer_pub: EddsaPublicKey[];
+      // transfer public key at the `noreveal_index`.
+      transfer_pub: EddsaPublicKey;
 
       // The original commitment, used to match the /refresh/reveal
       // to the corresponding /refresh/melt operation.
diff --git a/api-merchant.rst b/api-merchant.rst
index 996bbb3..6330f3c 100644
--- a/api-merchant.rst
+++ b/api-merchant.rst
@@ -239,6 +239,11 @@ The following API are made available by the merchant's 
`backend` to the merchant
       // can do order processing without a second lookup on
       // a successful payment
       proposal: Proposal;
+
+      // Refund permissions for the order.  This array will only
+      // be non-empty when this payment is a replay and a refund happened
+      // between the first successful payment request and a refund.
+      refund_permissions: RefundPermission[];
     }
 
 .. http:post:: /refund
@@ -293,12 +298,25 @@ The following API are made available by the merchant's 
`backend` to the merchant
 
   **Response**
 
-  If case of success, an *array of* `RefundLookup`_ objects is returned.
+  :status 200 OK:
+    Refund loopup was successful. The backend responds with a 
`RefundLookupResponse`_ object.
+    If there were no refunds for a contract, the array of refund permissions 
is empty.
+  :status 404 Not Found:
+    The transaction was not found.  Note that this is *not* the same as
+    there being no refunds for the transaction.
 
   .. _RefundLookup:
   .. code-block:: tsref
 
+<<<<<<< HEAD
+    interface RefundLookupResponse {
+      refund_permissions: RefundPermission[];
+    }
+    
+    interface RefundPermission {
+=======
     interface RefundLookup {
+>>>>>>> fd0e5260107f6c418659808b2620484332afd774
 
       // Coin from which the refund is going to be taken
       coin_pub: EddsaPublicKey;

-- 
To stop receiving notification emails like this one, please contact
address@hidden