change exchange database to use denominations_serial instead of denom_pub_hash as foreign key

This commit is contained in:
Christian Grothoff 2021-01-08 18:14:46 +01:00
parent 3999999988
commit 13555448b6
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
13 changed files with 3644 additions and 2236 deletions

View File

@ -1 +1 @@
1610056123 1610118444

View File

@ -1 +1 @@
ERTZ1N5J8132YETYZ1KJ3X3CE5WPRAD5N88937AM0E45W6CSNM8G TGMKNXA6XF753WXZDK3MY102TM7JRH6GYV1AYCNBGJF5R192SSVG

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
1609929353 1610118527

View File

@ -1 +1 @@
EEJN36097PVH2QHTNTB27TKM6TRYAX148BVZMHARY1YHRG4WZ3TG TX50WQ5P4RHMBT8NKGMNFPS6GXWKB7VTRN9AQZB7S6TMY8YWXZ90

File diff suppressed because it is too large Load Diff

View File

@ -1303,14 +1303,14 @@ fi
function test_22() { function test_22() {
echo "===========22: denomination key expired =================" echo "===========22: denomination key expired ================="
H_DENOM=`echo 'SELECT denom_pub_hash FROM reserves_out LIMIT 1;' | psql $DB -Aqt` S_DENOM=`echo 'SELECT denominations_serial FROM reserves_out LIMIT 1;' | psql $DB -Aqt`
OLD_START=`echo "SELECT valid_from FROM denominations WHERE denom_pub_hash='${H_DENOM}';" | psql $DB -Aqt` OLD_START=`echo "SELECT valid_from FROM denominations WHERE denominations_serial='${S_DENOM}';" | psql $DB -Aqt`
OLD_WEXP=`echo "SELECT expire_withdraw FROM denominations WHERE denom_pub_hash='${H_DENOM}';" | psql $DB -Aqt` OLD_WEXP=`echo "SELECT expire_withdraw FROM denominations WHERE denominations_serial='${S_DENOM}';" | psql $DB -Aqt`
# Basically expires 'immediately', so that the withdraw must have been 'invalid' # Basically expires 'immediately', so that the withdraw must have been 'invalid'
NEW_WEXP=`expr $OLD_START + 1 || true` NEW_WEXP=`expr $OLD_START + 1 || true`
echo "UPDATE denominations SET expire_withdraw=${NEW_WEXP} WHERE denom_pub_hash='${H_DENOM}';" | psql -Aqt $DB echo "UPDATE denominations SET expire_withdraw=${NEW_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt $DB
run_audit run_audit
@ -1321,7 +1321,7 @@ jq -e .denomination_key_validity_withdraw_inconsistencies[0] < test-audit-reserv
echo PASS echo PASS
# Undo modification # Undo modification
echo "UPDATE denominations SET expire_withdraw=${OLD_WEXP} WHERE denom_pub_hash='${H_DENOM}';" | psql -Aqt $DB echo "UPDATE denominations SET expire_withdraw=${OLD_WEXP} WHERE denominations_serial='${S_DENOM}';" | psql -Aqt $DB
} }

View File

@ -25,6 +25,7 @@ EXTRA_DIST = \
exchangedb.conf \ exchangedb.conf \
exchangedb-postgres.conf \ exchangedb-postgres.conf \
plugin_exchangedb_common.c \ plugin_exchangedb_common.c \
lrbt_callbacks.c \
test-exchange-db-postgres.conf \ test-exchange-db-postgres.conf \
$(sql_DATA) $(sql_DATA)

View File

