Merge branch 'master' into feature/tokens

4 files changed, 40 insertions, 16 deletions

diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h
index 8f5f4c4d2..d2bf918da 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -3277,11 +3277,16 @@ struct TALER_EXCHANGE_RefreshData
    */
   struct TALER_CoinSpendPrivateKeyP melt_priv;
 
-  /*
-   * age commitment and proof and its hash that went into the original coin,
+  /**
+   * age commitment and proof that went into the original coin,
    * might be NULL.
    */
   const struct TALER_AgeCommitmentProof *melt_age_commitment_proof;
+
+  /**
+   * Hash of age commitment and proof that went into the original coin,
+   * might be NULL.
+   */
   const struct TALER_AgeCommitmentHash *melt_h_age_commitment;
 
   /**
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index 9d541ac12..704f8012a 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -6669,6 +6669,23 @@ struct TALER_EXCHANGEDB_Plugin
 
 
   /**
+   * Fetch information about pending KYC requirement process.
+   *
+   * @param cls closure
+   * @param h_payto account that must be KYC'ed
+   * @param provider_section provider that must be checked
+   * @param[out] redirect_url set to redirect URL for the process
+   * @return database transaction status
+   */
+  enum GNUNET_DB_QueryStatus
+  (*get_pending_kyc_requirement_process)(
+    void *cls,
+    const struct TALER_PaytoHashP *h_payto,
+    const char *provider_section,
+    char **redirect_url);
+
+
+  /**
    * Update KYC process with updated provider-linkage and/or
    * expiration data.
    *
@@ -6678,6 +6695,7 @@ struct TALER_EXCHANGEDB_Plugin
    * @param h_payto account that must be KYC'ed (helps access by shard, otherwise also redundant)
    * @param provider_account_id provider account ID
    * @param provider_legitimization_id provider legitimization ID
+   * @param redirect_url where the user should be redirected to start the KYC process
    * @param expiration how long is this KYC check set to be valid (in the past if invalid)
    * @return database transaction status
    */
@@ -6689,6 +6707,7 @@ struct TALER_EXCHANGEDB_Plugin
     const struct TALER_PaytoHashP *h_payto,
     const char *provider_account_id,
     const char *provider_legitimization_id,
+    const char *redirect_url,
     struct GNUNET_TIME_Absolute expiration);
 
 
diff --git a/src/include/taler_kyclogic_plugin.h b/src/include/taler_kyclogic_plugin.h
index 22e4f894f..a9a4dd97a 100644
--- a/src/include/taler_kyclogic_plugin.h
+++ b/src/include/taler_kyclogic_plugin.h
@@ -99,7 +99,13 @@ enum TALER_KYCLOGIC_KycStatus
    * Return code set to not update the KYC status
    * at all.
    */
-  TALER_KYCLOGIC_STATUS_KEEP = 16
+  TALER_KYCLOGIC_STATUS_KEEP = 16,
+
+  /**
+   * We had an internal logic failure.
+   */
+  TALER_KYCLOGIC_STATUS_INTERNAL_ERROR = 32
+
 };
 
 
diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h
index 136967187..a0a25832b 100644
--- a/src/include/taler_testing_lib.h
+++ b/src/include/taler_testing_lib.h
@@ -126,6 +126,12 @@ struct TALER_TESTING_Credentials
   struct TALER_BANK_AuthenticationData ba;
 
   /**
+   * Bank authentication details for the admin bank
+   * account.
+   */
+  struct TALER_BANK_AuthenticationData ba_admin;
+
+  /**
    * Configuration file data.
    */
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -591,19 +597,6 @@ TALER_TESTING_parse_coin_reference (
   unsigned int *idx);
 
 
-/**
- * Compare @a h1 and @a h2.
- *
- * @param h1 a history entry
- * @param h2 a history entry
- * @return 0 if @a h1 and @a h2 are equal
- */
-int
-TALER_TESTING_history_entry_cmp (
-  const struct TALER_EXCHANGE_ReserveHistoryEntry *h1,
-  const struct TALER_EXCHANGE_ReserveHistoryEntry *h2);
-
-
 /* ************** Specific interpreter commands ************ */
 
 
@@ -2721,6 +2714,7 @@ TALER_TESTING_get_trait (const struct TALER_TESTING_Trait *traits,
   op (age_commitment_proof, const struct TALER_AgeCommitmentProof)      \
   op (h_age_commitment, const struct TALER_AgeCommitmentHash)           \
   op (reserve_history, const struct TALER_EXCHANGE_ReserveHistoryEntry) \
+  op (coin_history, const struct TALER_EXCHANGE_CoinHistoryEntry) \
   op (planchet_secrets, const struct TALER_PlanchetMasterSecretP)       \
   op (exchange_wd_value, const struct TALER_ExchangeWithdrawValues)     \
   op (coin_priv, const struct TALER_CoinSpendPrivateKeyP)               \