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

complete select_serial_by_* SELECT statements

Browse Source
This commit is contained in:
Christian Grothoff 2021-01-10 18:06:18 +01:00
parent f70c53d2d6
commit af97a44ae6
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 171 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/exchangedb/irbt_callbacks.c
View File

@ -37,12 +37,40 @@ irbt_cb_table_denominations (struct PostgresClosure *pg,
struct TALER_EXCHANGEDB_Session *session, struct TALER_EXCHANGEDB_Session *session,
const struct TALER_EXCHANGEDB_TableData *td) const struct TALER_EXCHANGEDB_TableData *td)
{ {
struct GNUNET_HashCode denom_hash;
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_uint64 (&td->serial),
GNUNET_PQ_query_param_auto_from_type (&denom_hash),
GNUNET_PQ_query_param_rsa_public_key (
td->details.denominations.denom_pub.rsa_public_key),
// GNUNET_PQ_query_param_auto_from_type (&master_pub), // FIXME: !?
GNUNET_PQ_query_param_auto_from_type (
&td->details.denominations.master_sig),
TALER_PQ_query_param_absolute_time (
&td->details.denominations.valid_from),
TALER_PQ_query_param_absolute_time (
&td->details.denominations.expire_withdraw),
TALER_PQ_query_param_absolute_time (
&td->details.denominations.expire_deposit),
TALER_PQ_query_param_absolute_time (
&td->details.denominations.expire_legal),
TALER_PQ_query_param_amount (&td->details.denominations.coin),
TALER_PQ_query_param_amount (
&td->details.denominations.fee_withdraw),
TALER_PQ_query_param_amount (
&td->details.denominations.fee_deposit),
TALER_PQ_query_param_amount (
&td->details.denominations.fee_refresh),
TALER_PQ_query_param_amount (
&td->details.denominations.fee_refund),
GNUNET_PQ_query_param_end GNUNET_PQ_query_param_end
}; };
(void) pg; (void) pg;
GNUNET_CRYPTO_rsa_public_key_hash (
td->details.denominations.denom_pub.rsa_public_key,
&denom_hash);
return GNUNET_PQ_eval_prepared_non_select (session->conn, return GNUNET_PQ_eval_prepared_non_select (session->conn,
"insert_into_table_denominations", "insert_into_table_denominations",
params); params);
@ -64,6 +92,10 @@ irbt_cb_table_denomination_revocations (struct PostgresClosure *pg,
{ {
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_uint64 (&td->serial),
GNUNET_PQ_query_param_auto_from_type (
&td->details.denomination_revocations.master_sig),
GNUNET_PQ_query_param_uint64 (
&td->details.denomination_revocations.denominations_serial),
GNUNET_PQ_query_param_end GNUNET_PQ_query_param_end
}; };
@ -88,6 +120,11 @@ irbt_cb_table_reserves (struct PostgresClosure *pg,
{ {
struct GNUNET_PQ_QueryParam params[] = { struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&td->serial), GNUNET_PQ_query_param_uint64 (&td->serial),
GNUNET_PQ_query_param_auto_from_type (&td->details.reserves.reserve_pub),
GNUNET_PQ_query_param_string (td->details.reserves.account_details),
TALER_PQ_query_param_amount (&td->details.reserves.current_balance),
TALER_PQ_query_param_absolute_time (&td->details.reserves.expiration_date),
TALER_PQ_query_param_absolute_time (&td->details.reserves.gc_date),
GNUNET_PQ_query_param_end GNUNET_PQ_query_param_end
}; };

6
src/exchangedb/lrbt_callbacks.c
View File

@ -114,9 +114,9 @@ lrbt_cb_table_denomination_revocations (void *cls,
struct GNUNET_PQ_ResultSpec rs[] = { struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_uint64 ("serial", GNUNET_PQ_result_spec_uint64 ("serial",
&td.serial), &td.serial),
GNUNET_PQ_result_spec_auto_from_type ( GNUNET_PQ_result_spec_uint64 (
"denom_pub_hash", "denominations_serial",
&td.details.denomination_revocations.denom_pub_hash), &td.details.denomination_revocations.denominations_serial),
GNUNET_PQ_result_spec_auto_from_type ( GNUNET_PQ_result_spec_auto_from_type (
"master_sig", "master_sig",
&td.details.denomination_revocations.master_sig), &td.details.denomination_revocations.master_sig),

131
src/exchangedb/plugin_exchangedb_postgres.c
View File

@ -1752,6 +1752,22 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_denominations", GNUNET_PQ_make_prepare ("select_serial_by_table_denominations",
"SELECT" "SELECT"
" denominations_serial AS serial" " denominations_serial AS serial"
",denom_pub"
",master_sig"
",valid_from"
",expire_withdraw"
",expire_deposit"
",expire_legal"
",coin_val"
",coin_frac"
",fee_withdraw_val"
",fee_withdraw_frac"
",fee_deposit_val"
",fee_deposit_frac"
",fee_refresh_val"
",fee_refresh_frac"
",fee_refund_val"
",fee_refund_frac"
" FROM denominations" " FROM denominations"
" ORDER BY denominations_serial DESC" " ORDER BY denominations_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1759,6 +1775,8 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_denomination_revocations", GNUNET_PQ_make_prepare ("select_serial_by_table_denomination_revocations",
"SELECT" "SELECT"
" denom_revocations_serial_id AS serial" " denom_revocations_serial_id AS serial"
",master_sig"
",denominations_serial"
" FROM denomination_revocations" " FROM denomination_revocations"
" ORDER BY denom_revocations_serial_id DESC" " ORDER BY denom_revocations_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1766,6 +1784,12 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves", GNUNET_PQ_make_prepare ("select_serial_by_table_reserves",
"SELECT" "SELECT"
" reserve_uuid AS serial" " reserve_uuid AS serial"
",reserve_pub"
",account_details"
",current_balance_val"
",current_balance_frac"
",expiration_date"
",gc_date"
" FROM reserves" " FROM reserves"
" ORDER BY reserve_uuid DESC" " ORDER BY reserve_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1773,6 +1797,13 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_in", GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_in",
"SELECT" "SELECT"
" reserve_in_serial_id AS serial" " reserve_in_serial_id AS serial"
",wire_reference"
",credit_val"
",credit_frac"
",sender_account_details"
",exchange_account_section"
",execution_date"
",reserve_uuid"
" FROM reserves_in" " FROM reserves_in"
" ORDER BY reserve_in_serial_id DESC" " ORDER BY reserve_in_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1780,6 +1811,14 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_close", GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_close",
"SELECT" "SELECT"
" close_uuid AS serial" " close_uuid AS serial"
",execution_date"
",wtid"
",receiver_account"
",amount_val"
",amount_frac"
",closing_fee_val"
",closing_fee_frac"
",reserve_uuid"
" FROM reserves_close" " FROM reserves_close"
" ORDER BY close_uuid DESC" " ORDER BY close_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1787,6 +1826,14 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_out", GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_out",
"SELECT" "SELECT"
" reserve_out_serial_id AS serial" " reserve_out_serial_id AS serial"
",h_blind_ev"
",denom_sig"
",reserve_sig"
",execution_date"
",amount_with_fee_val"
",amount_with_fee_frac"
",reserve_uuid"
",denominations_serial"
" FROM reserves_out" " FROM reserves_out"
" ORDER BY reserve_out_serial_id DESC" " ORDER BY reserve_out_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1794,6 +1841,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_auditors", GNUNET_PQ_make_prepare ("select_serial_by_table_auditors",
"SELECT" "SELECT"
" auditor_uuid AS serial" " auditor_uuid AS serial"
",auditor_pub"
",auditor_name"
",auditor_url"
",is_active"
",last_change"
" FROM auditors" " FROM auditors"
" ORDER BY auditor_uuid DESC" " ORDER BY auditor_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1801,6 +1853,9 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_auditor_denom_sigs", GNUNET_PQ_make_prepare ("select_serial_by_table_auditor_denom_sigs",
"SELECT" "SELECT"
" auditor_denom_serial AS serial" " auditor_denom_serial AS serial"
",auditor_uuid"
",denominations_serial"
",auditor_sig"
" FROM auditor_denom_sigs" " FROM auditor_denom_sigs"
" ORDER BY auditor_denom_serial DESC" " ORDER BY auditor_denom_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1808,6 +1863,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_exchange_sign_keys", GNUNET_PQ_make_prepare ("select_serial_by_table_exchange_sign_keys",
"SELECT" "SELECT"
" esk_serial AS serial" " esk_serial AS serial"
",exchange_pub"
",master_sig"
",valid_from"
",expire_sign"
",expire_legal"
" FROM exchange_sign_keys" " FROM exchange_sign_keys"
" ORDER BY esk_serial DESC" " ORDER BY esk_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1815,6 +1875,8 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_signkey_revocations", GNUNET_PQ_make_prepare ("select_serial_by_table_signkey_revocations",
"SELECT" "SELECT"
" signkey_revocations_serial_id AS serial" " signkey_revocations_serial_id AS serial"
",esk_serial"
",master_sig"
" FROM signkey_revocations" " FROM signkey_revocations"
" ORDER BY signkey_revocations_serial_id DESC" " ORDER BY signkey_revocations_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1822,6 +1884,9 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_known_coins", GNUNET_PQ_make_prepare ("select_serial_by_table_known_coins",
"SELECT" "SELECT"
" known_coin_id AS serial" " known_coin_id AS serial"
",coin_pub"
",denom_sig"
",denominations_serial"
" FROM known_coins" " FROM known_coins"
" ORDER BY known_coin_id DESC" " ORDER BY known_coin_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1829,6 +1894,12 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_commitments", GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_commitments",
"SELECT" "SELECT"
" melt_serial_id AS serial" " melt_serial_id AS serial"
",rc"
",old_coin_sig"
",amount_with_fee_val"
",amount_with_fee_frac"
",noreveal_index"
",old_known_coin_id"
" FROM refresh_commitments" " FROM refresh_commitments"
" ORDER BY melt_serial_id DESC" " ORDER BY melt_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1836,6 +1907,12 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_revealed_coins", GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_revealed_coins",
"SELECT" "SELECT"
" rrc_serial AS serial" " rrc_serial AS serial"
",freshcoin_index"
",link_sig"
",coin_ev"
",ev_sig"
",denominations_serial"
",melt_serial_id"
" FROM refresh_revealed_coins" " FROM refresh_revealed_coins"
" ORDER BY rrc_serial DESC" " ORDER BY rrc_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1843,6 +1920,9 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_transfer_keys", GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_transfer_keys",
"SELECT" "SELECT"
" rtc_serial AS serial" " rtc_serial AS serial"
",transfer_pub"
",transfer_privs"
",melt_serial_id"
" FROM refresh_transfer_keys" " FROM refresh_transfer_keys"
" ORDER BY rtc_serial DESC" " ORDER BY rtc_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1850,6 +1930,19 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_deposits", GNUNET_PQ_make_prepare ("select_serial_by_table_deposits",
"SELECT" "SELECT"
" deposit_serial_id AS serial" " deposit_serial_id AS serial"
",amount_with_fee_val"
",amount_with_fee_frac"
",wallet_timestamp"
",exchange_timestamp"
",refund_deadline"
",wire_deadline"
",merchant_pub"
",h_contract_terms"
",coin_sig"
",wire"
",tiny"
",done"
",known_coin_id"
" FROM deposits" " FROM deposits"
" ORDER BY deposit_serial_id DESC" " ORDER BY deposit_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1857,6 +1950,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_refunds", GNUNET_PQ_make_prepare ("select_serial_by_table_refunds",
"SELECT" "SELECT"
" refund_serial_id AS serial" " refund_serial_id AS serial"
",merchant_sig"
",rtransaction_id"
",amount_with_fee_val"
",amount_with_fee_frac"
",deposit_serial_id"
" FROM refunds" " FROM refunds"
" ORDER BY refund_serial_id DESC" " ORDER BY refund_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1864,6 +1962,12 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_wire_out", GNUNET_PQ_make_prepare ("select_serial_by_table_wire_out",
"SELECT" "SELECT"
" wireout_uuid AS serial" " wireout_uuid AS serial"
",execution_date"
",wtid_raw"
",wire_target"
",exchange_account_section"
",amount_val"
",amount_frac"
" FROM wire_out" " FROM wire_out"
" ORDER BY wireout_uuid DESC" " ORDER BY wireout_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1871,6 +1975,8 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_aggregation_tracking", GNUNET_PQ_make_prepare ("select_serial_by_table_aggregation_tracking",
"SELECT" "SELECT"
" aggregation_serial_id AS serial" " aggregation_serial_id AS serial"
",deposit_serial_id"
",wtid_raw"
" FROM aggregation_tracking" " FROM aggregation_tracking"
" ORDER BY aggregation_serial_id DESC" " ORDER BY aggregation_serial_id DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1878,6 +1984,14 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_wire_fee", GNUNET_PQ_make_prepare ("select_serial_by_table_wire_fee",
"SELECT" "SELECT"
" wire_fee_serial AS serial" " wire_fee_serial AS serial"
",wire_method"
",start_date"
",end_date"
",wire_fee_val"
",wire_fee_frac"
",closing_fee_val"
",closing_fee_frac"
",master_sig"
" FROM wire_fee" " FROM wire_fee"
" ORDER BY wire_fee_serial DESC" " ORDER BY wire_fee_serial DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1885,6 +1999,13 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_recoup", GNUNET_PQ_make_prepare ("select_serial_by_table_recoup",
"SELECT" "SELECT"
" recoup_uuid AS serial" " recoup_uuid AS serial"
",coin_sig"
",coin_blind"
",amount_val"
",amount_frac"
",timestamp"
",known_coin_id"
",reserve_out_serial_id"
" FROM recoup" " FROM recoup"
" ORDER BY recoup_uuid DESC" " ORDER BY recoup_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -1892,6 +2013,13 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_serial_by_table_recoup_refresh", GNUNET_PQ_make_prepare ("select_serial_by_table_recoup_refresh",
"SELECT" "SELECT"
" recoup_refresh_uuid AS serial" " recoup_refresh_uuid AS serial"
",coin_sig"
",coin_blind"
",amount_val"
",amount_frac"
",timestamp"
",known_coin_id"
",rrc_serial"
" FROM recoup_refresh" " FROM recoup_refresh"
" ORDER BY recoup_refresh_uuid DESC" " ORDER BY recoup_refresh_uuid DESC"
" LIMIT 1;", " LIMIT 1;",
@ -3414,7 +3542,8 @@ postgres_reserves_in_insert (void *cls,
before adding the actual transaction to "reserves_in", as before adding the actual transaction to "reserves_in", as
for a new reserve it can't be a duplicate 'add' operation, for a new reserve it can't be a duplicate 'add' operation,
and as the 'add' operation may need the reserve entry and as the 'add' operation may need the reserve entry
as a foreign key. */struct GNUNET_PQ_QueryParam params[] = { as a foreign key. */
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_auto_from_type (reserve_pub), GNUNET_PQ_query_param_auto_from_type (reserve_pub),
GNUNET_PQ_query_param_string (sender_account_details), GNUNET_PQ_query_param_string (sender_account_details),
TALER_PQ_query_param_amount (balance), TALER_PQ_query_param_amount (balance),

2
src/include/taler_exchangedb_plugin.h
View File

@ -173,8 +173,8 @@ struct TALER_EXCHANGEDB_TableData
struct struct
{ {
struct GNUNET_HashCode denom_pub_hash;
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
uint64_t denominations_serial;
} denomination_revocations; } denomination_revocations;
struct struct