taler-docs

commit 9608f228ec0a07310f785669ec4f2a0f0c503357
parent 7bf82f8dffebe39b0a557a58d0dd030f080658f7
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat,  4 Mar 2017 18:09:15 +0100

updating spec matching #4932

Diffstat:
M
api/api-common.rst
 | 
2
++
M
api/api-exchange.rst
 | 
5
++++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/api/api-common.rst b/api/api-common.rst
@@ -600,6 +600,7 @@ within the
      * purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_FEES
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
+    struct GNUNET_HashCode h_wire_method;
     struct GNUNET_TIME_AbsoluteNBO start_date;
     struct GNUNET_TIME_AbsoluteNBO end_date;
     struct TALER_AmountNBO wire_fee;
@@ -642,6 +643,7 @@ within the
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct TALER_AmountNBO total;
+    struct TALER_AmountNBO wire_fee;
     struct TALER_MerchantPublicKeyP merchant_pub;
     struct GNUNET_HashCode h_wire;
     struct GNUNET_HashCode h_details;
diff --git a/api/api-exchange.rst b/api/api-exchange.rst
@@ -260,7 +260,7 @@ Obtaining wire-transfer information
       // Wire transfer fee structure. Specifies aggregate wire transfer fees.
       fees: AggregateTransferFee[];
 
-      // Signaure of `TALER_MasterWireDetailsPS`_ with purpose TALER_SIGNATURE_MASTER_TEST_DETAILS
+      // Signature of `TALER_MasterWireDetailsPS`_ with purpose TALER_SIGNATURE_MASTER_TEST_DETAILS
       // Note that the `h_sepa_details` field of `TALER_MasterWireDetailsPS`_ is computed
       // by concatenating all of the above fields (in the same order they appear) and then
       // by hashing the obtained concatenation.
@@ -990,6 +990,9 @@ typically also view the balance.)
       // Total amount transferred
       total: Amount;
 
+      // Applicable wire fee that was charged
+      wire_fee: Amount;
+
       // public key of the merchant (identical for all deposits)
       merchant_pub: EddsaPublicKey;