@ -103,7 +103,7 @@ CREATE TABLE IF NOT EXISTS reserves_in
); );
COMMENT ON TABLE reserves_in COMMENT ON TABLE reserves_in
IS 'list of transfers of funds into the reserves, one per incoming wire transfer'; IS 'list of transfers of funds into the reserves, one per incoming wire transfer';
-- FIXME: explain 'wire_reference'!
CREATE INDEX IF NOT EXISTS reserves_in_execution_index CREATE INDEX IF NOT EXISTS reserves_in_execution_index
ON reserves_in ON reserves_in
(exchange_account_section (exchange_account_section
@ -151,6 +151,7 @@ COMMENT ON COLUMN reserves_out.h_blind_ev
IS 'Hash of the blinded coin, used as primary key here so that broken clients that use a non-random coin or blinding factor fail to withdraw (otherwise they would fail on deposit when the coin is not unique there).'; IS 'Hash of the blinded coin, used as primary key here so that broken clients that use a non-random coin or blinding factor fail to withdraw (otherwise they would fail on deposit when the coin is not unique there).';
COMMENT ON COLUMN reserves_out.denom_pub_hash COMMENT ON COLUMN reserves_out.denom_pub_hash
IS 'We do not CASCADE ON DELETE here, we may keep the denomination data alive'; IS 'We do not CASCADE ON DELETE here, we may keep the denomination data alive';
-- FIXME: replace denom_pub_hash with denominations_serial *EVERYWHERE*
CREATE INDEX IF NOT EXISTS reserves_out_reserve_pub_index CREATE INDEX IF NOT EXISTS reserves_out_reserve_pub_index
ON reserves_out ON reserves_out

View File

@ -73,6 +73,8 @@ UPDATE reserves_in
INNER JOIN reserves r USING(reserve_pub); INNER JOIN reserves r USING(reserve_pub);
ALTER TABLE reserves_in ALTER TABLE reserves_in
ALTER COLUMN reserve_uuid SET NOT NULL; ALTER COLUMN reserve_uuid SET NOT NULL;
ALTER TABLE reserves_in
DROP COLUMN reserve_pub;
ALTER TABLE reserves_out ALTER TABLE reserves_out
ADD COLUMN reserve_uuid INT8 REFERENCES reserves (reserve_uuid) ON DELETE CASCADE; ADD COLUMN reserve_uuid INT8 REFERENCES reserves (reserve_uuid) ON DELETE CASCADE;
UPDATE reserves_out UPDATE reserves_out
@ -81,6 +83,8 @@ UPDATE reserves_out
INNER JOIN reserves r USING(reserve_pub); INNER JOIN reserves r USING(reserve_pub);
ALTER TABLE reserves_out ALTER TABLE reserves_out
ALTER COLUMN reserve_uuid SET NOT NULL; ALTER COLUMN reserve_uuid SET NOT NULL;
ALTER TABLE reserves_out
DROP COLUMN reserve_pub;
ALTER TABLE reserves_close ALTER TABLE reserves_close
ADD COLUMN reserve_uuid INT8 REFERENCES reserves (reserve_uuid) ON DELETE CASCADE; ADD COLUMN reserve_uuid INT8 REFERENCES reserves (reserve_uuid) ON DELETE CASCADE;
UPDATE reserves_close UPDATE reserves_close
@ -89,14 +93,56 @@ UPDATE reserves_close
INNER JOIN reserves r USING(reserve_pub); INNER JOIN reserves r USING(reserve_pub);
ALTER TABLE reserves_close ALTER TABLE reserves_close
ALTER COLUMN reserve_uuid SET NOT NULL; ALTER COLUMN reserve_uuid SET NOT NULL;
ALTER TABLE reserves_in
DROP COLUMN reserve_pub;
ALTER TABLE reserves_out
DROP COLUMN reserve_pub;
ALTER TABLE reserves_close ALTER TABLE reserves_close
DROP COLUMN reserve_pub; DROP COLUMN reserve_pub;
-- change all foreign keys using 'denom_pub_hash' to using 'denominations_serial' instead
ALTER TABLE reserves_out
ADD COLUMN denominations_serial INT8 REFERENCES denominations (denominations_serial) ON DELETE CASCADE;
UPDATE reserves_out
SET denominations_serial=d.denominations_serial
FROM reserves_out o
INNER JOIN denominations d USING(denom_pub_hash);
ALTER TABLE reserves_out
ALTER COLUMN denominations_serial SET NOT NULL;
ALTER TABLE reserves_out
DROP COLUMN denom_pub_hash;
ALTER TABLE known_coins
ADD COLUMN denominations_serial INT8 REFERENCES denominations (denominations_serial) ON DELETE CASCADE;
UPDATE known_coins
SET denominations_serial=d.denominations_serial
FROM known_coins o
INNER JOIN denominations d USING(denom_pub_hash);
ALTER TABLE known_coins
ALTER COLUMN denominations_serial SET NOT NULL;
ALTER TABLE known_coins
DROP COLUMN denom_pub_hash;
ALTER TABLE denomination_revocations
ADD COLUMN denominations_serial INT8 REFERENCES denominations (denominations_serial) ON DELETE CASCADE;
UPDATE denomination_revocations
SET denominations_serial=d.denominations_serial
FROM denomination_revocations o
INNER JOIN denominations d USING(denom_pub_hash);
ALTER TABLE denomination_revocations
ALTER COLUMN denominations_serial SET NOT NULL;
ALTER TABLE denomination_revocations
DROP COLUMN denom_pub_hash;
ALTER TABLE denomination_revocations
ADD CONSTRAINT denominations_serial_pk PRIMARY KEY (denominations_serial);
ALTER TABLE refresh_revealed_coins
ADD COLUMN denominations_serial INT8 REFERENCES denominations (denominations_serial) ON DELETE CASCADE;
UPDATE refresh_revealed_coins
SET denominations_serial=d.denominations_serial
FROM refresh_revealed_coins o
INNER JOIN denominations d USING(denom_pub_hash);
ALTER TABLE refresh_revealed_coins
ALTER COLUMN denominations_serial SET NOT NULL;
ALTER TABLE refresh_revealed_coins
DROP COLUMN denom_pub_hash;
CREATE TABLE IF NOT EXISTS auditors CREATE TABLE IF NOT EXISTS auditors
(auditor_uuid BIGSERIAL UNIQUE (auditor_uuid BIGSERIAL UNIQUE
@ -116,22 +162,20 @@ COMMENT ON COLUMN auditors.is_active
IS 'true if we are currently supporting the use of this auditor.'; IS 'true if we are currently supporting the use of this auditor.';
COMMENT ON COLUMN auditors.last_change COMMENT ON COLUMN auditors.last_change
IS 'Latest time when active status changed. Used to detect replays of old messages.'; IS 'Latest time when active status changed. Used to detect replays of old messages.';
-- "auditors" has no BIGSERIAL because it is a 'mutable' table
-- and is of no concern to the auditor
CREATE TABLE IF NOT EXISTS auditor_denom_sigs CREATE TABLE IF NOT EXISTS auditor_denom_sigs
(auditor_denom_serial BIGSERIAL UNIQUE (auditor_denom_serial BIGSERIAL UNIQUE
,auditor_pub BYTEA NOT NULL REFERENCES auditors (auditor_pub) ON DELETE CASCADE ,auditor_pub BYTEA NOT NULL REFERENCES auditors (auditor_pub) ON DELETE CASCADE
,denom_pub_hash BYTEA NOT NULL REFERENCES denominations (denom_pub_hash) ON DELETE CASCADE ,denominations_serial INT8 NOT NULL REFERENCES denominations (denominations_serial) ON DELETE CASCADE
,auditor_sig BYTEA CHECK (LENGTH(auditor_sig)=64) ,auditor_sig BYTEA CHECK (LENGTH(auditor_sig)=64)
,PRIMARY KEY (denom_pub_hash, auditor_pub) ,PRIMARY KEY (denominations_serial, auditor_pub)
); );
COMMENT ON TABLE auditor_denom_sigs COMMENT ON TABLE auditor_denom_sigs
IS 'Table with auditor signatures on exchange denomination keys.'; IS 'Table with auditor signatures on exchange denomination keys.';
COMMENT ON COLUMN auditor_denom_sigs.auditor_pub COMMENT ON COLUMN auditor_denom_sigs.auditor_pub
IS 'Public key of the auditor.'; IS 'Public key of the auditor.';
COMMENT ON COLUMN auditor_denom_sigs.denom_pub_hash COMMENT ON COLUMN auditor_denom_sigs.denominations_serial
IS 'Denomination the signature is for.'; IS 'Denomination the signature is for.';
COMMENT ON COLUMN auditor_denom_sigs.auditor_sig COMMENT ON COLUMN auditor_denom_sigs.auditor_sig
IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.'; IS 'Signature of the auditor, of purpose TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS.';

View File

@ -0,0 +1,847 @@
/*
This file is part of GNUnet
Copyright (C) 2020 Taler Systems SA
GNUnet is free software: you can redistribute it and/or modify it
under the terms of the GNU Affero General Public License as published
by the Free Software Foundation, either version 3 of the License,
or (at your option) any later version.
GNUnet 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
Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
* @file exchangedb/lrbt_callbacks.c
* @brief callbacks used by postgres_lookup_records_by_table, to be
* inlined into the plugin
* @author Christian Grothoff
*/
/**
* Function called with denominations table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_denominations (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_DENOMINATIONS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with denomination_revocations table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_denomination_revocations (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with reserves table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_reserves (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RESERVES
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with reserves_in table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_reserves_in (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RESERVES_IN
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with reserves_close table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_reserves_close (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RESERVES_CLOSE
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with reserves_out table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_reserves_out (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RESERVES_OUT
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with auditors table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_auditors (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_AUDITORS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with auditor_denom_sigs table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_auditor_denom_sigs (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with exchange_sign_keys table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_exchange_sign_keys (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with signkey_revocations table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_signkey_revocations (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with known_coins table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_known_coins (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_KNOWN_COINS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with refresh_commitments table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_refresh_commitments (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with refresh_revealed_coins table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_refresh_revealed_coins (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with refresh_transfer_keys table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_refresh_transfer_keys (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with deposits table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_deposits (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_DEPOSITS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with refunds table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_refunds (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_REFUNDS
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with wire_out table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_wire_out (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_WIRE_OUT
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with aggregation_tracking table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_aggregation_tracking (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with wire_fee table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_wire_fee (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_WIRE_FEE
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with recoup table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_recoup (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RECOUP
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/**
* Function called with recoup_refresh table entries.
*
* @param cls closure
* @param result the postgres result
* @param num_result the number of results in @a result
*/
static void
lrbt_cb_table_recoup_refresh (void *cls,
PGresult *result,
unsigned int num_results)
{
struct LookupRecordsByTableContext *ctx = cls;
struct TALER_EXCHANGEDB_TableData td = {
.table = TALER_EXCHANGEDB_RT_RECOUP_REFRESH
};
for (unsigned int i = 0; i<num_results; i++)
{
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_end
};
if (GNUNET_OK !=
GNUNET_PQ_extract_result (result,
rs,
i))
{
GNUNET_break (0);
ctx->error = true;
return;
}
ctx->cb (ctx->cb_cls,
&td);
GNUNET_PQ_cleanup_result (rs);
}
}
/* end of lrbt_callbacks.c */

View File

@ -336,7 +336,7 @@ postgres_get_session (void *cls)
",denom_pub" ",denom_pub"
" FROM denominations" " FROM denominations"
" LEFT JOIN " " LEFT JOIN "
" denomination_revocations USING (denom_pub_hash);", " denomination_revocations USING (denominations_serial);",
0), 0),
/* Used in #postgres_iterate_active_signkeys() */ /* Used in #postgres_iterate_active_signkeys() */
GNUNET_PQ_make_prepare ("select_signkeys", GNUNET_PQ_make_prepare ("select_signkeys",
@ -358,10 +358,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("select_auditor_denoms", GNUNET_PQ_make_prepare ("select_auditor_denoms",
"SELECT" "SELECT"
" auditor_denom_sigs.auditor_pub" " auditor_denom_sigs.auditor_pub"
",auditor_denom_sigs.denom_pub_hash" ",denominations.denom_pub_hash"
",auditor_denom_sigs.auditor_sig" ",auditor_denom_sigs.auditor_sig"
" FROM auditor_denom_sigs" " FROM auditor_denom_sigs"
" JOIN auditors USING (auditor_pub)" " JOIN auditors USING (auditor_pub)"
" JOIN denominations USING (denominations_serial)"
" WHERE auditors.is_active;", " WHERE auditors.is_active;",
0), 0),
/* Used in #postgres_iterate_active_auditors() */ /* Used in #postgres_iterate_active_auditors() */
@ -399,10 +400,11 @@ postgres_get_session (void *cls)
/* Used in #postgres_insert_denomination_revocation() */ /* Used in #postgres_insert_denomination_revocation() */
GNUNET_PQ_make_prepare ("denomination_revocation_insert", GNUNET_PQ_make_prepare ("denomination_revocation_insert",
"INSERT INTO denomination_revocations " "INSERT INTO denomination_revocations "
"(denom_pub_hash" "(denominations_serial"
",master_sig" ",master_sig"
") VALUES " ") SELECT denominations_serial,$2"
"($1, $2);", " FROM denominations"
" WHERE denom_pub_hash=$1;",
2), 2),
/* Used in #postgres_get_denomination_revocation() */ /* Used in #postgres_get_denomination_revocation() */
GNUNET_PQ_make_prepare ("denomination_revocation_get", GNUNET_PQ_make_prepare ("denomination_revocation_get",
@ -410,7 +412,10 @@ postgres_get_session (void *cls)
" master_sig" " master_sig"
",denom_revocations_serial_id" ",denom_revocations_serial_id"
" FROM denomination_revocations" " FROM denomination_revocations"
" WHERE denom_pub_hash=$1;", " WHERE denominations_serial="
" (SELECT denominations_serial"
" FROM denominations"
" WHERE denom_pub_hash=$1);",
1), 1),
/* Used in #postgres_reserves_get() */ /* Used in #postgres_reserves_get() */
GNUNET_PQ_make_prepare ("reserves_get", GNUNET_PQ_make_prepare ("reserves_get",
@ -549,17 +554,22 @@ postgres_get_session (void *cls)
is being withdrawn from and the signature of the message is being withdrawn from and the signature of the message
authorizing the withdrawal. */ authorizing the withdrawal. */
GNUNET_PQ_make_prepare ("insert_withdraw_info", GNUNET_PQ_make_prepare ("insert_withdraw_info",
"WITH ds AS"
" (SELECT denominations_serial"
" FROM denominations"
" WHERE denom_pub_hash=$2)"
"INSERT INTO reserves_out " "INSERT INTO reserves_out "
"(h_blind_ev" "(h_blind_ev"
",denom_pub_hash" ",denominations_serial"
",denom_sig" ",denom_sig"
",reserve_uuid" ",reserve_uuid"
",reserve_sig" ",reserve_sig"
",execution_date" ",execution_date"
",amount_with_fee_val" ",amount_with_fee_val"
",amount_with_fee_frac" ",amount_with_fee_frac"
") SELECT $1, $2, $3, reserve_uuid, $5, $6, $7, $8" ") SELECT $1, ds.denominations_serial, $3, reserve_uuid, $5, $6, $7, $8"
" FROM reserves" " FROM reserves"
" CROSS JOIN ds"
" WHERE reserve_pub=$4;", " WHERE reserve_pub=$4;",
8), 8),
/* Used in #postgres_get_withdraw_info() to /* Used in #postgres_get_withdraw_info() to
@ -568,7 +578,7 @@ postgres_get_session (void *cls)
make sure /reserve/withdraw requests are idempotent. */ make sure /reserve/withdraw requests are idempotent. */
GNUNET_PQ_make_prepare ("get_withdraw_info", GNUNET_PQ_make_prepare ("get_withdraw_info",
"SELECT" "SELECT"
" denom_pub_hash" " denom.denom_pub_hash"
",denom_sig" ",denom_sig"
",reserve_sig" ",reserve_sig"
",reserves.reserve_pub" ",reserves.reserve_pub"
@ -581,7 +591,7 @@ postgres_get_session (void *cls)
" JOIN reserves" " JOIN reserves"
" USING (reserve_uuid)" " USING (reserve_uuid)"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE h_blind_ev=$1;", " WHERE h_blind_ev=$1;",
1), 1),
/* Used during #postgres_get_reserve_history() to /* Used during #postgres_get_reserve_history() to
@ -591,7 +601,7 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("get_reserves_out", GNUNET_PQ_make_prepare ("get_reserves_out",
"SELECT" "SELECT"
" h_blind_ev" " h_blind_ev"
",denom_pub_hash" ",denom.denom_pub_hash"
",denom_sig" ",denom_sig"
",reserve_sig" ",reserve_sig"
",execution_date" ",execution_date"
@ -601,7 +611,7 @@ postgres_get_session (void *cls)
",denom.fee_withdraw_frac" ",denom.fee_withdraw_frac"
" FROM reserves_out" " FROM reserves_out"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE reserve_uuid=" " WHERE reserve_uuid="
" (SELECT reserve_uuid" " (SELECT reserve_uuid"
" FROM reserves" " FROM reserves"
@ -622,7 +632,7 @@ postgres_get_session (void *cls)
" JOIN reserves" " JOIN reserves"
" USING (reserve_uuid)" " USING (reserve_uuid)"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE reserve_out_serial_id>=$1" " WHERE reserve_out_serial_id>=$1"
" ORDER BY reserve_out_serial_id ASC;", " ORDER BY reserve_out_serial_id ASC;",
1), 1),
@ -632,23 +642,28 @@ postgres_get_session (void *cls)
"SELECT" "SELECT"
" COUNT(*) AS count" " COUNT(*) AS count"
" FROM known_coins" " FROM known_coins"
" WHERE denom_pub_hash=$1;", " WHERE denominations_serial="
" (SELECT denominations_serial"
" FROM denominations"
" WHERE denom_pub_hash=$1);",
1), 1),
/* Used in #postgres_get_known_coin() to fetch /* Used in #postgres_get_known_coin() to fetch
the denomination public key and signature for the denomination public key and signature for
a coin known to the exchange. */ a coin known to the exchange. */
GNUNET_PQ_make_prepare ("get_known_coin", GNUNET_PQ_make_prepare ("get_known_coin",
"SELECT" "SELECT"
" denom_pub_hash" " denominations.denom_pub_hash"
",denom_sig" ",denom_sig"
" FROM known_coins" " FROM known_coins"
" JOIN denominations USING (denominations_serial)"
" WHERE coin_pub=$1;", " WHERE coin_pub=$1;",
1), 1),
/* Used in #postgres_ensure_coin_known() */ /* Used in #postgres_ensure_coin_known() */
GNUNET_PQ_make_prepare ("get_known_coin_dh", GNUNET_PQ_make_prepare ("get_known_coin_dh",
"SELECT" "SELECT"
" denom_pub_hash" " denominations.denom_pub_hash"
" FROM known_coins" " FROM known_coins"
" JOIN denominations USING (denominations_serial)"
" WHERE coin_pub=$1;", " WHERE coin_pub=$1;",
1), 1),
/* Used in #postgres_get_coin_denomination() to fetch /* Used in #postgres_get_coin_denomination() to fetch
@ -656,8 +671,9 @@ postgres_get_session (void *cls)
a coin known to the exchange. */ a coin known to the exchange. */
GNUNET_PQ_make_prepare ("get_coin_denomination", GNUNET_PQ_make_prepare ("get_coin_denomination",
"SELECT" "SELECT"
" denom_pub_hash" " denominations.denom_pub_hash"
" FROM known_coins" " FROM known_coins"
" JOIN denominations USING (denominations_serial)"
" WHERE coin_pub=$1" " WHERE coin_pub=$1"
" FOR SHARE;", " FOR SHARE;",
1), 1),
@ -673,10 +689,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("insert_known_coin", GNUNET_PQ_make_prepare ("insert_known_coin",
"INSERT INTO known_coins " "INSERT INTO known_coins "
"(coin_pub" "(coin_pub"
",denom_pub_hash" ",denominations_serial"
",denom_sig" ",denom_sig"
") VALUES " ") SELECT $1, denominations_serial, $3 "
"($1,$2,$3);", " FROM denominations"
" WHERE denom_pub_hash=$2;",
3), 3),
/* Used in #postgres_insert_melt() to store /* Used in #postgres_insert_melt() to store
@ -696,9 +713,9 @@ postgres_get_session (void *cls)
high-level information about a melt operation */ high-level information about a melt operation */
GNUNET_PQ_make_prepare ("get_melt", GNUNET_PQ_make_prepare ("get_melt",
"SELECT" "SELECT"
" kc.denom_pub_hash" " denoms.denom_pub_hash"
",denom.fee_refresh_val" ",denoms.fee_refresh_val"
",denom.fee_refresh_frac" ",denoms.fee_refresh_frac"
",old_coin_pub" ",old_coin_pub"
",old_coin_sig" ",old_coin_sig"
",amount_with_fee_val" ",amount_with_fee_val"
@ -707,8 +724,8 @@ postgres_get_session (void *cls)
" FROM refresh_commitments" " FROM refresh_commitments"
" JOIN known_coins kc" " JOIN known_coins kc"
" ON (refresh_commitments.old_coin_pub = kc.coin_pub)" " ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
" JOIN denominations denom" " JOIN denominations denoms"
" ON (kc.denom_pub_hash = denom.denom_pub_hash)" " ON (kc.denominations_serial = denoms.denominations_serial)"
" WHERE rc=$1;", " WHERE rc=$1;",
1), 1),
/* Used in #postgres_get_melt_index() to fetch /* Used in #postgres_get_melt_index() to fetch
@ -735,7 +752,7 @@ postgres_get_session (void *cls)
" JOIN known_coins kc" " JOIN known_coins kc"
" ON (refresh_commitments.old_coin_pub = kc.coin_pub)" " ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
" JOIN denominations denom" " JOIN denominations denom"
" ON (kc.denom_pub_hash = denom.denom_pub_hash)" " ON (kc.denominations_serial = denom.denominations_serial)"
" WHERE melt_serial_id>=$1" " WHERE melt_serial_id>=$1"
" ORDER BY melt_serial_id ASC;", " ORDER BY melt_serial_id ASC;",
1), 1),
@ -746,15 +763,15 @@ postgres_get_session (void *cls)
",old_coin_sig" ",old_coin_sig"
",amount_with_fee_val" ",amount_with_fee_val"
",amount_with_fee_frac" ",amount_with_fee_frac"
",kc.denom_pub_hash" ",denoms.denom_pub_hash"
",denom.fee_refresh_val " ",denoms.fee_refresh_val "
",denom.fee_refresh_frac " ",denoms.fee_refresh_frac "
",melt_serial_id" ",melt_serial_id"
" FROM refresh_commitments" " FROM refresh_commitments"
" JOIN known_coins kc" " JOIN known_coins kc"
" ON (refresh_commitments.old_coin_pub = kc.coin_pub)" " ON (refresh_commitments.old_coin_pub = kc.coin_pub)"
" JOIN denominations denom" " JOIN denominations denoms"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE old_coin_pub=$1;", " WHERE old_coin_pub=$1;",
1), 1),
@ -765,12 +782,13 @@ postgres_get_session (void *cls)
"(rc " "(rc "
",freshcoin_index " ",freshcoin_index "
",link_sig " ",link_sig "
",denom_pub_hash " ",denominations_serial "
",coin_ev" ",coin_ev"
",h_coin_ev" ",h_coin_ev"
",ev_sig" ",ev_sig"
") VALUES " ") SELECT $1, $2, $3, denominations_serial, $5, $6, $7 "
"($1, $2, $3, $4, $5, $6, $7);", " FROM denominations"
" WHERE denom_pub_hash=$4;",
7), 7),
/* Obtain information about the coins created in a refresh /* Obtain information about the coins created in a refresh
operation, used in #postgres_get_refresh_reveal() */ operation, used in #postgres_get_refresh_reveal() */
@ -783,7 +801,7 @@ postgres_get_session (void *cls)
",ev_sig" ",ev_sig"
" FROM refresh_revealed_coins" " FROM refresh_revealed_coins"
" JOIN denominations denom " " JOIN denominations denom "
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE rc=$1" " WHERE rc=$1"
" ORDER BY freshcoin_index ASC;", " ORDER BY freshcoin_index ASC;",
1), 1),
@ -836,7 +854,7 @@ postgres_get_session (void *cls)
",refund_serial_id" ",refund_serial_id"
" FROM refunds" " FROM refunds"
" JOIN known_coins USING (coin_pub)" " JOIN known_coins USING (coin_pub)"
" JOIN denominations denom USING (denom_pub_hash)" " JOIN denominations denom USING (denominations_serial)"
" WHERE coin_pub=$1;", " WHERE coin_pub=$1;",
1), 1),
/* Query the 'refunds' by coin public key, merchant_pub and contract hash */ /* Query the 'refunds' by coin public key, merchant_pub and contract hash */
@ -864,7 +882,7 @@ postgres_get_session (void *cls)
",refund_serial_id" ",refund_serial_id"
" FROM refunds" " FROM refunds"
" JOIN known_coins kc USING (coin_pub)" " JOIN known_coins kc USING (coin_pub)"
" JOIN denominations denom ON (kc.denom_pub_hash = denom.denom_pub_hash)" " JOIN denominations denom ON (kc.denominations_serial = denom.denominations_serial)"
" WHERE refund_serial_id>=$1" " WHERE refund_serial_id>=$1"
" ORDER BY refund_serial_id ASC;", " ORDER BY refund_serial_id ASC;",
1), 1),
@ -910,7 +928,7 @@ postgres_get_session (void *cls)
",h_wire" ",h_wire"
" FROM deposits" " FROM deposits"
" JOIN known_coins USING (coin_pub)" " JOIN known_coins USING (coin_pub)"
" JOIN denominations USING (denom_pub_hash)" " JOIN denominations USING (denominations_serial)"
" WHERE ((coin_pub=$1)" " WHERE ((coin_pub=$1)"
" AND (merchant_pub=$3)" " AND (merchant_pub=$3)"
" AND (h_contract_terms=$2));", " AND (h_contract_terms=$2));",
@ -934,7 +952,7 @@ postgres_get_session (void *cls)
",deposit_serial_id" ",deposit_serial_id"
" FROM deposits" " FROM deposits"
" JOIN known_coins USING (coin_pub)" " JOIN known_coins USING (coin_pub)"
" JOIN denominations denom USING (denom_pub_hash)" " JOIN denominations denom USING (denominations_serial)"
" WHERE (" " WHERE ("
" (deposit_serial_id>=$1)" " (deposit_serial_id>=$1)"
" )" " )"
@ -951,7 +969,7 @@ postgres_get_session (void *cls)
",wire_deadline" ",wire_deadline"
" FROM deposits" " FROM deposits"
" JOIN known_coins USING (coin_pub)" " JOIN known_coins USING (coin_pub)"
" JOIN denominations denom USING (denom_pub_hash)" " JOIN denominations denom USING (denominations_serial)"
" WHERE (" " WHERE ("
" (coin_pub=$1)" " (coin_pub=$1)"
" AND (merchant_pub=$2)" " AND (merchant_pub=$2)"
@ -976,7 +994,7 @@ postgres_get_session (void *cls)
",wallet_timestamp" ",wallet_timestamp"
" FROM deposits" " FROM deposits"
" JOIN known_coins USING (coin_pub)" " JOIN known_coins USING (coin_pub)"
" JOIN denominations denom USING (denom_pub_hash)" " JOIN denominations denom USING (denominations_serial)"
" WHERE tiny=FALSE" " WHERE tiny=FALSE"
" AND done=FALSE" " AND done=FALSE"
" AND wire_deadline<=$1" " AND wire_deadline<=$1"
@ -998,7 +1016,7 @@ postgres_get_session (void *cls)
" JOIN known_coins" " JOIN known_coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE" " WHERE"
" merchant_pub=$1 AND" " merchant_pub=$1 AND"
" h_wire=$2 AND" " h_wire=$2 AND"
@ -1035,9 +1053,9 @@ postgres_get_session (void *cls)
"SELECT" "SELECT"
" amount_with_fee_val" " amount_with_fee_val"
",amount_with_fee_frac" ",amount_with_fee_frac"
",denom.fee_deposit_val" ",denoms.fee_deposit_val"
",denom.fee_deposit_frac" ",denoms.fee_deposit_frac"
",kc.denom_pub_hash" ",denoms.denom_pub_hash"
",wallet_timestamp" ",wallet_timestamp"
",refund_deadline" ",refund_deadline"
",wire_deadline" ",wire_deadline"
@ -1051,8 +1069,8 @@ postgres_get_session (void *cls)
" FROM deposits" " FROM deposits"
" JOIN known_coins kc" " JOIN known_coins kc"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denom" " JOIN denominations denoms"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" WHERE coin_pub=$1;", " WHERE coin_pub=$1;",
1), 1),
@ -1069,7 +1087,7 @@ postgres_get_session (void *cls)
" JOIN refresh_transfer_keys tp" " JOIN refresh_transfer_keys tp"
" USING (rc)" " USING (rc)"
" JOIN denominations denoms" " JOIN denominations denoms"
" ON (rrc.denom_pub_hash = denoms.denom_pub_hash)" " ON (rrc.denominations_serial = denoms.denominations_serial)"
" WHERE old_coin_pub=$1" " WHERE old_coin_pub=$1"
" ORDER BY tp.transfer_pub", " ORDER BY tp.transfer_pub",
1), 1),
@ -1094,7 +1112,7 @@ postgres_get_session (void *cls)
" JOIN known_coins" " JOIN known_coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" JOIN wire_out" " JOIN wire_out"
" USING (wtid_raw)" " USING (wtid_raw)"
" WHERE wtid_raw=$1;", " WHERE wtid_raw=$1;",
@ -1114,7 +1132,7 @@ postgres_get_session (void *cls)
" JOIN known_coins" " JOIN known_coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denom" " JOIN denominations denom"
" USING (denom_pub_hash)" " USING (denominations_serial)"
" JOIN wire_out" " JOIN wire_out"
" USING (wtid_raw)" " USING (wtid_raw)"
" WHERE coin_pub=$1" " WHERE coin_pub=$1"
@ -1290,7 +1308,7 @@ postgres_get_session (void *cls)
",coin_sig" ",coin_sig"
",coin_blind" ",coin_blind"
",h_blind_ev" ",h_blind_ev"
",coins.denom_pub_hash" ",denoms.denom_pub_hash"
",coins.denom_sig" ",coins.denom_sig"
",denoms.denom_pub" ",denoms.denom_pub"
",amount_val" ",amount_val"
@ -1303,7 +1321,7 @@ postgres_get_session (void *cls)
" JOIN reserves" " JOIN reserves"
" USING (reserve_uuid)" " USING (reserve_uuid)"
" JOIN denominations denoms" " JOIN denominations denoms"
" ON (coins.denom_pub_hash = denoms.denom_pub_hash)" " ON (coins.denominations_serial = denoms.denominations_serial)"
" WHERE recoup_uuid>=$1" " WHERE recoup_uuid>=$1"
" ORDER BY recoup_uuid ASC;", " ORDER BY recoup_uuid ASC;",
1), 1),
@ -1314,13 +1332,13 @@ postgres_get_session (void *cls)
" recoup_refresh_uuid" " recoup_refresh_uuid"
",timestamp" ",timestamp"
",rc.old_coin_pub" ",rc.old_coin_pub"
",old_coins.denom_pub_hash AS old_denom_pub_hash" ",old_denoms.denom_pub_hash AS old_denom_pub_hash"
",recoup_refresh.coin_pub" ",recoup_refresh.coin_pub"
",coin_sig" ",coin_sig"
",coin_blind" ",coin_blind"
",denoms.denom_pub" ",new_denoms.denom_pub"
",h_blind_ev" ",h_blind_ev"
",new_coins.denom_pub_hash" ",new_denoms.denom_pub_hash"
",new_coins.denom_sig" ",new_coins.denom_sig"
",amount_val" ",amount_val"
",amount_frac" ",amount_frac"
@ -1333,8 +1351,10 @@ postgres_get_session (void *cls)
" ON (rc.old_coin_pub = old_coins.coin_pub)" " ON (rc.old_coin_pub = old_coins.coin_pub)"
" INNER JOIN known_coins new_coins" " INNER JOIN known_coins new_coins"
" ON (new_coins.coin_pub = recoup_refresh.coin_pub)" " ON (new_coins.coin_pub = recoup_refresh.coin_pub)"
" INNER JOIN denominations denoms" " INNER JOIN denominations new_denoms"
" ON (new_coins.denom_pub_hash = denoms.denom_pub_hash)" " ON (new_coins.denominations_serial = new_denoms.denominations_serial)"
" INNER JOIN denominations old_denoms"
" ON (old_coins.denominations_serial = old_denoms.denominations_serial)"
" WHERE recoup_refresh_uuid>=$1" " WHERE recoup_refresh_uuid>=$1"
" ORDER BY recoup_refresh_uuid ASC;", " ORDER BY recoup_refresh_uuid ASC;",
1), 1),
@ -1367,11 +1387,13 @@ postgres_get_session (void *cls)
",amount_val" ",amount_val"
",amount_frac" ",amount_frac"
",timestamp" ",timestamp"
",coins.denom_pub_hash" ",denoms.denom_pub_hash"
",coins.denom_sig" ",coins.denom_sig"
" FROM recoup" " FROM recoup"
" JOIN known_coins coins" " JOIN known_coins coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denoms"
" USING (denominations_serial)"
" JOIN reserves_out ro" " JOIN reserves_out ro"
" USING (h_blind_ev)" " USING (h_blind_ev)"
" WHERE ro.reserve_uuid=" " WHERE ro.reserve_uuid="
@ -1389,12 +1411,14 @@ postgres_get_session (void *cls)
",amount_val" ",amount_val"
",amount_frac" ",amount_frac"
",timestamp" ",timestamp"
",coins.denom_pub_hash" ",denoms.denom_pub_hash"
",coins.denom_sig" ",coins.denom_sig"
",recoup_refresh_uuid" ",recoup_refresh_uuid"
" FROM recoup_refresh" " FROM recoup_refresh"
" JOIN known_coins coins" " JOIN known_coins coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denoms"
" USING (denominations_serial)"
" WHERE h_blind_ev IN" " WHERE h_blind_ev IN"
" (SELECT rrc.h_coin_ev" " (SELECT rrc.h_coin_ev"
" FROM refresh_commitments" " FROM refresh_commitments"
@ -1438,7 +1462,7 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("recoup_by_coin", GNUNET_PQ_make_prepare ("recoup_by_coin",
"SELECT" "SELECT"
" reserves.reserve_pub" " reserves.reserve_pub"
",coins.denom_pub_hash" ",denoms.denom_pub_hash"
",coin_sig" ",coin_sig"
",coin_blind" ",coin_blind"
",amount_val" ",amount_val"
@ -1452,6 +1476,8 @@ postgres_get_session (void *cls)
" USING (reserve_uuid)" " USING (reserve_uuid)"
" JOIN known_coins coins" " JOIN known_coins coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denoms"
" ON (denoms.denominations_serial = coins.denominations_serial)"
" WHERE recoup.coin_pub=$1;", " WHERE recoup.coin_pub=$1;",
1), 1),
/* Used in #postgres_get_coin_transactions() to obtain recoup transactions /* Used in #postgres_get_coin_transactions() to obtain recoup transactions
@ -1464,7 +1490,7 @@ postgres_get_session (void *cls)
",amount_val" ",amount_val"
",amount_frac" ",amount_frac"
",timestamp" ",timestamp"
",coins.denom_pub_hash" ",denoms.denom_pub_hash"
",coins.denom_sig" ",coins.denom_sig"
",recoup_refresh_uuid" ",recoup_refresh_uuid"
" FROM recoup_refresh" " FROM recoup_refresh"
@ -1474,6 +1500,8 @@ postgres_get_session (void *cls)
" ON (rrc.rc = rc.rc)" " ON (rrc.rc = rc.rc)"
" JOIN known_coins coins" " JOIN known_coins coins"
" USING (coin_pub)" " USING (coin_pub)"
" JOIN denominations denoms"
" ON (denoms.denominations_serial = coins.denominations_serial)"
" WHERE coin_pub=$1;", " WHERE coin_pub=$1;",
1), 1),
/* Used in #postgres_get_reserve_by_h_blind() */ /* Used in #postgres_get_reserve_by_h_blind() */
@ -1637,10 +1665,11 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("insert_auditor_denom_sig", GNUNET_PQ_make_prepare ("insert_auditor_denom_sig",
"INSERT INTO auditor_denom_sigs " "INSERT INTO auditor_denom_sigs "
"(auditor_pub" "(auditor_pub"
",denom_pub_hash" ",denominations_serial"
",auditor_sig" ",auditor_sig"
") VALUES " ") SELECT $1, denominations_serial, $3 "
"($1, $2, $3);", " FROM denominations"
" WHERE denom_pub_hash=$2;",
3), 3),
/* used in #postgres_select_auditor_denom_sig() */ /* used in #postgres_select_auditor_denom_sig() */
GNUNET_PQ_make_prepare ("select_auditor_denom_sig", GNUNET_PQ_make_prepare ("select_auditor_denom_sig",
@ -1648,7 +1677,10 @@ postgres_get_session (void *cls)
" auditor_sig" " auditor_sig"
" FROM auditor_denom_sigs" " FROM auditor_denom_sigs"
" WHERE auditor_pub=$1" " WHERE auditor_pub=$1"
" AND denom_pub_hash=$2", " AND denominations_serial="
" (SELECT denominations_serial"
" FROM denominations"
" WHERE denom_pub_hash=$2);",
2), 2),
/* used in #postgres_lookup_wire_fee_by_time() */ /* used in #postgres_lookup_wire_fee_by_time() */
GNUNET_PQ_make_prepare ("lookup_wire_fee_by_time", GNUNET_PQ_make_prepare ("lookup_wire_fee_by_time",
@ -1666,6 +1698,158 @@ postgres_get_session (void *cls)
GNUNET_PQ_make_prepare ("do_commit", GNUNET_PQ_make_prepare ("do_commit",
"COMMIT", "COMMIT",
0), 0),
/* used in #postgres_lookup_serial_by_table() */
GNUNET_PQ_make_prepare ("select_serial_by_table_denominations",
"SELECT"
" denominations_serial AS serial"
" FROM denominations"
" ORDER BY denominations_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_denomination_revocations",
"SELECT"
" denom_revocations_serial_id AS serial"
" FROM denomination_revocations"
" ORDER BY denom_revocations_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves",
"SELECT"
" reserve_uuid AS serial"
" FROM reserves"
" ORDER BY reserve_uuid DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_in",
"SELECT"
" reserve_in_serial_id AS serial"
" FROM reserves_in"
" ORDER BY reserve_in_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_close",
"SELECT"
" close_uuid AS serial"
" FROM reserves_close"
" ORDER BY close_uuid DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_reserves_out",
"SELECT"
" reserve_out_serial_id AS serial"
" FROM reserves_out"
" ORDER BY reserve_out_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_auditors",
"SELECT"
" auditor_uuid AS serial"
" FROM auditors"
" ORDER BY auditor_uuid DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_auditor_denom_sigs",
"SELECT"
" auditor_denom_serial AS serial"
" FROM auditor_denom_sigs"
" ORDER BY auditor_denom_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_exchange_sign_keys",
"SELECT"
" esk_serial AS serial"
" FROM exchange_sign_keys"
" ORDER BY esk_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_signkey_revocations",
"SELECT"
" signkey_revocations_serial_id AS serial"
" FROM signkey_revocations"
" ORDER BY signkey_revocations_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_known_coins",
"SELECT"
" known_coin_id AS serial"
" FROM known_coins"
" ORDER BY known_coin_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_commitments",
"SELECT"
" melt_serial_id AS serial"
" FROM refresh_commitments"
" ORDER BY melt_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_revealed_coins",
"SELECT"
" rrc_serial AS serial"
" FROM refresh_revealed_coins"
" ORDER BY rrc_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_refresh_transfer_keys",
"SELECT"
" rtc_serial AS serial"
" FROM refresh_transfer_keys"
" ORDER BY rtc_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_deposits",
"SELECT"
" deposit_serial_id AS serial"
" FROM deposits"
" ORDER BY deposit_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_refunds",
"SELECT"
" refund_serial_id AS serial"
" FROM refunds"
" ORDER BY refund_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_wire_out",
"SELECT"
" wireout_uuid AS serial"
" FROM wire_out"
" ORDER BY wireout_uuid DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_aggregation_tracking",
"SELECT"
" aggregation_serial_id AS serial"
" FROM aggregation_tracking"
" ORDER BY aggregation_serial_id DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_wire_fee",
"SELECT"
" wire_fee_serial AS serial"
" FROM wire_fee"
" ORDER BY wire_fee_serial DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_recoup",
"SELECT"
" recoup_uuid AS serial"
" FROM recoup"
" ORDER BY recoup_uuid DESC"
" LIMIT 1;",
0),
GNUNET_PQ_make_prepare ("select_serial_by_table_recoup_refresh",
"SELECT"
" recoup_refresh_uuid AS serial"
" FROM recoup_refresh"
" ORDER BY recoup_refresh_uuid DESC"
" LIMIT 1;",
0),
/* For postgres_lookup_records_by_table */
// FIXME...
/* For postgres_insert_records_by_table */
// FIXME...
GNUNET_PQ_PREPARED_STATEMENT_END GNUNET_PQ_PREPARED_STATEMENT_END
}; };
@ -8987,6 +9171,301 @@ postgres_lookup_wire_fee_by_time (
} }
/**
* Lookup the latest serial number of @a table. Used in
* exchange-auditor database replication.
*
* @param cls closure
* @param session a session
* @param table table for which we should return the serial
* @param[out] latest serial number in use
* @return transaction status code, GNUNET_DB_STATUS_HARD_ERROR if
* @a table does not have a serial number
*/
static enum GNUNET_DB_QueryStatus
postgres_lookup_serial_by_table (void *cls,
struct TALER_EXCHANGEDB_Session *session,
enum TALER_EXCHANGEDB_ReplicatedTable table,
uint64_t *serial)
{
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_end
};
struct GNUNET_PQ_ResultSpec rs[] = {
GNUNET_PQ_result_spec_uint64 ("serial",
serial),
GNUNET_PQ_result_spec_end
};
const char *statement;
switch (table)
{
case TALER_EXCHANGEDB_RT_DENOMINATIONS:
statement = "select_serial_by_table_denominations";
break;
case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
statement = "select_serial_by_table_denomination_revocations";
break;
case TALER_EXCHANGEDB_RT_RESERVES:
statement = "select_serial_by_table_reserves";
break;
case TALER_EXCHANGEDB_RT_RESERVES_IN:
statement = "select_serial_by_table_reserves_in";
break;
case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
statement = "select_serial_by_table_reserves_close";
break;
case TALER_EXCHANGEDB_RT_RESERVES_OUT:
statement = "select_serial_by_table_reserves_out";
break;
case TALER_EXCHANGEDB_RT_AUDITORS:
statement = "select_serial_by_table_auditors";
break;
case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
statement = "select_serial_by_table_auditor_denom_sigs";
break;
case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
statement = "select_serial_by_table_exchange_sign_keys";
break;
case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
statement = "select_serial_by_table_signkey_revocations";
break;
case TALER_EXCHANGEDB_RT_KNOWN_COINS:
statement = "select_serial_by_table_known_coins";
break;
case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
statement = "select_serial_by_table_refresh_commitments";
break;
case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
statement = "select_serial_by_table_refresh_revealed_coins";
break;
case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
statement = "select_serial_by_table_refresh_transfer_keys";
break;
case TALER_EXCHANGEDB_RT_DEPOSITS:
statement = "select_serial_by_table_deposits";
break;
case TALER_EXCHANGEDB_RT_REFUNDS:
statement = "select_serial_by_table_refunds";
break;
case TALER_EXCHANGEDB_RT_WIRE_OUT:
statement = "select_serial_by_table_wire_out";
break;
case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
statement = "select_serial_by_table_aggregation_tracking";
break;
case TALER_EXCHANGEDB_RT_WIRE_FEE:
statement = "select_serial_by_table_wire_fee";
break;
case TALER_EXCHANGEDB_RT_RECOUP:
statement = "select_serial_by_table_recoup";
break;
case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
statement = "select_serial_by_table_recoup_refresh";
break;
default:
GNUNET_break (0);
return GNUNET_DB_STATUS_HARD_ERROR;
}
(void) cls;
return GNUNET_PQ_eval_prepared_singleton_select (session->conn,
statement,
params,
rs);
}
/**
* Closure for callbacks used by #postgres_lookup_records_by_table.
*/
struct LookupRecordsByTableContext
{
/**
* Plugin context.
*/
struct PostgresClosure *pc;
/**
* Function to call with the results.
*/
TALER_EXCHANGEDB_ReplicationCallback cb;
/**
* Closure for @a cb.
*/
void *cb_cls;
/**
* Set to true on errors.
*/
bool error;
};
#include "lrbt_callbacks.c"
/**
* Lookup records above @a serial number in @a table. Used in
* exchange-auditor database replication.
*
* @param cls closure
* @param session a session
* @param table table for which we should return the serial
* @param serial largest serial number to exclude
* @param cb function to call on the records
* @param cb_cls closure for @a cb
* @return transaction status code, GNUNET_DB_STATUS_HARD_ERROR if
* @a table does not have a serial number
*/
static enum GNUNET_DB_QueryStatus
postgres_lookup_records_by_table (void *cls,
struct TALER_EXCHANGEDB_Session *session,
enum TALER_EXCHANGEDB_ReplicatedTable table,
uint64_t serial,
TALER_EXCHANGEDB_ReplicationCallback cb,
void *cb_cls)
{
struct PostgresClosure *pc = cls;
struct GNUNET_PQ_QueryParam params[] = {
GNUNET_PQ_query_param_uint64 (&serial),
GNUNET_PQ_query_param_end
};
struct LookupRecordsByTableContext ctx = {
.pc = pc,
.cb = cb,
.cb_cls = cb_cls
};
GNUNET_PQ_PostgresResultHandler rh;
const char *statement;
enum GNUNET_DB_QueryStatus qs;
switch (table)
{
case TALER_EXCHANGEDB_RT_DENOMINATIONS:
statement = "select_above_serial_by_table_denominations";
rh = &lrbt_cb_table_denominations;
break;
case TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS:
statement = "select_above_serial_by_table_denomination_revocations";
rh = &lrbt_cb_table_denomination_revocations;
break;
case TALER_EXCHANGEDB_RT_RESERVES:
statement = "select_above_serial_by_table_reserves";
rh = &lrbt_cb_table_reserves;
break;
case TALER_EXCHANGEDB_RT_RESERVES_IN:
statement = "select_above_serial_by_table_reserves_in";
rh = &lrbt_cb_table_reserves_in;
break;
case TALER_EXCHANGEDB_RT_RESERVES_CLOSE:
statement = "select_above_serial_by_table_reserves_close";
rh = &lrbt_cb_table_reserves_close;
break;
case TALER_EXCHANGEDB_RT_RESERVES_OUT:
statement = "select_above_serial_by_table_reserves_out";
rh = &lrbt_cb_table_reserves_out;
break;
case TALER_EXCHANGEDB_RT_AUDITORS:
statement = "select_above_serial_by_table_auditors";
rh = &lrbt_cb_table_auditors;
break;
case TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS:
statement = "select_above_serial_by_table_auditor_denom_sigs";
rh = &lrbt_cb_table_auditor_denom_sigs;
break;
case TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS:
statement = "select_above_serial_by_table_exchange_sign_keys";
rh = &lrbt_cb_table_exchange_sign_keys;
break;
case TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS:
statement = "select_above_serial_by_table_signkey_revocations";
rh = &lrbt_cb_table_signkey_revocations;
break;
case TALER_EXCHANGEDB_RT_KNOWN_COINS:
statement = "select_above_serial_by_table_known_coins";
rh = &lrbt_cb_table_known_coins;
break;
case TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS:
statement = "select_above_serial_by_table_refresh_commitments";
rh = &lrbt_cb_table_refresh_commitments;
break;
case TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS:
statement = "select_above_serial_by_table_refresh_revealed_coins";
rh = &lrbt_cb_table_refresh_revealed_coins;
break;
case TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS:
statement = "select_above_serial_by_table_refresh_transfer_keys";
rh = &lrbt_cb_table_refresh_transfer_keys;
break;
case TALER_EXCHANGEDB_RT_DEPOSITS:
statement = "select_above_serial_by_table_deposits";
rh = &lrbt_cb_table_deposits;
break;
case TALER_EXCHANGEDB_RT_REFUNDS:
statement = "select_above_serial_by_table_refunds";
rh = &lrbt_cb_table_refunds;
break;
case TALER_EXCHANGEDB_RT_WIRE_OUT:
statement = "select_above_serial_by_table_wire_out";
rh = &lrbt_cb_table_wire_out;
break;
case TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING:
statement = "select_above_serial_by_table_aggregation_tracking";
rh = &lrbt_cb_table_aggregation_tracking;
break;
case TALER_EXCHANGEDB_RT_WIRE_FEE:
statement = "select_above_serial_by_table_wire_fee";
rh = &lrbt_cb_table_wire_fee;
break;
case TALER_EXCHANGEDB_RT_RECOUP:
statement = "select_above_serial_by_table_recoup";
rh = &lrbt_cb_table_recoup;
break;
case TALER_EXCHANGEDB_RT_RECOUP_REFRESH:
statement = "select_above_serial_by_table_recoup_refresh";
rh = &lrbt_cb_table_recoup_refresh;
break;
default:
GNUNET_break (0);
return GNUNET_DB_STATUS_HARD_ERROR;
}
(void) cls;
qs = GNUNET_PQ_eval_prepared_multi_select (session->conn,
statement,
params,
rh,
&ctx);
if (qs < 0)
return qs;
if (ctx.error)
return GNUNET_DB_STATUS_HARD_ERROR;
return qs;
}
/**
* Insert record set into @a table. Used in exchange-auditor database
* replication.
*
* @param cls closure
* @param session a session
* @param tb table data to insert
* @return transaction status code, #GNUNET_DB_STATUS_HARD_ERROR if
* @a table does not have a serial number
*/
static enum GNUNET_DB_QueryStatus
postgres_insert_records_by_table (void *cls,
struct TALER_EXCHANGEDB_Session *session,
const struct TALER_EXCHANGEDB_TableData *td)
{
GNUNET_break (0); // FIXME: not implemented!
return GNUNET_DB_STATUS_HARD_ERROR;
}
/** /**
* Initialize Postgres database subsystem. * Initialize Postgres database subsystem.
* *
@ -9185,6 +9664,12 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
= &postgres_activate_signing_key; = &postgres_activate_signing_key;
plugin->lookup_signing_key plugin->lookup_signing_key
= &postgres_lookup_signing_key; = &postgres_lookup_signing_key;
plugin->lookup_serial_by_table
= &postgres_lookup_serial_by_table;
plugin->lookup_records_by_table
= &postgres_lookup_records_by_table;
plugin->insert_records_by_table
= &postgres_insert_records_by_table;
return plugin; return plugin;
} }

View File

@ -82,14 +82,27 @@ GNUNET_NETWORK_STRUCT_END
*/ */
enum TALER_EXCHANGEDB_ReplicatedTable enum TALER_EXCHANGEDB_ReplicatedTable
{ {
/**
* The "denominations" table.
*/
TALER_EXCHANGEDB_RT_DENOMINATIONS, TALER_EXCHANGEDB_RT_DENOMINATIONS,
TALER_EXCHANGEDB_RT_DENOMINATION_REVOCATIONS,
// FIXME... TALER_EXCHANGEDB_RT_RESERVES,
TALER_EXCHANGEDB_RT_RESERVES_IN,
TALER_EXCHANGEDB_RT_RESERVES_CLOSE,
TALER_EXCHANGEDB_RT_RESERVES_OUT,
TALER_EXCHANGEDB_RT_AUDITORS,
TALER_EXCHANGEDB_RT_AUDITOR_DENOM_SIGS,
TALER_EXCHANGEDB_RT_EXCHANGE_SIGN_KEYS,
TALER_EXCHANGEDB_RT_SIGNKEY_REVOCATIONS,
TALER_EXCHANGEDB_RT_KNOWN_COINS,
TALER_EXCHANGEDB_RT_REFRESH_COMMITMENTS,
TALER_EXCHANGEDB_RT_REFRESH_REVEALED_COINS,
TALER_EXCHANGEDB_RT_REFRESH_TRANSFER_KEYS,
TALER_EXCHANGEDB_RT_DEPOSITS,
TALER_EXCHANGEDB_RT_REFUNDS,
TALER_EXCHANGEDB_RT_WIRE_OUT,
TALER_EXCHANGEDB_RT_AGGREGATION_TRACKING,
TALER_EXCHANGEDB_RT_WIRE_FEE,
TALER_EXCHANGEDB_RT_RECOUP,
TALER_EXCHANGEDB_RT_RECOUP_REFRESH
}; };
@ -119,10 +132,83 @@ struct TALER_EXCHANGEDB_TableData
*/ */
struct struct
{ {
// FIXME... struct TALER_DenominationPublicKey denom_pub;
struct TALER_MasterSignatureP master_sig;
struct GNUNET_TIME_Absolute valid_from;
struct GNUNET_TIME_Absolute expire_withdraw;
struct GNUNET_TIME_Absolute expire_deposit;
struct GNUNET_TIME_Absolute expire_legal;
struct TALER_Amount coin;
struct TALER_Amount fee_withdraw;
struct TALER_Amount fee_deposit;
struct TALER_Amount fee_refresh;
struct TALER_Amount fee_refund;
} denominations; } denominations;
// FIXME... struct
{
struct GNUNET_HashCode denom_pub_hash;
struct TALER_MasterSignatureP master_sig;
} denomination_revocations;
struct
{
struct TALER_ReservePublicKeyP reserve_pub;
char *account_details;
/**
* Note: not useful for auditor, because not UPDATEd!
*/
struct TALER_Amount current_balance;
struct GNUNET_TIME_Absolute expiration_date;
struct GNUNET_TIME_Absolute gc_date;
} reserves;
struct
{
uint64_t wire_reference;
struct TALER_Amount credit;
char *sender_account_details;
char *exchange_account_section;
struct GNUNET_TIME_Absolute execution_date;
uint64_t reserve_uuid;
} reserves_in;
struct
{
struct GNUNET_TIME_Absolute execution_date;
struct TALER_WireTransferIdentifierRawP wtid;
char *receiver_account;
struct TALER_Amount amount;
struct TALER_Amount closing_fee;
uint64_t reserve_uuid;
} reserves_close;
struct
{
struct GNUNET_HashCode h_blind_ev;
struct GNUNET_HashCode denom_pub_hash; // FIXME
struct TALER_DenominationSignature denom_sig;
struct TALER_ReserveSignatureP reserve_sig;
struct GNUNET_TIME_Absolute execution_date;
struct TALER_Amount amount_with_fee;
uint64_t reserve_uuid;
} reserves_out;
struct {} auditors;
struct {} auditor_denom_sigs;
struct {} exchange_sign_keys;
struct {} signkey_revocations;
struct {} known_coins;
struct {} refresh_commitments;
struct {} refresh_revealed_coins;
struct {} refresh_transfer_keys;
struct {} deposits;
struct {} refunds;
struct {} wire_out;
struct {} aggregation_tracking;
struct {} wire_fee;
struct {} recoup;
struct {} recoup_refresh;
} details; } details;