[taler-docs] branch master updated (a4f2424c -> df78b4db)

[gnunet]

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

christian-blaettler pushed a change to branch master
in repository docs.

    from a4f2424c Merge branch 'feature/tokens'
     new b19e504c DD46: contract choices should only represent different inputs 
and outputs
     new df78b4db DD46: remove limits struct

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 design-documents/046-mumimo-contracts.rst | 89 ++++++++++---------------------
 1 file changed, 28 insertions(+), 61 deletions(-)

diff --git a/design-documents/046-mumimo-contracts.rst 
b/design-documents/046-mumimo-contracts.rst
index 5f1d1d98..7d234110 100644
--- a/design-documents/046-mumimo-contracts.rst
+++ b/design-documents/046-mumimo-contracts.rst
@@ -143,6 +143,33 @@ The contract terms v1 will have the following structure:
     // More info about the merchant (same as in v0).
     merchant: Merchant;
 
+    // Human-readable description of the contract.
+    summary: string;
+
+    // Map from IETF BCP 47 language tags to localized summaries.
+    summary_i18n?: { [lang_tag: string]: string };
+
+    // URL that will show that the order was successful after
+    // it has been paid for.  Optional. When POSTing to the
+    // merchant, the placeholder "${ORDER_ID}" will be
+    // replaced with the actual order ID (useful if the
+    // order ID is generated server-side and needs to be
+    // in the URL).
+    // Note that this placeholder can only be used once.
+    // Either fulfillment_url or fulfillment_message must be specified.
+    fulfillment_url?: string;
+
+    // Message shown to the customer after paying for the order.
+    // Either fulfillment_url or fulfillment_message must be specified.
+    fulfillment_message?: string;
+
+    // Map from IETF BCP 47 language tags to localized fulfillment
+    // messages.
+    fulfillment_message_i18n?: { [lang_tag: string]: string };
+
+    // List of products that are part of the purchase (see `Product`).
+    products: Product[];
+
     // After this deadline has passed, no refunds will be accepted.
     refund_deadline: Timestamp;
 
@@ -187,78 +214,18 @@ The contract terms v1 will have the following structure:
     // contract without storing it separately in their database.
     extra?: any;
 
-    // Fee limits and wire account details by currency.
-    limits: { [currency: string]: CurrencyLimit };
-  }
-
-.. ts:def:: CurrencyLimit
-
-  interface CurrencyLimit {
-
-    // The hash of the merchant instance's wire details.
-    h_wire: HashCode;
-
-    // Wire transfer method identifier for the wire method associated with 
``h_wire``.
-    // The wallet may only select exchanges via a matching auditor if the
-    // exchange also supports this wire method.
-    // The wire transfer fees must be added based on this wire transfer method.
-    wire_method: string;
-
     // Maximum total deposit fee accepted by the merchant for this contract.
     max_fee: Amount;
 
-    // Maximum wire fee accepted by the merchant (customer share to be
-    // divided by the ``wire_fee_amortization`` factor, and further reduced
-    // if deposit fees are below ``max_fee``).  Default if missing is zero.
-    max_wire_fee?: Amount;
-
-    // Over how many customer transactions does the merchant expect to
-    // amortize wire fees on average?  If the exchange's wire fee is
-    // above ``max_wire_fee``, the difference is divided by this number
-    // to compute the expected customer's contribution to the wire fee.
-    // The customer's contribution may further be reduced by the difference
-    // between the ``max_fee`` and the sum of the actual deposit fees.
-    // Optional, default value if missing is 1.  0 and negative values are
-    // invalid and also interpreted as 1.
-    wire_fee_amortization?: number;
-
     // Exchanges that the merchant accepts for this currency.
     exchanges: Exchange[];
 
   }
 
-
 .. ts:def:: ContractChoice
 
   interface ContractChoice {
 
-    // Human-readable description of the choice.
-    summary: string;
-
-    // Map from IETF BCP 47 language tags to localized summaries.
-    summary_i18n?: { [lang_tag: string]: string };
-
-    // URL that will show that the order was successful after
-    // it has been paid for.  Optional. When POSTing to the
-    // merchant, the placeholder "${ORDER_ID}" will be
-    // replaced with the actual order ID (useful if the
-    // order ID is generated server-side and needs to be
-    // in the URL).
-    // Note that this placeholder can only be used once.
-    // Either fulfillment_url or fulfillment_message must be specified.
-    fulfillment_url?: string;
-
-    // Message shown to the customer after paying for the order.
-    // Either fulfillment_url or fulfillment_message must be specified.
-    fulfillment_message?: string;
-
-    // Map from IETF BCP 47 language tags to localized fulfillment
-    // messages.
-    fulfillment_message_i18n?: { [lang_tag: string]: string };
-
-    // List of products that are part of the purchase (see `Product`).
-    products: Product[];
-
     // List of inputs the wallet must provision (all of them) to
     // satisfy the conditions for the contract.
     inputs: ContractInput[];
@@ -267,7 +234,7 @@ The contract terms v1 will have the following structure:
     // once the contract is paid.
     outputs: ContractOutput[];
 
-    // Map from authority labels to meta data abou the
+    // Map from authority labels to meta data about the
     // respective token authority.
     token_types: { [authority_label: string]: TokenAuthority };
 

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