diff options
| -rw-r--r-- | core/api-exchange.rst | 6 | ||||
| -rw-r--r-- | manpages/taler-exchange-offline.1.rst | 6 | ||||
| -rw-r--r-- | taler-exchange-manual.rst | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/core/api-exchange.rst b/core/api-exchange.rst index acbaf29f..dce01745 100644 --- a/core/api-exchange.rst +++ b/core/api-exchange.rst @@ -459,6 +459,9 @@ possibly by using HTTPS. // Per transfer closing fee. closing_fee: Amount; + // Per exchange-to-exchange transfer (wad) fee. + wad_fee: Amount; + // What date (inclusive) does this fee go into effect? // The different fees must cover the full time period in which // any of the denomination keys are valid without overlap. @@ -867,6 +870,9 @@ Management operations authorized by master key // Wire fee to charge during that time period for this wire method. wire_fee: Amount; + // Wad fee to charge during that time period for this wire method. + wad_fee: Amount; + } diff --git a/manpages/taler-exchange-offline.1.rst b/manpages/taler-exchange-offline.1.rst index 18d53993..66ee8044 100644 --- a/manpages/taler-exchange-offline.1.rst +++ b/manpages/taler-exchange-offline.1.rst @@ -255,13 +255,13 @@ format suitable for the ``upload`` subcommand. wire-fee -------- -This subcommand informs an exchange about the desired wire fee (and closing fee) -structure for particular wire method and a calendar year (!). The tool does not +This subcommand informs an exchange about the desired wire fee structure (that is, wire, closing and wad fees) +for particular wire method and a calendar year (!). The tool does not permit changing wire fees during a calendar year. Also, once the wire fee has been set for a calendar year, it cannot be changed. The subcommand takes the year, wire-method (see RFC 8905, examples include -``x-taler-bank`` or ``iban``), wire fee and closing fee as arguments. +``x-taler-bank`` or ``iban``), wire fee, closing fee and wad fee as arguments. Instead of a year, the string ``now`` can be given for the current year (this is mostly useful for test cases). The wire-method should follow the GANA registry as given in RFC 8905. The fees must be given in the usual diff --git a/taler-exchange-manual.rst b/taler-exchange-manual.rst index a9574479..753bd997 100644 --- a/taler-exchange-manual.rst +++ b/taler-exchange-manual.rst @@ -717,7 +717,7 @@ using the ``taler-exchange-offline`` tool: .. code-block:: console - $ taler-exchange-offline wire-fee iban 2040 EUR:0.05 EUR:0.10 + $ taler-exchange-offline wire-fee iban 2040 EUR:0.05 EUR:0.10 EUR:0.15 The above sets the wire fees for wire transfers involving ``iban`` accounts (in Euros) in the year 2040 to 5 cents (wire fee) and 10 cents (closing fee). @@ -1048,8 +1048,8 @@ You can run a first simple benchmark using: $ HTTPD_PID=$! $ taler-exchange-offline -c benchmark.conf \ download sign \ - enable-account FIXME-DETAILS-MISING-HERE \ - wire-fee FIXME-DETAILS-MISING-HERE \ + enable-account payto://iban/CH9300762011623852957 \ + wire-fee iban EUR:0 EUR:0 EUR:0 \ upload $ kill -TERM $HTTPD_PID $ taler-exchange-benchmark -c benchmark.conf -p 4 -r 1 -n 10 |