summaryrefslogtreecommitdiff
path: root/api
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-03-04 18:09:15 +0100
committerChristian Grothoff <christian@grothoff.org>2017-03-04 18:09:15 +0100
commit9608f228ec0a07310f785669ec4f2a0f0c503357 (patch)
tree7c68120798ee6a10ed940bbffafbb945cc0815b0 /api
parent7bf82f8dffebe39b0a557a58d0dd030f080658f7 (diff)
downloaddocs-9608f228ec0a07310f785669ec4f2a0f0c503357.tar.gz
docs-9608f228ec0a07310f785669ec4f2a0f0c503357.tar.bz2
docs-9608f228ec0a07310f785669ec4f2a0f0c503357.zip
updating spec matching #4932
Diffstat (limited to 'api')
-rw-r--r--api/api-common.rst2
-rw-r--r--api/api-exchange.rst5
2 files changed, 6 insertions, 1 deletions
diff --git a/api/api-common.rst b/api/api-common.rst
index 944bafca..0d4cf50f 100644
--- 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
index 876f1631..d3014cb8 100644
--- 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;