[taler-docs] 22/36: revise purse amount handling

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository docs.

commit a846c5a30c7291e0bb514e5f639e96e079b30ff4
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue May 18 18:37:14 2021 +0200

    revise purse amount handling
---
 core/api-common.rst   |  8 ++++----
 core/api-exchange.rst | 24 +++++-------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/core/api-common.rst b/core/api-common.rst
index e5afa87..41e3b8f 100644
--- a/core/api-common.rst
+++ b/core/api-common.rst
@@ -1135,7 +1135,7 @@ within the
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_AmountNBO total_purse_amount;
+    struct TALER_AmountNBO merge_value_after_fees;
     struct GNUNET_HashCode h_contract_terms;
   };
 
@@ -1181,7 +1181,7 @@ within the
     struct TALER_ReservePublicKey reserve_pub;
     struct GNUNET_TIME_AbsoluteNBO merge_timestamp;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_AmountNBO purse_value_after_fees;
+    struct TALER_AmountNBO merge_value_after_fees;
     struct GNUNET_HashCode h_contract_terms;
     struct GNUNET_HashCode h_wire;
   };
@@ -1198,7 +1198,7 @@ within the
     struct TALER_PursePublicKey purse_pub;
     struct GNUNET_TIME_AbsoluteNBO merge_timestamp;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_AmountNBO purse_value_after_fees;
+    struct TALER_AmountNBO merge_value_after_fees;
     struct GNUNET_HashCode h_contract_terms;
     struct GNUNET_HashCode h_wire;
   };
@@ -1214,7 +1214,7 @@ within the
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct TALER_ReservePublicKey reserve_pub;
     struct TALER_PursePublicKey purse_pub;
-    struct TALER_AmountNBO merge_amount;
+    struct TALER_AmountNBO merge_amount_after_fees;
     struct GNUNET_TIME_AbsoluteNBO contract_time;
     struct GNUNET_HashCode h_contract_terms;
     struct GNUNET_HashCode h_wire;
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;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.