12 files changed, 71 insertions, 40 deletions
diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h
index 31e6723a5..b83d6316c 100644
--- a/src/include/taler_auditordb_plugin.h
+++ b/src/include/taler_auditordb_plugin.h
@@ -628,7 +628,7 @@ typedef enum GNUNET_GenericReturnValue
  * @param batch_deposit_serial_id where in the table are we
  * @param total_amount value of all missing deposits, including fees
  * @param wire_target_h_payto hash of the recipient account's payto URI
- * @param earliest_deadline what was the earliest requested wire transfer deadline
+ * @param deadline what was the earliest requested wire transfer deadline
  */
 typedef void
 (*TALER_AUDITORDB_WireMissingCallback)(
diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index cecd0562e..0b80ff071 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -1717,7 +1717,7 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info,
  * Compute the hash of a blinded coin.
  *
  * @param blinded_planchet blinded planchet
- * @param denom_hash hash of the denomination publick key
+ * @param denom_hash hash of the denomination public key
  * @param[out] bch where to write the hash
  * @return #GNUNET_OK when successful, #GNUNET_SYSERR if an internal error occurred
  */
@@ -2324,7 +2324,7 @@ struct TALER_CRYPTO_RsaDenominationHelper;
  * @param validity_duration how long does the key remain available for signing;
  *                 zero if the key has been revoked or purged
  * @param h_rsa hash of the RSA @a denom_pub that is available (or was purged)
- * @param denom_pub the public key itself, NULL if the key was revoked or purged
+ * @param bs_pub the public key itself, NULL if the key was revoked or purged
  * @param sm_pub public key of the security module, NULL if the key was revoked or purged
  * @param sm_sig signature from the security module, NULL if the key was revoked or purged
  *               The signature was already verified against @a sm_pub.
@@ -4682,7 +4682,7 @@ TALER_exchange_online_age_withdraw_confirmation_sign (
 
 
 /**
- * Verfiy an exchange age-withdraw confirmation
+ * Verify an exchange age-withdraw confirmation
  *
  * @param h_commitment Commitment over all n*kappa coin candidates from the original request to age-withdraw
  * @param noreveal_index The index returned by the exchange
@@ -5727,7 +5727,7 @@ TALER_age_commitment_derive (
  *
  * @param comm_proof The age commitment to be used for attestation.  For successful attestation, it must contain the private key for the corresponding age group.
  * @param age Age (not age group) for which the an attestation should be done
- * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
+ * @param[out] attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
  * @return #GNUNET_OK on success, #GNUNET_NO when no attestation can be made for that age with the given commitment, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
@@ -5742,7 +5742,7 @@ TALER_age_commitment_attest (
  *
  * @param commitment The age commitment that went into the attestation.  Only the public keys are needed.
  * @param age Age (not age group) for which the an attestation should be done
- * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicaple.
+ * @param attest Signature of the age with the appropriate key from the age commitment for the corresponding age group, if applicable.
  * @return #GNUNET_OK when the attestation was successful, #GNUNET_NO no attestation couldn't be verified, #GNUNET_SYSERR otherwise
  */
 enum GNUNET_GenericReturnValue
@@ -5867,7 +5867,7 @@ struct TALER_DenominationGroup
   enum GNUNET_CRYPTO_BlindSignatureAlgorithm cipher;
 
   /**
-   * Age mask for the denomiation.
+   * Age mask for the denomination.
    */
   struct TALER_AgeMask age_mask;
 
diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 7b9b1dd41..b2e513341 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -815,7 +815,7 @@ TALER_EXCHANGE_keys_incref (struct TALER_EXCHANGE_Keys *keys);
 
 
 /**
- * Deccrement reference counter for @a keys.
+ * Decrement reference counter for @a keys.
  * Frees @a keys if reference counter becomes zero.
  *
  * @param[in,out] keys object to decrement reference counter for
@@ -1767,7 +1767,6 @@ struct TALER_EXCHANGE_CoinsHistoryHandle;
  * @param dk denomination key of the coin
  * @param history JSON array with the coin's history
  * @param coin_pub public key of the coin
- * @param currency currency of the coin
  * @param[out] total_in set to total amount credited to the coin in @a history
  * @param[out] total_out set to total amount debited to the coin in @a history
  * @param rlen length of the @a rhistory array
@@ -1871,15 +1870,12 @@ typedef void
  * have to combine multiple partial coin histories
  * into one coherent history before calling this function.
  *
- * @param keys /keys data of the exchange
- * @param dk denomination key of the coin
- * @param history JSON array with the coin's full history
- * @param coin_pub public key of the coin
- * @param currency currency of the coin
- * @param[out] total_in set to total amount credited to the coin in @a history
- * @param[out] total_out set to total amount debited to the coin in @a history
- * @param len length of the @a rhistory
- * @param[out] rhistory where to write the parsed @a history
+ * @param ctx context for managing request
+ * @param url base URL of the exchange
+ * @param coin_priv private key of the coin
+ * @param start_off offset from which on to request history
+ * @param cb function to call with results
+ * @param cb_cls closure for @a cb
  * @return #GNUNET_OK if @a history is valid,
  *         #GNUNET_SYSERR if not
  */
@@ -1896,7 +1892,7 @@ TALER_EXCHANGE_coins_history (
 /**
  * Cancel #TALER_EXCHANGE_coins_history() operation.
  *
- * @param[in] rsh operation to chancel
+ * @param[in] rsh operation to cancel
  */
 void
 TALER_EXCHANGE_coins_history_cancel (
@@ -2996,7 +2992,7 @@ typedef void
  * @param curl_ctx The curl context
  * @param exchange_url The base url of the exchange
  * @param keys The denomination keys from the exchange
- * @param reserve_priv The pivate key to the reserve
+ * @param reserve_priv The private key to the reserve
  * @param num_coins The number of elements in @e coin_inputs
  * @param coin_inputs The input for the coins to withdraw
  * @param max_age The maximum age we commit to.
diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h
index 17b01b0ad..d93cf9d6c 100644
--- a/src/include/taler_exchangedb_lib.h
+++ b/src/include/taler_exchangedb_lib.h
@@ -69,13 +69,13 @@ struct TALER_EXCHANGEDB_AccountInfo
   const char *method;
 
   /**
-   * true if this account is enabed to be debited
+   * true if this account is enabled to be debited
    * by the taler-exchange-aggregator.
    */
   bool debit_enabled;
 
   /**
-   * true if this account is enabed to be credited by wallets
+   * true if this account is enabled to be credited by wallets
    * and needs to be watched by the taler-exchange-wirewatch.
    * Also, the account will only be included in /wire if credit
    * is enabled.
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 704f8012a..6da278637 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -3401,7 +3401,7 @@ typedef void
  * @param batch_deposit_serial_id where in the table are we
  * @param total_amount value of all missing deposits, including fees
  * @param wire_target_h_payto hash of the recipient account's payto URI
- * @param earliest_deadline what was the earliest requested wire transfer deadline
+ * @param deadline what was the earliest requested wire transfer deadline
  */
 typedef void
 (*TALER_EXCHANGEDB_WireMissingCallback)(
@@ -5530,7 +5530,7 @@ struct TALER_EXCHANGEDB_Plugin
    * above a given @a min_batch_deposit_serial_id.
    *
    * @param cls closure
-   * @param min_batch_deposit_serial_id only return entries stricly above this row (and in order)
+   * @param min_batch_deposit_serial_id only return entries strictly above this row (and in order)
    * @param cb function to call on all such deposits
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -5548,7 +5548,7 @@ struct TALER_EXCHANGEDB_Plugin
    * above a given @a min_tracking_serial_id.
    *
    * @param cls closure
-   * @param min_tracking_serial_id only return entries stricly above this row (and in order)
+   * @param min_tracking_serial_id only return entries strictly above this row (and in order)
    * @param cb function to call on all such aggregations
    * @param cb_cls closure for @a cb
    * @return transaction status code
@@ -7088,7 +7088,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param new_status AML decision status
    * @param decision_time when was the decision made
    * @param justification human-readable text justifying the decision
-   * @param kyc_requirements specific KYC requiremnts being imposed
+   * @param kyc_requirements specific KYC requirements being imposed
    * @param requirements_row row in the KYC table for this process, 0 for none
    * @param decider_pub public key of the staff member
    * @param decider_sig signature of the staff member
diff --git a/src/include/taler_extensions.h b/src/include/taler_extensions.h
index fe1eac276..1eb567f72 100644
--- a/src/include/taler_extensions.h
+++ b/src/include/taler_extensions.h
@@ -162,6 +162,7 @@ struct TALER_Extension
    * (see https://docs.taler.net/core/api-exchange.html#deposit), this handler
    * will be called before the deposit transaction.
    *
+   * @param[in]  currency Currency used in the exchange
    * @param[in]  policy_json Details about the policy, provided by the client
    *             during a deposit request.
    * @param[out] details On success, will contain the details to the policy,
@@ -170,6 +171,7 @@ struct TALER_Extension
    * @return     GNUNET_OK if the data was accepted by the extension.
    */
   enum GNUNET_GenericReturnValue (*create_policy_details)(
+    const char *currency,
     const json_t *policy_json,
     struct TALER_PolicyDetails *details,
     const char **error_hint);
diff --git a/src/include/taler_extensions_policy.h b/src/include/taler_extensions_policy.h
index ecb4e2628..7750f58f1 100644
--- a/src/include/taler_extensions_policy.h
+++ b/src/include/taler_extensions_policy.h
@@ -31,21 +31,24 @@
  */
 enum TALER_PolicyFulfillmentState
 {
+  /* Initial state of an fulfillment, before any other state. */
+  TALER_PolicyFulfillmentInitial = 0,
+
   /* General error state of an fulfillment. */
-  TALER_PolicyFulfillmentFailure = 0,
+  TALER_PolicyFulfillmentFailure = 1,
 
   /* The policy is not yet ready due to insufficient funding. More deposits are
    * necessary for it to become ready . */
-  TALER_PolicyFulfillmentInsufficient = 1,
+  TALER_PolicyFulfillmentInsufficient = 2,
 
   /* The policy is funded and ready, pending */
-  TALER_PolicyFulfillmentReady = 2,
+  TALER_PolicyFulfillmentReady = 3,
 
   /* Policy is provably fulfilled. */
-  TALER_PolicyFulfillmentSuccess = 3,
+  TALER_PolicyFulfillmentSuccess = 4,
 
   /* Policy fulfillment has timed out */
-  TALER_PolicyFulfillmentTimeout = 4,
+  TALER_PolicyFulfillmentTimeout = 5,
 
   TALER_PolicyFulfillmentStateCount = TALER_PolicyFulfillmentTimeout + 1
 };
@@ -68,7 +71,7 @@ struct TALER_PolicyDetails
   /* Content of the policy in its original JSON form */
   json_t *policy_json;
 
-  /* When the deadline is meat and the policy is still in "Ready" state,
+  /* When the deadline is met and the policy is still in "Ready" state,
    * a timeout-handler will transfer the amount
    *    (total_amount - policy_fee - refreshable_amount)
    * to the payto-URI from the corresponding deposit.  The value
@@ -143,6 +146,7 @@ struct TALER_PolicyFulfillmentTransactionData
 /*
  * @brief Extracts policy details from the deposit's policy options and the policy extensions
  *
+ * @param[in]  currency Currency used in the exchange
  * @param[in]  policy_options JSON of the policy options from a deposit request
  * @param[out] details On GNUNET_OK, the parsed details
  * @param[out] error_hint On GNUNET_SYSERR, will contain a hint for the reason why it failed
@@ -151,6 +155,7 @@ struct TALER_PolicyFulfillmentTransactionData
  */
 enum GNUNET_GenericReturnValue
 TALER_extensions_create_policy_details (
+  const char *currency,
   const json_t *policy_options,
   struct TALER_PolicyDetails *details,
   const char **error_hint);
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index dc8061705..51fd17dd0 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -425,7 +425,7 @@ struct TALER_JSON_ProtocolVersion
   /**
    * Number of protocol versions this @e revision is
    * backwards-compatible with.  Subtract this number
-   * from @a current to get the minimum protocol version
+   * from @e current to get the minimum protocol version
    * required from the client.
    */
   unsigned int age;
@@ -438,15 +438,14 @@ struct TALER_JSON_ProtocolVersion
  * encoding the version as "$CURRENT:$REVISION:$AGE".
  *
  * @param field name of the field (usually "version")
- * @param[out] current protocol current to initialize
- * @param[out] revision protocol revision to initialize
- * @param[out] age protocol age to initialize
+ * @param[out] ver protocol versions to initialize
  * @return corresponding field spec
  */
 struct GNUNET_JSON_Specification
 TALER_JSON_spec_version (const char *field,
                          struct TALER_JSON_ProtocolVersion *ver);
 
+
 /**
  * Generate a parser specification for a denomination public key of a given
  * cipher.
diff --git a/src/include/taler_kyclogic_lib.h b/src/include/taler_kyclogic_lib.h
index dfa4c58ac..4d0c18fa4 100644
--- a/src/include/taler_kyclogic_lib.h
+++ b/src/include/taler_kyclogic_lib.h
@@ -259,7 +259,7 @@ TALER_KYCLOGIC_check_satisfied (char **requirements,
  * Iterate over all thresholds that are applicable
  * to a particular type of @a event
  *
- * @param event tresholds to look up
+ * @param event thresholds to look up
  * @param it function to call on each
  * @param it_cls closure for @a it
  */
diff --git a/src/include/taler_mhd_lib.h b/src/include/taler_mhd_lib.h
index 60c5b209d..db6db05e8 100644
--- a/src/include/taler_mhd_lib.h
+++ b/src/include/taler_mhd_lib.h
@@ -481,7 +481,7 @@ TALER_MHD_parse_request_arg_timeout (struct MHD_Connection *connection,
  *
  * @param connection the MHD connection
  * @param name name of the query parameter
- * @param[out] off set to the offet, unchanged if the
+ * @param[out] off set to the offset, unchanged if the
  *             option was not given
  * @return #GNUNET_OK on success,
  *         #GNUNET_NO if an error was returned on @a connection (caller should return #MHD_YES) and
diff --git a/src/include/taler_pq_lib.h b/src/include/taler_pq_lib.h
index 06e7d53ed..a529b4302 100644
--- a/src/include/taler_pq_lib.h
+++ b/src/include/taler_pq_lib.h
@@ -165,6 +165,19 @@ TALER_PQ_query_param_array_blinded_coin_hash (
 
 
 /**
+ * Generate query parameter for an array of GNUNET_HashCode
+ *
+ * @param num number of elements in @e hash_codes
+ * @param hashes array of GNUNET_HashCode
+ * @param db context for the db-connection
+ */
+struct GNUNET_PQ_QueryParam
+TALER_PQ_query_param_array_hash_code (
+  size_t num,
+  const struct GNUNET_HashCode *hashes,
+  struct GNUNET_PQ_Context *db);
+
+/**
  * Generate query parameter for an array of mounts
  *
  * @param num of elements in @e amounts
@@ -356,6 +369,22 @@ TALER_PQ_result_spec_array_denom_hash (
 
 
 /**
+ * Array of GNUNET_HashCode
+ *
+ * @param db context of the database connection
+ * @param name name of the field in the table
+ * @param[out] num number of elements in @e denom_sigs
+ * @param[out] hashes where to store the result
+ * @return array entry for the result specification to use
+ */
+struct GNUNET_PQ_ResultSpec
+TALER_PQ_result_spec_array_hash_code (
+  struct GNUNET_PQ_Context *db,
+  const char *name,
+  size_t *num,
+  struct GNUNET_HashCode **hashes);
+
+/**
  * Array of amounts
  *
  * @param db context of the database connection
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index a0a25832b..90f6ade88 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -1151,7 +1151,7 @@ TALER_TESTING_cmd_age_withdraw_reveal (
  * @param amount how much we withdraw.
  * @param age if > 0, age restriction applies.
  * @param coin_ref reference to (withdraw/reveal) command of a coin
- *        from which we should re-use the private key
+ *        from which we should reuse the private key
  * @param expected_response_code which HTTP response code
  *        we expect from the exchange.
  * @return the withdraw command to be executed by the interpreter.
@@ -1919,7 +1919,7 @@ struct TALER_TESTING_Timer
   struct GNUNET_TIME_Relative total_duration;
 
   /**
-   * Total time spend waiting for the *successful* exeuction
+   * Total time spend waiting for the *successful* execution
    * in all commands of this type.
    */
   struct GNUNET_TIME_Relative success_latency;