document exchange protocol v8

2 files changed, 8 insertions, 7 deletions

diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 536458ec..5fe560a3 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -631,7 +631,7 @@ denomination.
     interface DepositRequest {
       // Amount to be deposited, can be a fraction of the
       // coin's total value.
-      f: Amount;
+      contribution: Amount;
 
       // The merchant's account details. This must be a JSON object whose format
       // must correspond to one of the supported wire transfer formats of the exchange.
@@ -1354,10 +1354,6 @@ Refunds
       // must be larger than the refund fee.
       refund_amount: Amount;
 
-      // Refund fee associated with the given coin.
-      // must be smaller than the refund amount.
-      refund_fee: Amount;
-
       // SHA-512 hash of the contact of the merchant with the customer.
       h_contract_terms: HashCode;
 
@@ -1386,4 +1382,9 @@ Refunds
       // explicitly as the client might otherwise be confused by clock skew as to
       // which signing key was used.
       exchange_pub: EddsaPublicKey;
+
+      // Refund fee charged by the exchange for the given coin.
+      // must be smaller than the refund amount.
+      refund_fee: Amount;
+
    }
diff --git a/core/api-merchant.rst b/core/api-merchant.rst
index 2cc57ae0..7d009c8f 100644
--- a/core/api-merchant.rst
+++ b/core/api-merchant.rst
@@ -1025,13 +1025,13 @@ Receiving Payments
     // can generate a substantially shorter response.
     interface RefundResult {
       // HTTP status of the request to the exchange.
-      exchange_status: integer;
+      exchange_http_status: integer;
 
       // The full reply from the exchange. Note only actually
       // a <RefundSuccess> if the `exchange_status` is 200, otherwise
       // the error message as defined by the refund API.  For
       // aborts, the `rtransaction_id` is always 0.
-      exchange_body: RefundSuccess;
+      exchange_reply: RefundSuccess;
 
     }