diff options
Diffstat (limited to 'src')
35 files changed, 119 insertions, 178 deletions
diff --git a/src/auditor/taler-auditor-httpd.c b/src/auditor/taler-auditor-httpd.c index 506ba1f13..e7f2b3b91 100644 --- a/src/auditor/taler-auditor-httpd.c +++ b/src/auditor/taler-auditor-httpd.c @@ -845,12 +845,13 @@ handle_mhd_request (void *cls, NULL, 0, &TAH_PURSES_handler_delete, MHD_HTTP_OK, true }, - { "/monitoring/purses", MHD_HTTP_METHOD_PATCH, - "application/json", - NULL, 0, - &TAH_PURSES_handler_update, - MHD_HTTP_OK, true }, - + /* + { "/monitoring/purses", MHD_HTTP_METHOD_PATCH, + "application/json", + NULL, 0, + &TAH_PURSES_handler_update, + MHD_HTTP_OK, true }, +*/ { "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_GET, "application/json", @@ -867,12 +868,13 @@ handle_mhd_request (void *cls, NULL, 0, &TAH_HISTORIC_DENOMINATION_REVENUE_handler_delete, MHD_HTTP_OK, true }, - { "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_PATCH, - "application/json", - NULL, 0, - &TAH_HISTORIC_DENOMINATION_REVENUE_handler_update, - MHD_HTTP_OK, true }, - + /* + { "/monitoring/historic-denomination-revenue", MHD_HTTP_METHOD_PATCH, + "application/json", + NULL, 0, + &TAH_HISTORIC_DENOMINATION_REVENUE_handler_update, + MHD_HTTP_OK, true }, +*/ { "/monitoring/denomination-pending", MHD_HTTP_METHOD_GET, "application/json", @@ -889,12 +891,13 @@ handle_mhd_request (void *cls, NULL, 0, &TAH_DENOMINATION_PENDING_handler_delete, MHD_HTTP_OK, true }, - { "/monitoring/denomination-pending", MHD_HTTP_METHOD_PATCH, - "application/json", - NULL, 0, - &TAH_DENOMINATION_PENDING_handler_update, - MHD_HTTP_OK, true }, - + /* + { "/monitoring/denomination-pending", MHD_HTTP_METHOD_PATCH, + "application/json", + NULL, 0, + &TAH_DENOMINATION_PENDING_handler_update, + MHD_HTTP_OK, true }, +*/ { "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_GET, "application/json", @@ -911,13 +914,14 @@ handle_mhd_request (void *cls, NULL, 0, &TAH_HISTORIC_RESERVE_SUMMARY_handler_delete, MHD_HTTP_OK, true }, - { "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_PATCH, - "application/json", - NULL, 0, - &TAH_HISTORIC_RESERVE_SUMMARY_handler_update, - MHD_HTTP_OK, true }, - - + /* + { "/monitoring/historic-reserve-summary", MHD_HTTP_METHOD_PATCH, + "application/json", + NULL, 0, + &TAH_HISTORIC_RESERVE_SUMMARY_handler_update, + MHD_HTTP_OK, true }, +*/ +/* { "/monitoring/exchange-signkeys", MHD_HTTP_METHOD_GET, "application/json", NULL, 0, @@ -938,7 +942,7 @@ handle_mhd_request (void *cls, NULL, 0, &TAH_EXCHANGE_SIGNKEYS_handler_update, MHD_HTTP_OK, true }, - +*/ { "/monitoring/wire-format-inconsistency", MHD_HTTP_METHOD_GET, "application/json", @@ -1107,6 +1111,9 @@ handle_mhd_request (void *cls, { struct TAH_RequestHandler *rh = &handlers[i]; + if (0 == strcasecmp (method, MHD_HTTP_METHOD_OPTIONS) ) + return TALER_MHD_reply_cors_preflight (connection); + unsigned int argsnr = 3; // arguments, and the url itself, and a terminator that is always null @@ -1136,6 +1143,7 @@ handle_mhd_request (void *cls, memset (argurl, 0, ulen + 1 + strlen ("/monitoring")); strcpy (argurl,"/"); + if (args[0] != NULL) { @@ -1167,7 +1175,7 @@ handle_mhd_request (void *cls, (0 == strcasecmp (method, rh->method)) ) ) { - +/* if ((0 == strcasecmp (method, MHD_HTTP_METHOD_DELETE)) || (0 == strcasecmp (method, MHD_HTTP_METHOD_PUT)) ) { @@ -1178,7 +1186,7 @@ handle_mhd_request (void *cls, "This method is currently disabled."); } - +*/ found = true; requiresAuth = true; diff --git a/src/auditor/taler-auditor-httpd_balances-get.c b/src/auditor/taler-auditor-httpd_balances-get.c index 822344fd3..a685a6b3f 100644 --- a/src/auditor/taler-auditor-httpd_balances-get.c +++ b/src/auditor/taler-auditor-httpd_balances-get.c @@ -48,8 +48,7 @@ process_balances (void *cls, GNUNET_JSON_pack_uint64 ("row_id", serial_id), GNUNET_JSON_pack_string ("balance_key", dc->balance_key), - TALER_JSON_pack_amount ("balance_value", &dc->balance_value), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + TALER_JSON_pack_amount ("balance_value", &dc->balance_value) ); @@ -116,14 +115,6 @@ TAH_BALANCES_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } const char *balance_key = MHD_lookup_connection_value (connection, MHD_GET_ARGUMENT_KIND, diff --git a/src/auditor/taler-auditor-httpd_closure-lags-get.c b/src/auditor/taler-auditor-httpd_closure-lags-get.c index 529dc62f2..30a8422af 100644 --- a/src/auditor/taler-auditor-httpd_closure-lags-get.c +++ b/src/auditor/taler-auditor-httpd_closure-lags-get.c @@ -48,7 +48,7 @@ process_closure_lags (void *cls, TALER_JSON_pack_amount ("amount", &dc->amount), TALER_JSON_pack_time_abs_human ("deadline", dc->deadline), - GNUNET_JSON_pack_int64 ("wtid", dc->wtid), + GNUNET_JSON_pack_data_auto ("wtid", &dc->wtid), GNUNET_JSON_pack_string ("account", dc->account) ); diff --git a/src/auditor/taler-auditor-httpd_closure-lags-put.c b/src/auditor/taler-auditor-httpd_closure-lags-put.c index c1f144e55..e57740efc 100644 --- a/src/auditor/taler-auditor-httpd_closure-lags-put.c +++ b/src/auditor/taler-auditor-httpd_closure-lags-put.c @@ -91,7 +91,7 @@ TAH_CLOSURE_LAGS_PUT_handler ( TALER_JSON_spec_amount ("amount", TAH_currency, &dc.amount), GNUNET_JSON_spec_timestamp ("deadline", &d), - GNUNET_JSON_spec_string ("wtid", (const char **) &dc.wtid), + GNUNET_JSON_spec_fixed_auto ("wtid", &dc.wtid), GNUNET_JSON_spec_string ("account", (const char **) &dc.account), GNUNET_JSON_spec_end () diff --git a/src/auditor/taler-auditor-httpd_denomination-pending-get.c b/src/auditor/taler-auditor-httpd_denomination-pending-get.c index 2058c3644..ac05ede14 100644 --- a/src/auditor/taler-auditor-httpd_denomination-pending-get.c +++ b/src/auditor/taler-auditor-httpd_denomination-pending-get.c @@ -51,8 +51,7 @@ process_denomination_pending (void *cls, TALER_JSON_pack_amount ("denom_loss", &dc->denom_loss), GNUNET_JSON_pack_int64 ("num_issued", dc->num_issued), TALER_JSON_pack_amount ("denom_risk", &dc->denom_risk), - TALER_JSON_pack_amount ("recoup_loss", &dc->recoup_loss), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + TALER_JSON_pack_amount ("recoup_loss", &dc->recoup_loss) ); @@ -119,13 +118,6 @@ TAH_DENOMINATION_PENDING_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } qs = TAH_plugin->get_denomination_pending ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_emergency-get.c b/src/auditor/taler-auditor-httpd_emergency-get.c index 3ba578e0b..b09771574 100644 --- a/src/auditor/taler-auditor-httpd_emergency-get.c +++ b/src/auditor/taler-auditor-httpd_emergency-get.c @@ -48,6 +48,8 @@ process_emergency (void *cls, obj = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_int64 ("row_id", serial_id), + GNUNET_JSON_pack_data_auto ("denompub_h", &dc->denompub_h), TALER_JSON_pack_amount ("denom_risk", &dc->denom_risk), @@ -121,13 +123,6 @@ TAH_EMERGENCY_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } qs = TAH_plugin->get_emergency ( TAH_plugin->cls, @@ -146,7 +141,7 @@ TAH_EMERGENCY_handler_get (struct TAH_RequestHandler *rh, return TALER_MHD_reply_with_error (connection, MHD_HTTP_INTERNAL_SERVER_ERROR, TALER_EC_GENERIC_DB_FETCH_FAILED, - "emergency"); + "emergency error"); } return TALER_MHD_REPLY_JSON_PACK ( connection, diff --git a/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c b/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c index 46d4c154e..ad696fc1f 100644 --- a/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c +++ b/src/auditor/taler-auditor-httpd_historic-denomination-revenue-get.c @@ -49,8 +49,7 @@ process_historic_denomination_revenue (void *cls, GNUNET_JSON_pack_data_auto ("denom_pub_hash", &dc->denom_pub_hash), TALER_JSON_pack_time_abs_human ("revenue_timestamp", dc->revenue_timestamp), TALER_JSON_pack_amount ("revenue_balance", &dc->revenue_balance), - TALER_JSON_pack_amount ("loss_balance", &dc->loss_balance), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + TALER_JSON_pack_amount ("loss_balance", &dc->loss_balance) ); @@ -117,13 +116,6 @@ TAH_HISTORIC_DENOMINATION_REVENUE_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } qs = TAH_plugin->get_historic_denomination_revenue ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c b/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c index b7bdc5b76..88b5866a4 100644 --- a/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c +++ b/src/auditor/taler-auditor-httpd_historic-reserve-summary-get.c @@ -49,8 +49,7 @@ process_historic_reserve_summary (void *cls, GNUNET_JSON_pack_int64 ("row_id", serial_id), TALER_JSON_pack_time_abs_human ("start_date", dc->start_date), TALER_JSON_pack_time_abs_human ("end_date", dc->end_date), - TALER_JSON_pack_amount ("reserve_profits", &dc->reserve_profits), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + TALER_JSON_pack_amount ("reserve_profits", &dc->reserve_profits) ); @@ -117,13 +116,6 @@ TAH_HISTORIC_RESERVE_SUMMARY_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } qs = TAH_plugin->get_historic_reserve_summary ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_progress-get.c b/src/auditor/taler-auditor-httpd_progress-get.c index 150b9ca8d..f89d7002c 100644 --- a/src/auditor/taler-auditor-httpd_progress-get.c +++ b/src/auditor/taler-auditor-httpd_progress-get.c @@ -111,13 +111,7 @@ TAH_PROGRESS_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } + qs = TAH_plugin->get_progress ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_purses-get.c b/src/auditor/taler-auditor-httpd_purses-get.c index 3ad6bad5c..78c13dd95 100644 --- a/src/auditor/taler-auditor-httpd_purses-get.c +++ b/src/auditor/taler-auditor-httpd_purses-get.c @@ -50,8 +50,7 @@ process_purses (void *cls, GNUNET_JSON_pack_data_auto ("purse_pub", &dc->purse_pub), TALER_JSON_pack_amount ("balance", &dc->balance), TALER_JSON_pack_amount ("target", &dc->target), - TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date) ); @@ -118,13 +117,7 @@ TAH_PURSES_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } + qs = TAH_plugin->get_purses ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_reserves-get.c b/src/auditor/taler-auditor-httpd_reserves-get.c index a9cfc6a52..4c2ac0567 100644 --- a/src/auditor/taler-auditor-httpd_reserves-get.c +++ b/src/auditor/taler-auditor-httpd_reserves-get.c @@ -57,8 +57,7 @@ process_reserves (void *cls, TALER_JSON_pack_amount ("open_fee_balance", &dc->open_fee_balance), TALER_JSON_pack_amount ("history_fee_balance", &dc->history_fee_balance), TALER_JSON_pack_time_abs_human ("expiration_date", dc->expiration_date), - GNUNET_JSON_pack_string ("origin_account", dc->origin_account), - GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) + GNUNET_JSON_pack_string ("origin_account", dc->origin_account) ); @@ -125,13 +124,6 @@ TAH_RESERVES_handler_get (struct TAH_RequestHandler *rh, &offset); bool return_suppressed = false; - const char *ret_s = MHD_lookup_connection_value (connection, - MHD_GET_ARGUMENT_KIND, - "return_suppressed"); - if (ret_s != NULL && strcmp (ret_s, "true") == 0) - { - return_suppressed = true; - } qs = TAH_plugin->get_reserves ( TAH_plugin->cls, diff --git a/src/auditor/taler-auditor-httpd_row-inconsistency-get.c b/src/auditor/taler-auditor-httpd_row-inconsistency-get.c index a2fa543ea..bfd6f95fe 100644 --- a/src/auditor/taler-auditor-httpd_row-inconsistency-get.c +++ b/src/auditor/taler-auditor-httpd_row-inconsistency-get.c @@ -45,10 +45,13 @@ add_row_inconsistency (void *cls, obj = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_int64 ("row_id", serial_id), + GNUNET_JSON_pack_string ("row_table", dc->row_table), GNUNET_JSON_pack_string ("diagnostic", - dc->diagnostic) + dc->diagnostic), + GNUNET_JSON_pack_bool ("suppressed", dc->suppressed) ); GNUNET_break (0 == json_array_append_new (list, diff --git a/src/auditor/taler-helper-auditor-purses.c b/src/auditor/taler-helper-auditor-purses.c index 8ba1643df..0dc8833d5 100644 --- a/src/auditor/taler-helper-auditor-purses.c +++ b/src/auditor/taler-helper-auditor-purses.c @@ -702,7 +702,7 @@ handle_purse_deposits ( { if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == pc->qs) { - report_row_inconsistency ("purse-deposit", + report_row_inconsistency ("purse_deposit", rowid, "purse not found"); } diff --git a/src/auditordb/0002-auditor_balances.sql b/src/auditordb/0002-auditor_balances.sql index 5797e615e..78ff8a414 100644 --- a/src/auditordb/0002-auditor_balances.sql +++ b/src/auditordb/0002-auditor_balances.sql @@ -18,8 +18,8 @@ CREATE TABLE IF NOT EXISTS auditor_balances ( row_id BIGINT GENERATED BY DEFAULT AS IDENTITY, balance_key TEXT PRIMARY KEY NOT NULL, - balance_value taler_amount, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + balance_value taler_amount + ); COMMENT ON TABLE auditor_balances diff --git a/src/auditordb/0002-auditor_closure_lags.sql b/src/auditordb/0002-auditor_closure_lags.sql index 4a932bb2b..9556da788 100644 --- a/src/auditordb/0002-auditor_closure_lags.sql +++ b/src/auditordb/0002-auditor_closure_lags.sql @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS auditor_closure_lags row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,
amount taler_amount,
deadline BIGINT,
- wtid integer,
+ wtid BYTEA,
account BYTEA,
suppressed BOOLEAN NOT NULL DEFAULT FALSE
);
diff --git a/src/auditordb/0002-auditor_denomination_pending.sql b/src/auditordb/0002-auditor_denomination_pending.sql index 6c1239d7b..00ed18145 100644 --- a/src/auditordb/0002-auditor_denomination_pending.sql +++ b/src/auditordb/0002-auditor_denomination_pending.sql @@ -19,10 +19,9 @@ CREATE TABLE auditor_denomination_pending denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64) ,denom_balance taler_amount NOT NULL ,denom_loss taler_amount NOT NULL - ,num_issued INT8 NOT NULL + ,num_issued BIGINT NOT NULL ,denom_risk taler_amount NOT NULL - ,recoup_loss taler_amount NOT NULL, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + ,recoup_loss taler_amount NOT NULL ); COMMENT ON TABLE auditor_denomination_pending IS 'outstanding denomination coins that the exchange is aware of and what the respective balances are (outstanding as well as issued overall which implies the maximum value at risk).'; diff --git a/src/auditordb/0002-auditor_deposit_confirmations.sql b/src/auditordb/0002-auditor_deposit_confirmations.sql index 1b7fec185..7e47b4fd1 100644 --- a/src/auditordb/0002-auditor_deposit_confirmations.sql +++ b/src/auditordb/0002-auditor_deposit_confirmations.sql @@ -19,9 +19,9 @@ CREATE TABLE auditor_deposit_confirmations ,h_contract_terms BYTEA NOT NULL CHECK (LENGTH(h_contract_terms)=64) ,h_policy BYTEA NOT NULL CHECK (LENGTH(h_policy)=64) ,h_wire BYTEA NOT NULL CHECK (LENGTH(h_wire)=64) - ,exchange_timestamp INT8 NOT NULL - ,refund_deadline INT8 NOT NULL - ,wire_deadline INT8 NOT NULL + ,exchange_timestamp BIGINT NOT NULL + ,refund_deadline BIGINT NOT NULL + ,wire_deadline BIGINT NOT NULL ,total_without_fee taler_amount NOT NULL ,coin_pubs BYTEA[] NOT NULL CHECK (CARDINALITY(coin_pubs)>0) ,coin_sigs BYTEA[] NOT NULL CHECK (CARDINALITY(coin_sigs)=CARDINALITY(coin_pubs)) diff --git a/src/auditordb/0002-auditor_emergency.sql b/src/auditordb/0002-auditor_emergency.sql index 4b0ca3828..b63b5fd00 100644 --- a/src/auditordb/0002-auditor_emergency.sql +++ b/src/auditordb/0002-auditor_emergency.sql @@ -20,7 +20,7 @@ SET search_path TO auditor; CREATE TABLE IF NOT EXISTS auditor_emergency
(
row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY,
- denompub_h BYTEA,
+ denompub_h BYTEA CHECK (LENGTH(denompub_h)=64),
denom_risk taler_amount,
denom_loss taler_amount,
deposit_start BIGINT,
diff --git a/src/auditordb/0002-auditor_exchange_signkeys.sql b/src/auditordb/0002-auditor_exchange_signkeys.sql index 7a160a929..289b60ed9 100644 --- a/src/auditordb/0002-auditor_exchange_signkeys.sql +++ b/src/auditordb/0002-auditor_exchange_signkeys.sql @@ -18,9 +18,9 @@ CREATE TABLE auditor_exchange_signkeys (row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE, exchange_pub BYTEA PRIMARY KEY CHECK (LENGTH(exchange_pub)=32) ,master_sig BYTEA NOT NULL CHECK (LENGTH(master_sig)=64) - ,ep_valid_from INT8 NOT NULL - ,ep_expire_sign INT8 NOT NULL - ,ep_expire_legal INT8 NOT NULL, + ,ep_valid_from BIGINT NOT NULL + ,ep_expire_sign BIGINT NOT NULL + ,ep_expire_legal BIGINT NOT NULL, suppressed BOOLEAN NOT NULL DEFAULT FALSE ); COMMENT ON TABLE auditor_exchange_signkeys diff --git a/src/auditordb/0002-auditor_historic_denomination_revenue.sql b/src/auditordb/0002-auditor_historic_denomination_revenue.sql index 12730836d..d711ac7fc 100644 --- a/src/auditordb/0002-auditor_historic_denomination_revenue.sql +++ b/src/auditordb/0002-auditor_historic_denomination_revenue.sql @@ -17,10 +17,9 @@ CREATE TABLE auditor_historic_denomination_revenue (row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE, denom_pub_hash BYTEA PRIMARY KEY CHECK (LENGTH(denom_pub_hash)=64) - ,revenue_timestamp INT8 NOT NULL + ,revenue_timestamp BIGINT NOT NULL ,revenue_balance taler_amount NOT NULL - ,loss_balance taler_amount NOT NULL, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + ,loss_balance taler_amount NOT NULL ); COMMENT ON TABLE auditor_historic_denomination_revenue IS 'Table with historic profits; basically, when a denom_pub has expired and everything associated with it is garbage collected, the final profits end up in here; note that the denom_pub here is not a foreign key, we just keep it as a reference point.'; diff --git a/src/auditordb/0002-auditor_historic_reserve_summary.sql b/src/auditordb/0002-auditor_historic_reserve_summary.sql index a598ebd92..d2b3235d9 100644 --- a/src/auditordb/0002-auditor_historic_reserve_summary.sql +++ b/src/auditordb/0002-auditor_historic_reserve_summary.sql @@ -18,10 +18,9 @@ SET search_path TO auditor; CREATE TABLE IF NOT EXISTS auditor_historic_reserve_summary ( row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE, - start_date INT8 PRIMARY KEY - ,end_date INT8 NOT NULL - ,reserve_profits taler_amount NOT NULL, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + start_date BIGINT PRIMARY KEY + ,end_date BIGINT NOT NULL + ,reserve_profits taler_amount NOT NULL ); COMMENT ON TABLE auditor_historic_reserve_summary IS 'historic profits from reserves; we eventually GC auditor_historic_reserve_revenue, and then store the totals in here (by time intervals).'; diff --git a/src/auditordb/0002-auditor_pending_deposits.sql b/src/auditordb/0002-auditor_pending_deposits.sql new file mode 100644 index 000000000..5cef7bf8c --- /dev/null +++ b/src/auditordb/0002-auditor_pending_deposits.sql @@ -0,0 +1,25 @@ +-- +-- This file is part of TALER +-- Copyright (C) 2014--2022 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 +-- Foundation; either version 3, or (at your option) any later version. +-- +-- TALER is distributed in the hope that it will be useful, but WITHOUT ANY +-- WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +-- A PARTICULAR PURPOSE. See the GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License along with +-- TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> +-- + +CREATE TABLE IF NOT EXISTS auditor_pending_deposits +( + row_id BIGINT GENERATED BY DEFAULT AS IDENTITY UNIQUE PRIMARY KEY, + total_amount taler_amount, + wire_target_h_payto BYTEA, + batch_deposit_serial_id BIGINT, + deadline BIGINT, + suppressed BOOLEAN NOT NULL DEFAULT FALSE +); diff --git a/src/auditordb/0002-auditor_progress.sql b/src/auditordb/0002-auditor_progress.sql index 855ea082d..15d1fe2e4 100644 --- a/src/auditordb/0002-auditor_progress.sql +++ b/src/auditordb/0002-auditor_progress.sql @@ -16,8 +16,7 @@ CREATE TABLE IF NOT EXISTS auditor_progress (progress_key TEXT PRIMARY KEY NOT NULL - ,progress_offset INT8 NOT NULL, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + ,progress_offset BIGINT NOT NULL ); COMMENT ON TABLE auditor_progress IS 'Information about to the point until which the audit has progressed. Used for SELECTing the statements to process.'; diff --git a/src/auditordb/0002-auditor_purses.sql b/src/auditordb/0002-auditor_purses.sql index 375535dba..9cfe2b095 100644 --- a/src/auditordb/0002-auditor_purses.sql +++ b/src/auditordb/0002-auditor_purses.sql @@ -19,8 +19,7 @@ CREATE TABLE auditor_purses ,purse_pub BYTEA PRIMARY KEY CHECK(LENGTH(purse_pub)=32) ,balance taler_amount NOT NULL DEFAULT(0,0) ,target taler_amount NOT NULL - ,expiration_date INT8 NOT NULL, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + ,expiration_date BIGINT NOT NULL ); COMMENT ON TABLE auditor_purses IS 'all of the purses and their respective balances that the auditor is aware of'; diff --git a/src/auditordb/0002-auditor_reserves.sql b/src/auditordb/0002-auditor_reserves.sql index 517627bb4..f50653512 100644 --- a/src/auditordb/0002-auditor_reserves.sql +++ b/src/auditordb/0002-auditor_reserves.sql @@ -24,9 +24,8 @@ CREATE TABLE auditor_reserves ,purse_fee_balance taler_amount NOT NULL ,open_fee_balance taler_amount NOT NULL ,history_fee_balance taler_amount NOT NULL - ,expiration_date INT8 NOT NULL - ,origin_account TEXT, - suppressed BOOLEAN NOT NULL DEFAULT FALSE + ,expiration_date BIGINT NOT NULL + ,origin_account TEXT ); COMMENT ON TABLE auditor_reserves IS 'all of the customer reserves and their respective balances that the auditor is aware of'; diff --git a/src/auditordb/auditor-0002.sql.in b/src/auditordb/auditor-0002.sql.in index b2a22db54..9d76eb307 100644 --- a/src/auditordb/auditor-0002.sql.in +++ b/src/auditordb/auditor-0002.sql.in @@ -61,5 +61,6 @@ END $$; #include "0002-auditor_row_minor_inconsistencies.sql" #include "0002-auditor_wire_format_inconsistency.sql" #include "0002-auditor_wire_out_inconsistency.sql" +#include "0002-auditor_pending_deposits.sql" COMMIT; diff --git a/src/auditordb/pg_get_auditor_closure_lags.c b/src/auditordb/pg_get_auditor_closure_lags.c index 989b85851..751ff2641 100644 --- a/src/auditordb/pg_get_auditor_closure_lags.c +++ b/src/auditordb/pg_get_auditor_closure_lags.c @@ -75,7 +75,7 @@ closure_lags_cb (void *cls, GNUNET_PQ_result_spec_uint64 ("row_id", &serial_id), TALER_PQ_RESULT_SPEC_AMOUNT ("amount", &dc.amount), GNUNET_PQ_result_spec_absolute_time ("deadline", &dc.deadline), - GNUNET_PQ_result_spec_int64 ("wtid", &dc.wtid), + GNUNET_PQ_result_spec_auto_from_type ("wtid", &dc.wtid), GNUNET_PQ_result_spec_string ("account", &dc.account), GNUNET_PQ_result_spec_end diff --git a/src/auditordb/pg_get_balances.c b/src/auditordb/pg_get_balances.c index de505f57e..03f66edf2 100644 --- a/src/auditordb/pg_get_balances.c +++ b/src/auditordb/pg_get_balances.c @@ -78,7 +78,6 @@ balances_cb (void *cls, GNUNET_PQ_result_spec_string ("balance_key", &dc.balance_key), TALER_PQ_RESULT_SPEC_AMOUNT ("balance_value", &dc.balance_value), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -137,7 +136,6 @@ TAH_PG_get_balances ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&offset), - GNUNET_PQ_query_param_bool (return_suppressed), GNUNET_PQ_query_param_uint64 (&plimit), GNUNET_PQ_query_param_bool (any_balance), GNUNET_PQ_query_param_string (bk), @@ -155,11 +153,9 @@ TAH_PG_get_balances ( "SELECT" " row_id," " balance_key," - " balance_value," - " suppressed" + " balance_value" " FROM auditor_balances" " WHERE (row_id < $1)" - " AND ($2 OR suppressed is false)" " AND ($4 OR balance_key = $5)" " ORDER BY row_id DESC" " LIMIT $3" @@ -169,11 +165,9 @@ TAH_PG_get_balances ( "SELECT" " row_id," " balance_key," - " balance_value," - " suppressed" + " balance_value" " FROM auditor_balances" " WHERE (row_id > $1)" - " AND ($2 OR suppressed is false)" " AND ($4 OR balance_key = $5)" " ORDER BY row_id ASC" " LIMIT $3" diff --git a/src/auditordb/pg_get_denomination_pending.c b/src/auditordb/pg_get_denomination_pending.c index dbe2a8925..9ff92abef 100644 --- a/src/auditordb/pg_get_denomination_pending.c +++ b/src/auditordb/pg_get_denomination_pending.c @@ -83,7 +83,6 @@ denomination_pending_cb (void *cls, GNUNET_PQ_result_spec_int64 ("num_issued", &dc.num_issued), TALER_PQ_RESULT_SPEC_AMOUNT ("denom_risk", &dc.denom_risk), TALER_PQ_RESULT_SPEC_AMOUNT ("recoup_loss", &dc.recoup_loss), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -127,7 +126,6 @@ TAH_PG_get_denomination_pending ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&offset), - GNUNET_PQ_query_param_bool (return_suppressed), GNUNET_PQ_query_param_uint64 (&plimit), GNUNET_PQ_query_param_end }; @@ -147,11 +145,9 @@ TAH_PG_get_denomination_pending ( " denom_loss," " num_issued," " denom_risk," - " recoup_loss," - " suppressed" + " recoup_loss" " FROM auditor_denomination_pending" " WHERE (row_id < $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id DESC" " LIMIT $3" ); @@ -164,11 +160,9 @@ TAH_PG_get_denomination_pending ( " denom_loss," " num_issued," " denom_risk," - " recoup_loss," - " suppressed" + " recoup_loss" " FROM auditor_denomination_pending" " WHERE (row_id > $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id ASC" " LIMIT $3" ); diff --git a/src/auditordb/pg_get_historic_denomination_revenue.c b/src/auditordb/pg_get_historic_denomination_revenue.c index d8fb5f62c..0e84c573e 100644 --- a/src/auditordb/pg_get_historic_denomination_revenue.c +++ b/src/auditordb/pg_get_historic_denomination_revenue.c @@ -82,7 +82,6 @@ historic_denomination_revenue_cb (void *cls, &dc.revenue_timestamp), TALER_PQ_RESULT_SPEC_AMOUNT ("revenue_balance", &dc.revenue_balance), TALER_PQ_RESULT_SPEC_AMOUNT ("loss_balance", &dc.loss_balance), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -126,7 +125,6 @@ TAH_PG_get_historic_denomination_revenue ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&offset), - GNUNET_PQ_query_param_bool (return_suppressed), GNUNET_PQ_query_param_uint64 (&plimit), GNUNET_PQ_query_param_end }; @@ -144,11 +142,9 @@ TAH_PG_get_historic_denomination_revenue ( " denom_pub_hash," " revenue_timestamp," " revenue_balance," - " loss_balance," - " suppressed" + " loss_balance" " FROM auditor_historic_denomination_revenue" " WHERE (row_id < $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id DESC" " LIMIT $3" ); @@ -159,11 +155,9 @@ TAH_PG_get_historic_denomination_revenue ( " denom_pub_hash," " revenue_timestamp," " revenue_balance," - " loss_balance," - " suppressed" + " loss_balance" " FROM auditor_historic_denomination_revenue" " WHERE (row_id > $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id ASC" " LIMIT $3" ); diff --git a/src/auditordb/pg_get_historic_reserve_summary.c b/src/auditordb/pg_get_historic_reserve_summary.c index 3dd346095..684a78559 100644 --- a/src/auditordb/pg_get_historic_reserve_summary.c +++ b/src/auditordb/pg_get_historic_reserve_summary.c @@ -79,7 +79,6 @@ historic_reserve_summary_cb (void *cls, GNUNET_PQ_result_spec_absolute_time ("start_date", &dc.start_date), GNUNET_PQ_result_spec_absolute_time ("end_date", &dc.end_date), TALER_PQ_RESULT_SPEC_AMOUNT ("reserve_profits", &dc.reserve_profits), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -140,11 +139,9 @@ TAH_PG_get_historic_reserve_summary ( " row_id," " start_date," " end_date," - " reserve_profits," - " suppressed" + " reserve_profits" " FROM auditor_historic_reserve_summary" " WHERE (row_id < $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id DESC" " LIMIT $3" ); @@ -154,11 +151,9 @@ TAH_PG_get_historic_reserve_summary ( " row_id," " start_date," " end_date," - " reserve_profits," - " suppressed" + " reserve_profits" " FROM auditor_historic_reserve_summary" " WHERE (row_id > $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id ASC" " LIMIT $3" ); diff --git a/src/auditordb/pg_get_purses.c b/src/auditordb/pg_get_purses.c index 46bbe1d04..44ef4d91b 100644 --- a/src/auditordb/pg_get_purses.c +++ b/src/auditordb/pg_get_purses.c @@ -80,7 +80,6 @@ purses_cb (void *cls, TALER_PQ_RESULT_SPEC_AMOUNT ("target", &dc.target), GNUNET_PQ_result_spec_absolute_time ("expiration_date", &dc.expiration_date), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -124,7 +123,6 @@ TAH_PG_get_purses ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&offset), - GNUNET_PQ_query_param_bool (return_suppressed), GNUNET_PQ_query_param_uint64 (&plimit), GNUNET_PQ_query_param_end }; @@ -142,11 +140,9 @@ TAH_PG_get_purses ( " purse_pub," " balance," " target," - " expiration_date," - " suppressed" + " expiration_date" " FROM auditor_purses" " WHERE (row_id < $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id DESC" " LIMIT $3" ); @@ -157,11 +153,9 @@ TAH_PG_get_purses ( " purse_pub," " balance," " target," - " expiration_date," - " suppressed" + " expiration_date" " FROM auditor_purses" " WHERE (row_id > $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id ASC" " LIMIT $3" ); diff --git a/src/auditordb/pg_get_reserves.c b/src/auditordb/pg_get_reserves.c index 710aea501..dae01b547 100644 --- a/src/auditordb/pg_get_reserves.c +++ b/src/auditordb/pg_get_reserves.c @@ -88,7 +88,6 @@ reserves_cb (void *cls, GNUNET_PQ_result_spec_absolute_time ("expiration_date", &dc.expiration_date), GNUNET_PQ_result_spec_string ("origin_account", &dc.origin_account), - GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), GNUNET_PQ_result_spec_end @@ -132,7 +131,6 @@ TAH_PG_get_reserves ( struct PostgresClosure *pg = cls; struct GNUNET_PQ_QueryParam params[] = { GNUNET_PQ_query_param_uint64 (&offset), - GNUNET_PQ_query_param_bool (return_suppressed), GNUNET_PQ_query_param_uint64 (&plimit), GNUNET_PQ_query_param_end }; @@ -156,11 +154,9 @@ TAH_PG_get_reserves ( " open_fee_balance," " history_fee_balance," " expiration_date," - " origin_account," - " suppressed" + " origin_account" " FROM auditor_reserves" " WHERE (auditor_reserves_rowid < $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id DESC" " LIMIT $3" ); @@ -177,11 +173,9 @@ TAH_PG_get_reserves ( " open_fee_balance," " history_fee_balance," " expiration_date," - " origin_account," - " suppressed" + " origin_account" " FROM auditor_reserves" " WHERE (auditor_reserves_rowid > $1)" - " AND ($2 OR suppressed is false)" " ORDER BY row_id ASC" " LIMIT $3" ); diff --git a/src/auditordb/pg_get_row_inconsistency.c b/src/auditordb/pg_get_row_inconsistency.c index fca2c5f25..51115003e 100644 --- a/src/auditordb/pg_get_row_inconsistency.c +++ b/src/auditordb/pg_get_row_inconsistency.c @@ -76,6 +76,8 @@ row_inconsistency_cb (void *cls, GNUNET_PQ_result_spec_string ("row_table", &dc.row_table), GNUNET_PQ_result_spec_string ("diagnostic", &dc.diagnostic), + GNUNET_PQ_result_spec_bool ("suppressed", &dc.suppressed), + GNUNET_PQ_result_spec_end }; @@ -137,6 +139,7 @@ TAH_PG_get_row_inconsistency ( " row_id" ",row_table" ",diagnostic" + ",suppressed" " FROM auditor_row_inconsistency" " WHERE (row_id < $1)" " AND ($2 OR suppressed is false)" @@ -149,6 +152,7 @@ TAH_PG_get_row_inconsistency ( " row_id" ",row_table" ",diagnostic" + ",suppressed" " FROM auditor_row_inconsistency" " WHERE (row_id > $1)" " AND ($2 OR suppressed is false)" diff --git a/src/auditordb/pg_insert_auditor_closure_lags.c b/src/auditordb/pg_insert_auditor_closure_lags.c index 04c5de43d..e858f5ac7 100644 --- a/src/auditordb/pg_insert_auditor_closure_lags.c +++ b/src/auditordb/pg_insert_auditor_closure_lags.c @@ -31,7 +31,7 @@ TAH_PG_insert_auditor_closure_lags ( TALER_PQ_query_param_amount (pg->conn, &dc->amount), GNUNET_PQ_query_param_absolute_time (&dc->deadline), - GNUNET_PQ_query_param_int64 (&dc->wtid), + GNUNET_PQ_query_param_auto_from_type (&dc->wtid), GNUNET_PQ_query_param_string (dc->account), GNUNET_PQ_query_param_end |