diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/api-exchange.rst | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/core/api-exchange.rst b/core/api-exchange.rst index dce01745..0dcdc776 100644 --- a/core/api-exchange.rst +++ b/core/api-exchange.rst @@ -143,10 +143,8 @@ possibly by using HTTPS. // Denominations for which the exchange currently offers/requests recoup. recoup: Recoup[]; - // Fees relevant for wallet-to-wallet (or peer-to-peer) payments. - // If no fees are provided for a given time range, then the - // exchange simply does not support purses/p2p-payments at that time. - p2p_fees: P2PFees[]; + // Array of globally applicable fees by time range. + GlobalFees[]; // The date when the denomination keys were last updated. list_issue_date: Timestamp; @@ -176,13 +174,13 @@ possibly by using HTTPS. eddsa_pub: EddsaPublicKey; } - .. ts:def:: P2PFees + .. ts:def:: GlobalFees .. note:: This is a draft API that is not yet implemented. - interface P2PFees { + interface GlobalFees { // What date (inclusive) does these fees go into effect? start_date: Timestamp; @@ -196,9 +194,8 @@ possibly by using HTTPS. kyc_fee: Amount; // Account history fee, charged when a user wants to - // obtain the full account history, and not just the - // recent transactions in an account. - account_history_fee: Amount; + // obtain a reserve/account history. + history_fee: Amount; // Annual fee charged for having an open account at the // exchange. Charged to the account. If the account @@ -206,12 +203,16 @@ possibly by using HTTPS. // is automatically deleted/closed. (Note that the exchange // will keep the account history around for longer for // regulatory reasons.) - account_annual_fee: Amount; + account_fee: Amount; + + // Purse fee, charged only if a purse is abandoned + // and was not covered by the account limit. + purse_fee: Amount; // How long will the exchange preserve the account history? // After an account was deleted/closed, the exchange will // retain the account history for legal reasons until this time. - legal_history_retention: RelativeTime; + history_expiration: RelativeTime; // How long does the exchange promise to keep funds // an account for which the KYC has never happened @@ -220,10 +221,6 @@ possibly by using HTTPS. // forfeit. account_kyc_timeout: RelativeTime; - // Purse fee, charged only if a purse is abandoned - // and was not covered by the account limit. - purse_fee: Amount; - // Non-negative number of concurrent purses that any // account holder is allowed to create without having // to pay the purse_fee. @@ -235,7 +232,7 @@ possibly by using HTTPS. // plus this value. purse_timeout: RelativeTime; - // Signature of `TALER_P2PFeesPS`. + // Signature of `TALER_GlobalFeesPS`. master_sig: EddsaSignature; } |