taler-docs

commit b55de0ea66701350bdbaed16bf286b420f42e219
parent fe4c6b8d72d8077bacdd536665884a958cbeebec
Author: Christian Blättler <blatc2@bfh.ch>
Date:   Sat,  1 Jun 2024 15:41:39 +0200

move price and max_fee to contract choice

Diffstat:
M
design-documents/046-mumimo-contracts.rst
 | 
20
++++++++++----------

1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/design-documents/046-mumimo-contracts.rst b/design-documents/046-mumimo-contracts.rst
@@ -107,13 +107,6 @@ The contract terms v1 will have the following structure:
     // encoded in it (such as a short product identifier and timestamp).
     order_id: string;
 
-    // Price to be paid for the transaction. Could be 0.
-    // The price is in addition to other instruments,
-    // such as rations and tokens.
-    // The exchange will subtract deposit fees from that amount
-    // before transferring it to the merchant.
-    price: Amount;
-
     // URL where the same contract could be ordered again (if
     // available). Returned also at the public order endpoint
     // for people other than the actual buyer (hence public,
@@ -216,9 +209,6 @@ The contract terms v1 will have the following structure:
     // contract without storing it separately in their database.
     extra?: any;
 
-    // Maximum total deposit fee accepted by the merchant for this contract.
-    max_fee: Amount;
-
     // Exchanges that the merchant accepts for this currency.
     exchanges: Exchange[];
 
@@ -228,6 +218,13 @@ The contract terms v1 will have the following structure:
 
   interface ContractChoice {
 
+    // Price to be paid for this choice. Could be 0.
+    // The price is in addition to other instruments,
+    // such as rations and tokens.
+    // The exchange will subtract deposit fees from that amount
+    // before transferring it to the merchant.
+    price: Amount;
+
     // List of inputs the wallet must provision (all of them) to
     // satisfy the conditions for the contract.
     inputs: ContractInput[];
@@ -236,6 +233,9 @@ The contract terms v1 will have the following structure:
     // once the contract is paid.
     outputs: ContractOutput[];
 
+    // Maximum total deposit fee accepted by the merchant for this contract.
+    max_fee: Amount;
+
   }
 
 .. ts:def:: ContractInput