diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/taler_exchangedb_lib.h | 356 | ||||
| -rw-r--r-- | src/include/taler_testing_lib.h | 36 |
2 files changed, 11 insertions, 381 deletions
diff --git a/src/include/taler_exchangedb_lib.h b/src/include/taler_exchangedb_lib.h index 5400330ee..b68c0d66c 100644 --- a/src/include/taler_exchangedb_lib.h +++ b/src/include/taler_exchangedb_lib.h @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014-2017 Taler Systems SA + Copyright (C) 2014-2020 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -27,250 +27,6 @@ #include "taler_exchangedb_plugin.h" #include "taler_bank_service.h" -/** - * Subdirectroy under the exchange's base directory which contains - * the exchange's signing keys. - */ -#define TALER_EXCHANGEDB_DIR_SIGNING_KEYS "signkeys" - -/** - * Subdirectory under the exchange's base directory which contains - * the exchange's denomination keys. - */ -#define TALER_EXCHANGEDB_DIR_DENOMINATION_KEYS "denomkeys" - - -/** - * @brief Iterator over signing keys. - * - * @param cls closure - * @param filename name of the file the key came from - * @param ski the sign key - * @return #GNUNET_OK to continue to iterate, - * #GNUNET_NO to stop iteration with no error, - * #GNUNET_SYSERR to abort iteration with error! - */ -typedef int -(*TALER_EXCHANGEDB_SigningKeyIterator)( - void *cls, - const char *filename, - const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); - - -/** - * Call @a it for each signing key found in the @a exchange_base_dir. - * - * @param exchange_base_dir base directory for the exchange, - * the signing keys must be in the #TALER_EXCHANGEDB_DIR_SIGNING_KEYS - * subdirectory - * @param it function to call on each signing key - * @param it_cls closure for @a it - * @return number of files found (may not match - * number of keys given to @a it as malformed - * files are simply skipped), -1 on error - */ -int -TALER_EXCHANGEDB_signing_keys_iterate (const char *exchange_base_dir, - TALER_EXCHANGEDB_SigningKeyIterator it, - void *it_cls); - - -/** - * Exports a signing key to the given file. - * - * @param exchange_base_dir base directory for the keys - * @param start start time of the validity for the key - * @param ski the signing key - * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. - */ -int -TALER_EXCHANGEDB_signing_key_write ( - const char *exchange_base_dir, - struct GNUNET_TIME_Absolute start, - const struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *ski); - - -/** - * @brief Iterator over denomination keys. - * - * @param cls closure - * @param alias coin alias - * @param dki the denomination key - * @return #GNUNET_OK to continue to iterate, - * #GNUNET_NO to stop iteration with no error, - * #GNUNET_SYSERR to abort iteration with error! - */ -typedef int -(*TALER_EXCHANGEDB_DenominationKeyIterator)( - void *cls, - const char *alias, - const struct TALER_EXCHANGEDB_DenominationKey *dki); - - -/** - * @brief Iterator over revoked denomination keys. - * - * @param cls closure - * @param denom_hash hash of the denomination public key - * @param revocation_master_sig signature showing @a denom_hash was revoked - * @return #GNUNET_OK to continue to iterate, - * #GNUNET_NO to stop iteration with no error, - * #GNUNET_SYSERR to abort iteration with error! - */ -typedef int -(*TALER_EXCHANGEDB_RevocationIterator)( - void *cls, - const struct GNUNET_HashCode *denom_hash, - const struct TALER_MasterSignatureP *revocation_master_sig); - - -/** - * Call @a it for each denomination key found in the @a exchange_base_dir. - * - * @param exchange_base_dir base directory for the exchange, - * the signing keys must be in the #TALER_EXCHANGEDB_DIR_DENOMINATION_KEYS - * subdirectory - * @param it function to call on each denomination key found - * @param it_cls closure for @a it - * @return -1 on error, 0 if no files were found, otherwise - * a positive number (however, even with a positive - * number it is possible that @a it was never called - * as maybe none of the files were well-formed) - */ -int -TALER_EXCHANGEDB_denomination_keys_iterate ( - const char *exchange_base_dir, - TALER_EXCHANGEDB_DenominationKeyIterator it, - void *it_cls); - - -/** - * Call @a it for each revoked denomination key found in the @a revocation_dir. - * - * @param revocation_dir base directory where revocations are stored - * @param master_pub master public key (used to check revocations) - * @param it function to call on each revoked denomination key found - * @param it_cls closure for @a it - * @return -1 on error, 0 if no files were found, otherwise - * a positive number (however, even with a positive - * number it is possible that @a it was never called - * as maybe none of the files were well-formed) - */ -int -TALER_EXCHANGEDB_revocations_iterate ( - const char *revocation_dir, - const struct TALER_MasterPublicKeyP *master_pub, - TALER_EXCHANGEDB_RevocationIterator it, - void *it_cls); - - -/** - * Mark the given denomination key as revoked and request the wallets - * to initiate recoup. - * - * @param revocation_dir where to write the revocation certificate - * @param denom_hash hash of the denomination key to revoke - * @param mpriv master private key to sign with - * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. - */ -int -TALER_EXCHANGEDB_denomination_key_revoke ( - const char *revocation_dir, - const struct GNUNET_HashCode *denom_hash, - const struct TALER_MasterPrivateKeyP *mpriv); - - -/** - * Exports a denomination key to the given file. - * - * @param filename the file where to write the denomination key - * @param dki the denomination key - * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. - */ -int -TALER_EXCHANGEDB_denomination_key_write ( - const char *filename, - const struct TALER_EXCHANGEDB_DenominationKey *dki); - - -/** - * Import a denomination key from the given file. - * - * @param filename the file to import the key from - * @param[out] dki set to the imported denomination key - * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure - */ -int -TALER_EXCHANGEDB_denomination_key_read ( - const char *filename, - struct TALER_EXCHANGEDB_DenominationKey *dki); - - -/** - * @brief Iterator over auditor information. - * - * @param cls closure - * @param apub the auditor's public key - * @param auditor_url URL of the auditor - * @param mpub the exchange's public key (as expected by the auditor) - * @param dki_len length of @a asig and @a dki arrays - * @param asigs array of the auditor's signatures over the @a dks, of length @a dki_len - * @param dki array of denomination coin data signed by the auditor, of length @a dki_len - * @return #GNUNET_OK to continue to iterate, - * #GNUNET_NO to stop iteration with no error, - * #GNUNET_SYSERR to abort iteration with error! - */ -typedef int -(*TALER_EXCHANGEDB_AuditorIterator)( - void *cls, - const struct TALER_AuditorPublicKeyP *apub, - const char *auditor_url, - const struct TALER_MasterPublicKeyP *mpub, - unsigned int dki_len, - const struct TALER_AuditorSignatureP *asigs, - const struct TALER_DenominationKeyValidityPS *dki); - - -/** - * Call @a it with information for each auditor found in the - * directory with auditor information as specified in @a cfg. - * - * @param cfg configuration to use - * @param it function to call with auditor information - * @param it_cls closure for @a it - * @return -1 on error, 0 if no files were found, otherwise - * a positive number (however, even with a positive - * number it is possible that @a it was never called - * as maybe none of the files were well-formed) - */ -int -TALER_EXCHANGEDB_auditor_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg, - TALER_EXCHANGEDB_AuditorIterator it, - void *it_cls); - - -/** - * Write auditor information to the given file. - * - * @param filename the file where to write the auditor information to - * @param apub the auditor's public key - * @param auditor_url the URL of the auditor - * @param asigs the auditor's signatures, array of length @a dki_len - * @param mpub the exchange's public key (as expected by the auditor) - * @param dki_len length of @a dki and @a asigs arrays - * @param dki array of denomination coin data signed by the auditor - * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure. - */ -int -TALER_EXCHANGEDB_auditor_write ( - const char *filename, - const struct TALER_AuditorPublicKeyP *apub, - const char *auditor_url, - const struct TALER_AuditorSignatureP *asigs, - const struct TALER_MasterPublicKeyP *mpub, - uint32_t dki_len, - const struct TALER_DenominationKeyValidityPS *dki); - /** * Initialize the plugin. @@ -292,93 +48,6 @@ TALER_EXCHANGEDB_plugin_unload (struct TALER_EXCHANGEDB_Plugin *plugin); /** - * Sorted list of fees to be paid for aggregate wire transfers. - * Sorted by @e start_date or @e end_date --- both work fine as - * the resulting order must be the same. - */ -struct TALER_EXCHANGEDB_AggregateFees -{ - /** - * This is a linked list. - */ - struct TALER_EXCHANGEDB_AggregateFees *next; - - /** - * Fee to be paid for wire transfers to a merchant. - */ - struct TALER_Amount wire_fee; - - /** - * Fee to be paid when we close a reserve and send funds back. - */ - struct TALER_Amount closing_fee; - - /** - * Time when this fee goes into effect (inclusive) - */ - struct GNUNET_TIME_Absolute start_date; - - /** - * Time when this fee stops being in effect (exclusive). - */ - struct GNUNET_TIME_Absolute end_date; - - /** - * Signature affirming the above fee structure. - */ - struct TALER_MasterSignatureP master_sig; -}; - - -/** - * Read the current fee structure from disk. - * - * @param cfg configuration to use - * @param wireplugin name of the wire plugin to read fees for - * @return sorted list of aggregation fees, NULL on error - */ -struct TALER_EXCHANGEDB_AggregateFees * -TALER_EXCHANGEDB_fees_read (const struct GNUNET_CONFIGURATION_Handle *cfg, - const char *wireplugin); - - -/** - * Convert @a af to @a wf. - * - * @param wiremethod name of the wire method the fees are for - * @param[in,out] af aggregate fees, host format (updated to round time) - * @param[out] wf aggregate fees, disk / signature format - */ -void -TALER_EXCHANGEDB_fees_2_wf (const char *wiremethod, - struct TALER_EXCHANGEDB_AggregateFees *af, - struct TALER_MasterWireFeePS *wf); - - -/** - * Write given fee structure to disk. - * - * @param filename where to write the fees - * @param wireplugin name of the plugin for which we write the fees - * @param af fee structure to write - * @return #GNUNET_OK on success, #GNUNET_SYSERR on error - */ -int -TALER_EXCHANGEDB_fees_write (const char *filename, - const char *wireplugin, - struct TALER_EXCHANGEDB_AggregateFees *af); - - -/** - * Free @a af data structure - * - * @param af list to free - */ -void -TALER_EXCHANGEDB_fees_free (struct TALER_EXCHANGEDB_AggregateFees *af); - - -/** * Information about an account from the configuration. */ struct TALER_EXCHANGEDB_AccountInfo @@ -486,11 +155,6 @@ struct TALER_EXCHANGEDB_WireAccount struct TALER_BANK_AuthenticationData auth; /** - * Wire transfer fee structure. - */ - struct TALER_EXCHANGEDB_AggregateFees *af; - - /** * Name of the section that configures this account. */ char *section_name; @@ -504,24 +168,6 @@ struct TALER_EXCHANGEDB_WireAccount /** - * Update wire transfer fee data structure in @a wa. - * - * @param cfg configuration to use - * @param db_plugin database plugin to use - * @param wa wire account data structure to update - * @param now timestamp to update fees to - * @param session DB session to use - * @return fee valid at @a now, or NULL if unknown - */ -struct TALER_EXCHANGEDB_AggregateFees * -TALER_EXCHANGEDB_update_fees (const struct GNUNET_CONFIGURATION_Handle *cfg, - struct TALER_EXCHANGEDB_Plugin *db_plugin, - struct TALER_EXCHANGEDB_WireAccount *wa, - struct GNUNET_TIME_Absolute now, - struct TALER_EXCHANGEDB_Session *session); - - -/** * Find the wire plugin for the given payto:// URL. * Only useful after the accounts have been loaded * using #TALER_EXCHANGEDB_load_accounts(). diff --git a/src/include/taler_testing_lib.h b/src/include/taler_testing_lib.h index 1722a8338..0900fac9b 100644 --- a/src/include/taler_testing_lib.h +++ b/src/include/taler_testing_lib.h @@ -206,15 +206,19 @@ TALER_TESTING_cleanup_files_cfg (void *cls, /** - * Run `taler-exchange-keyup`. + * Run `taler-exchange-offline`. * * @param config_filename configuration file to use - * @param output_filename where to write the output for the auditor + * @param payto_uri bank account to enable, can be NULL + * @param auditor_pub public key of auditor to enable, can be NULL + * @param auditor_url URL of auditor to enable, can be NULL * @return #GNUNET_OK on success */ int -TALER_TESTING_run_keyup (const char *config_filename, - const char *output_filename); +TALER_TESTING_run_exchange_offline (const char *config_filename, + const char *payto_uri, + const char *auditor_pub, + const char *auditor_url); /** @@ -238,21 +242,13 @@ TALER_TESTING_exchange_db_reset (const char *config_filename); /** - * Run `taler-auditor-sign`. + * Run `taler-auditor-offline` tool. * * @param config_filename configuration file to use - * @param exchange_master_pub master public key of the exchange - * @param auditor_base_url what is the base URL of the auditor - * @param signdata_in where is the information from taler-exchange-keyup - * @param signdata_out where to write the output for the exchange * @return #GNUNET_OK on success */ int -TALER_TESTING_run_auditor_sign (const char *config_filename, - const char *exchange_master_pub, - const char *auditor_base_url, - const char *signdata_in, - const char *signdata_out); +TALER_TESTING_run_auditor_offline (const char *config_filename); /** @@ -1221,18 +1217,6 @@ TALER_TESTING_cmd_exec_transfer (const char *label, /** - * Make a "auditor sign" CMD. - * - * @param label command label - * @param config_filename configuration filename - * @return the command. - */ -struct TALER_TESTING_Command -TALER_TESTING_cmd_exec_auditor_sign (const char *label, - const char *config_filename); - - -/** * Create a withdraw command, letting the caller specify * the desired amount as string. * |