-complete extended reserve history signature check logic to libtalerexchange

2 files changed, 30 insertions, 20 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 7b62c9098..5829ebce1 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1511,21 +1511,11 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
       struct TALER_PurseMergePublicKeyP merge_pub;
 
       /**
-       * Purse signature.
-       */
-      struct TALER_PurseContractSignatureP purse_sig;
-
-      /**
        * Purse public key.
        */
       struct TALER_PurseContractPublicKeyP purse_pub;
 
       /**
-       * Merge signature.
-       */
-      struct TALER_PurseMergePublicKeyP merge_sig;
-
-      /**
        * Signature by the reserve approving the merge.
        */
       struct TALER_ReserveSignatureP reserve_sig;
@@ -1535,6 +1525,21 @@ struct TALER_EXCHANGE_ReserveHistoryEntry
        */
       struct GNUNET_TIME_Timestamp merge_timestamp;
 
+      /**
+       * When was the purse set to expire.
+       */
+      struct GNUNET_TIME_Timestamp purse_expiration;
+
+      /**
+       * Minimum age required for depositing into the purse.
+       */
+      uint32_t min_age;
+
+      /**
+       * Flags of the purse.
+       */
+      enum TALER_WalletAccountMergeFlags flags;
+
     } merge_details;
 
   } details;
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 8762b1928..5a5443eaf 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -1010,21 +1010,11 @@ struct TALER_EXCHANGEDB_PurseMerge
   struct TALER_PurseMergePublicKeyP merge_pub;
 
   /**
-   * Purse signature.
-   */
-  struct TALER_PurseContractSignatureP purse_sig;
-
-  /**
    * Purse public key.
    */
   struct TALER_PurseContractPublicKeyP purse_pub;
 
   /**
-   * Merge signature.
-   */
-  struct TALER_PurseMergePublicKeyP merge_sig;
-
-  /**
    * Signature by the reserve approving the merge.
    */
   struct TALER_ReserveSignatureP reserve_sig;
@@ -1034,6 +1024,21 @@ struct TALER_EXCHANGEDB_PurseMerge
    */
   struct GNUNET_TIME_Timestamp merge_timestamp;
 
+  /**
+   * When was the purse set to expire.
+   */
+  struct GNUNET_TIME_Timestamp purse_expiration;
+
+  /**
+   * Minimum age required for depositing into the purse.
+   */
+  uint32_t min_age;
+
+  /**
+   * Flags of the purse.
+   */
+  enum TALER_WalletAccountMergeFlags flags;
+
 };