From c2c8646a83c07662e1246f768c23e71c687ddcb0 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 10 Mar 2015 16:15:14 +0100
Subject: combining /mint/melt and /mint/commit

---
 src/include/taler_signatures.h | 65 ++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 44 deletions(-)

(limited to 'src/include/taler_signatures.h')

diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index bf39c0ab..9e3068a7 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -56,29 +56,24 @@
 #define TALER_SIGNATURE_WITHDRAW 4
 
 /**
- * Signature where the refresh session confirms
- * the list of melted coins and requested denominations.
+ * Signature using a coin key confirming the melting of
+ * a coin.
  */
-#define TALER_SIGNATURE_REFRESH_MELT 5
+#define TALER_SIGNATURE_REFRESH_MELT_COIN 5
 
 /**
  * Signature where the refresh session confirms
  * the commits.
  */
-#define TALER_SIGNATURE_REFRESH_COMMIT 6
+#define TALER_SIGNATURE_REFRESH_MELT 6
 
 /**
  * Signature where the mint (current signing key)
- * confirms the list of blind session keys.
+ * confirms the no-reveal index for cut-and-choose and
+ * the validity of the melted coins.
  */
 #define TALER_SIGNATURE_REFRESH_MELT_RESPONSE 7
 
-/**
- * Signature where the mint (current signing key)
- * confirms the no-reveal index for cut-and-choose.
- */
-#define TALER_SIGNATURE_REFRESH_COMMIT_RESPONSE 8
-
 /**
  * Signature where coins confirm that they want
  * to be melted into a certain session.
@@ -234,17 +229,21 @@ struct TALER_DepositConfirmation
 
 
 /**
- * Format of the block signed by the Mint in response to
- * a successful "/refresh/melt" request.  Hereby the mint
- * affirms that all of the coins were successfully melted.
+ * Message signed by a coin to indicate that the coin should
+ * be melted.
  */
-struct RefreshMeltResponseSignatureBody
+struct RefreshMeltSignatureBody
 {
   /**
-   * Purpose is #TALER_SIGNATURE_REFRESH_MELT_RESPONSE.
+   * Purpose is #TALER_SIGNATURE_REFRESH_MELT_COIN.
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
+  /**
+   * Which melting operation should the coin become a part of.
+   */
+  struct GNUNET_HashCode melt_hash;
+
   /**
    * Signature of the client over the melt request (thereby
    * indirectly including all of the information the client
@@ -258,30 +257,6 @@ struct RefreshMeltResponseSignatureBody
    */
   struct GNUNET_CRYPTO_EddsaPublicKey session_key;
 
-  /**
-   * Security parameter requested for the commitments.
-   */
-  uint32_t kappa GNUNET_PACKED;
-
-};
-
-
-/**
- * Message signed by a coin to indicate that the coin should
- * be melted.
- */
-struct RefreshMeltSignatureBody
-{
-  /**
-   * Purpose is #TALER_SIGNATURE_REFRESH_MELT.
-   */
-  struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
-
-  /**
-   * Which melting operation should the coin become a part of.
-   */
-  struct GNUNET_HashCode melt_hash;
-
   /**
    * How much of the value of the coin should be melted?
    * This amount includes the fees, so the final amount contributed
@@ -298,7 +273,7 @@ struct RefreshMeltSignatureBody
 struct RefreshCommitSignatureBody
 {
   /**
-   * Purpose is #TALER_SIGNATURE_REFRESH_COMMIT.
+   * Purpose is #TALER_SIGNATURE_REFRESH_MELT.
    */
   struct GNUNET_CRYPTO_EccSignaturePurpose purpose;
 
@@ -310,10 +285,12 @@ struct RefreshCommitSignatureBody
 
 
 /**
- * Message signed by the mint, committing it to a particular
- * index to not be revealed during the refresh.
+ * Format of the block signed by the Mint in response to a successful
+ * "/refresh/melt" request.  Hereby the mint affirms that all of the
+ * coins were successfully melted.  This also commits the mint to a
+ * particular index to not be revealed during the refresh.
  */
-struct RefreshCommitResponseSignatureBody
+struct RefreshMeltResponseSignatureBody
 {
   /**
    * Purpose is #TALER_SIGNATURE_REFRESH_MELT_RESPONSE.
-- 
cgit v1.2.3