p2p issue discovered, resolution proposed

2 files changed, 26 insertions, 30 deletions

diff --git a/core/api-common.rst b/core/api-common.rst
index 23907217..1e6362f3 100644
--- a/core/api-common.rst
+++ b/core/api-common.rst
@@ -1207,8 +1207,6 @@ within the
   };
 
 
-
-
 .. _TALER_ReserveStatusRequestSignaturePS:
 .. sourcecode:: c
 
@@ -1267,7 +1265,7 @@ within the
 
   struct TALER_ReserveCloseRequestSignaturePS {
     /**
-     * purpose.purpose = TALER_SIGNATURE_RESERVE_CLOSE
+     * purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
   };
@@ -1285,12 +1283,13 @@ within the
 
   struct TALER_PurseRequestSignaturePS {
     /**
-     * purpose.purpose = TALER_SIGNATURE_PURSE_REQUEST
+     * purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_CREATE
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
     struct TALER_AmountNBO merge_value_after_fees;
-    struct TALER_PrivateContractHash h_contract_terms;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    uint32_t min_age;
   };
 
 
@@ -1303,9 +1302,7 @@ within the
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct TALER_AmountNBO coin_contribution;
-    struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_PursePublicKey purse_pub;
-    struct TALER_PrivateContractHash h_contract_terms;
+    struct TALER_PursePublicKeyP purse_pub;
   };
 
 
@@ -1319,9 +1316,9 @@ within the
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
     struct TALER_AmountNBO total_purse_amount;
     struct TALER_AmountNBO total_deposit_fees;
-    struct TALER_PursePublicKey purse_pub;
+    struct TALER_PursePublicKeyP purse_pub;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_PrivateContractHash h_contract_terms;
+    struct TALER_PrivateContractHashP h_contract_terms;
   };
 
 .. _TALER_PurseMergeSignaturePS:
@@ -1329,15 +1326,11 @@ within the
 
   struct TALER_PurseMergeSignaturePS {
     /**
-     * purpose.purpose = TALER_SIGNATURE_PURSE_MERGE
+     * purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_MERGE
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-    struct TALER_ReservePublicKey reserve_pub;
     struct GNUNET_TIME_AbsoluteNBO merge_timestamp;
-    struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_AmountNBO merge_value_after_fees;
-    struct TALER_PrivateContractHash h_contract_terms;
-    struct TALER_PaytoHash h_wire;
+    struct TALER_PaytoHashP h_wire;
   };
 
 
@@ -1346,15 +1339,16 @@ within the
 
   struct TALER_AccountMergeSignaturePS {
     /**
-     * purpose.purpose = TALER_SIGNATURE_ACCOUNT_MERGE
+     * purpose.purpose = TALER_SIGNATURE_WALLET_ACCOUNT_MERGE
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-    struct TALER_PursePublicKey purse_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_PursePublicKeyP purse_pub;
+    struct TALER_AmountNBO merge_amount_after_fees;
     struct GNUNET_TIME_AbsoluteNBO merge_timestamp;
     struct GNUNET_TIME_AbsoluteNBO purse_expiration;
-    struct TALER_AmountNBO merge_value_after_fees;
-    struct TALER_PrivateContractHash h_contract_terms;
-    struct TALER_PaytoHash h_wire;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    uint32_t min_age;
   };
 
 
@@ -1366,12 +1360,13 @@ within the
      * purpose.purpose = TALER_SIGNATURE_PURSE_MERGE_SUCCESS
      */
     struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-    struct TALER_ReservePublicKey reserve_pub;
-    struct TALER_PursePublicKey purse_pub;
+    struct TALER_ReservePublicKeyP reserve_pub;
+    struct TALER_PursePublicKeyP purse_pub;
     struct TALER_AmountNBO merge_amount_after_fees;
     struct GNUNET_TIME_AbsoluteNBO contract_time;
-    struct TALER_PrivateContractHash h_contract_terms;
-    struct TALER_PaytoHash h_wire;
+    struct TALER_PrivateContractHashP h_contract_terms;
+    struct TALER_PaytoHashP h_wire;
+    uint32_t min_age;
   };
 
 
diff --git a/core/api-exchange.rst b/core/api-exchange.rst
index 03c9c235..203b1c92 100644
--- a/core/api-exchange.rst
+++ b/core/api-exchange.rst
@@ -3000,6 +3000,7 @@ Wallet-to-wallet transfers
   Obtain information about a purse. The request header must
   contain a *Purse-Request-Signature*.  Endpoint used by
   the party that did not create the purse.
+  TODO: maybe use POST to /purses/$PURSE_PUB/status instead?
 
   **Request:**
 
@@ -3007,11 +3008,11 @@ Wallet-to-wallet transfers
 
   :query merge_timeout_ms=NUMBER: *Optional.*  If specified,
     the exchange
-    will wait up to ``timeout_ms`` milliseconds for completion
+    will wait up to ``NUMBER`` milliseconds for completion
     of a merge operation before sending the HTTP response.
   :query deposit_timeout_ms=NUMBER: *Optional.*  If specified,
     the exchange
-    will wait up to ``timeout_ms`` milliseconds for completion
+    will wait up to ``NUMBER`` milliseconds for completion
     of a deposit operation before sending the HTTP response.
   :query contract=BOOLEAN: *Optional.*  If 'false' is specified,
     the exchange will not return the encrypted contract, saving
@@ -3143,7 +3144,7 @@ Wallet-to-wallet transfers
 
       // EdDSA signature of the purse over a
       // `TALER_PurseRequestSignaturePS`
-      // of purpose ``TALER_SIGNATURE_PURSE_REQUEST``
+      // of purpose ``TALER_SIGNATURE_WALLET_PURSE_CREATE``
       // confirming the key
       // invariants associated with the purse.
       // (amount, h_contract_terms, expiration).
@@ -3213,7 +3214,7 @@ Wallet-to-wallet transfers
       ub_sig: DenominationSignature;
 
       // Signature over `TALER_PurseDepositSignaturePS`
-      // of purpose ``TALER_SIGNATURE_PURSE_DEPOSIT``
+      // of purpose ``TALER_SIGNATURE_WALLET_PURSE_DEPOSIT``
       // made by the customer with the
       // `coin's private key <coin-priv>`.
       coin_sig: EddsaSignature;
@@ -3291,7 +3292,7 @@ Wallet-to-wallet transfers
 
       // EdDSA signature of the purse over
       // `TALER_PurseMergeSignaturePS` of
-      // purpose ``TALER_SIGNATURE_PURSE_MERGE``
+      // purpose ``TALER_SIGNATURE_WALLET_PURSE_MERGE``
       // confirming that the
       // above details hold for this purse.
       purse_sig: EddsaSignature;