taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more docu and bug notes

Browse Source
This commit is contained in:
Christian Grothoff 2015-06-05 15:26:41 +02:00
parent dcbb8d1cb6
commit 776482ef85
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/taler_mintdb_plugin.h
View File

@ -190,7 +190,15 @@ struct TALER_MINTDB_ReserveHistory
/** /**
* @brief Specification for a /deposit operation. * @brief Specification for a /deposit operation. The combination of
* the coin's public key, the merchant's public key and the
* transaction ID must be unique. While a coin can (theoretically) be
* deposited at the same merchant twice (with partial spending), the
* merchant must either use a different public key or a different
* transaction ID for the two transactions. The same coin must not
* be used twice at the same merchant for the same transaction
* (as determined by transaction ID). (Note: we might want to
* fix #3819 and include at least h_contract as well.)
*/ */
struct TALER_MINTDB_Deposit struct TALER_MINTDB_Deposit
{ {

61
src/mintdb/plugin_mintdb_postgres.c
View File

@ -1603,13 +1603,7 @@ postgres_have_deposit (void *cls,
BREAK_DB_ERR (result); BREAK_DB_ERR (result);
goto cleanup; goto cleanup;
} }
ret = (0 == PQntuples (result)) ? GNUNET_NO : GNUNET_YES;
if (0 == PQntuples (result))
{
ret = GNUNET_NO;
goto cleanup;
}
ret = GNUNET_YES;
/* NOTE: maybe check that the other information in @a deposit /* NOTE: maybe check that the other information in @a deposit
also matches, and if not report inconsistencies? Right now, also matches, and if not report inconsistencies? Right now,
if the merchant re-uses a transaction ID, the mint silently if the merchant re-uses a transaction ID, the mint silently
@ -1621,8 +1615,7 @@ postgres_have_deposit (void *cls,
/** /**
* Insert information about deposited coin into the * Insert information about deposited coin into the database.
* database.
* *
* @param cls the `struct PostgresClosure` with the plugin-specific state * @param cls the `struct PostgresClosure` with the plugin-specific state
* @param session connection to the database * @param session connection to the database
@ -1638,33 +1631,37 @@ postgres_insert_deposit (void *cls,
PGresult *result; PGresult *result;
int ret; int ret;
ret = GNUNET_SYSERR;
json_wire_enc = json_dumps (deposit->wire, JSON_COMPACT); json_wire_enc = json_dumps (deposit->wire, JSON_COMPACT);
struct TALER_PQ_QueryParam params[]= { {
TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub), struct TALER_PQ_QueryParam params[] = {
TALER_PQ_query_param_rsa_public_key (deposit->coin.denom_pub.rsa_public_key), TALER_PQ_query_param_auto_from_type (&deposit->coin.coin_pub),
TALER_PQ_query_param_rsa_signature (deposit->coin.denom_sig.rsa_signature), TALER_PQ_query_param_rsa_public_key (deposit->coin.denom_pub.rsa_public_key),
TALER_PQ_query_param_auto_from_type (&deposit->transaction_id), TALER_PQ_query_param_rsa_signature (deposit->coin.denom_sig.rsa_signature),
TALER_PQ_query_param_amount (&deposit->amount_with_fee), TALER_PQ_query_param_auto_from_type (&deposit->transaction_id),
TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub), TALER_PQ_query_param_amount (&deposit->amount_with_fee),
TALER_PQ_query_param_auto_from_type (&deposit->h_contract), TALER_PQ_query_param_auto_from_type (&deposit->merchant_pub),
TALER_PQ_query_param_auto_from_type (&deposit->h_wire), TALER_PQ_query_param_auto_from_type (&deposit->h_contract),
TALER_PQ_query_param_auto_from_type (&deposit->csig), TALER_PQ_query_param_auto_from_type (&deposit->h_wire),
TALER_PQ_query_param_fixed_size (json_wire_enc, TALER_PQ_query_param_auto_from_type (&deposit->csig),
strlen (json_wire_enc)), TALER_PQ_query_param_fixed_size (json_wire_enc,
TALER_PQ_query_param_end strlen (json_wire_enc)),
}; /* FIXME: refund_deadline, timestamp, deposit_fee and 'wire' details
result = TALER_PQ_exec_prepared (session->conn, not stored! #3826 */
"insert_deposit", TALER_PQ_query_param_end
params); };
result = TALER_PQ_exec_prepared (session->conn,
"insert_deposit",
params);
}
if (PGRES_COMMAND_OK != PQresultStatus (result)) if (PGRES_COMMAND_OK != PQresultStatus (result))
{ {
BREAK_DB_ERR (result); BREAK_DB_ERR (result);
goto cleanup; ret = GNUNET_SYSERR;
}
else
{
ret = GNUNET_OK;
} }
ret = GNUNET_OK;
cleanup:
PQclear (result); PQclear (result);
GNUNET_free_non_null (json_wire_enc); GNUNET_free_non_null (json_wire_enc);
return ret; return ret;
@ -2705,7 +2702,7 @@ postgres_get_coin_transactions (void *cls,
(#3820) */ (#3820) */
TALER_PQ_result_spec_auto_from_type ("transaction_id", &deposit->transaction_id), TALER_PQ_result_spec_auto_from_type ("transaction_id", &deposit->transaction_id),
TALER_PQ_result_spec_auto_from_type ("coin_sig", &deposit->csig), TALER_PQ_result_spec_auto_from_type ("coin_sig", &deposit->csig),
/* FIXME: do 'amount_with_fee' here! */ /* FIXME: do 'amount_with_fee' here! #3826 */
TALER_PQ_result_spec_auto_from_type ("merchant_pub", &deposit->merchant_pub), TALER_PQ_result_spec_auto_from_type ("merchant_pub", &deposit->merchant_pub),
TALER_PQ_result_spec_auto_from_type ("h_contract", &deposit->h_contract), TALER_PQ_result_spec_auto_from_type ("h_contract", &deposit->h_contract),
TALER_PQ_result_spec_auto_from_type ("h_wire", &deposit->h_wire), TALER_PQ_result_spec_auto_from_type ("h_wire", &deposit->h_wire),