summaryrefslogtreecommitdiff
path: root/core/api-exchange.rst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-05-18 18:37:14 +0200
committerChristian Grothoff <christian@grothoff.org>2021-05-18 18:37:14 +0200
commita846c5a30c7291e0bb514e5f639e96e079b30ff4 (patch)
tree29da73fc73d5463246cbe69c8401dbf69aef9522 /core/api-exchange.rst
parent5ec68febc9ac8f9ed753bf11186553321705fc85 (diff)
downloaddocs-a846c5a30c7291e0bb514e5f639e96e079b30ff4.tar.gz
docs-a846c5a30c7291e0bb514e5f639e96e079b30ff4.tar.bz2
docs-a846c5a30c7291e0bb514e5f639e96e079b30ff4.zip
revise purse amount handling
Diffstat (limited to 'core/api-exchange.rst')
-rw-r--r--core/api-exchange.rst24
1 files changed, 5 insertions, 19 deletions
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index d016837..abb90c7 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -2592,12 +2592,9 @@ Wallet-to-wallet transfers
interface PurseStatus {
- // Total amount that must be paid into the purse.
- total_purse_amount: Amount;
-
// Total amount deposited into the purse so far.
// If 'total_deposit_amount' minus 'deposit_fees'
- // exceeds 'purse_value_after_fees', and a
+ // exceeds 'merge_value_after_fees', and a
// 'merge_request' exists for the purse, then the
// purse will (have been) merged with the account.
total_deposit_amount: Amount;
@@ -2609,15 +2606,12 @@ Wallet-to-wallet transfers
// Desired total amount to be merged into the reserve.
// (excludes fees).
- purse_value_after_fees: Amount;
+ merge_value_after_fees: Amount;
// Indicative time at which the exchange is answering the
// status request. Used as part of 'exchange_sig'.
status_timestamp: Timestamp;
- // Maximum deposit fees that can be charged under the contract.
- max_deposit_fees: Amount;
-
// Deposit fees charged so far to all deposited coins.
deposit_fees: Amount;
@@ -2718,10 +2712,7 @@ Wallet-to-wallet transfers
// first request failed with a double-spending error.
// The exchange will confirm the creation of the
// purse once the amount given here is reached.
- total_purse_amount: Amount;
-
- // Maximum deposit fees that can be charged under the contract.
- max_deposit_fees: Amount;
+ merge_value_after_fees: Amount;
// SHA-512 hash of the contact of the purse.
h_contract_terms: HashCode;
@@ -2853,7 +2844,7 @@ Wallet-to-wallet transfers
// Total amount to be merged into the reserve.
// (excludes fees).
- purse_value_after_fees: Amount;
+ merge_value_after_fees: Amount;
// EdDSA signature of the purse over
// `TALER_PurseMergeSignaturePS` of
@@ -2976,12 +2967,7 @@ Wallet-to-wallet transfers
// the total value of the purse minus the deposit fees.
// If the deposit fees are lower, the contribution to the
// reserve can be higher!
- minimum_amount_contributed: Amount;
-
- // Maximum deposit fees that can be charged under the contract.
- // The 'total_purse_amount' will be the
- // 'minimum_amount_contributed' plus the 'max_deposit_fees'.
- max_deposit_fees: Amount;
+ merge_value_after_fees: Amount;
// SHA-512 hash of the contact of the purse.
h_contract_terms: HashCode;